From 6ab599d01cb0c00d5baa5092649be58b8a99701d Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sun, 13 Mar 2011 17:57:46 +0100 Subject: Updated maven pom and deploy process; now lombok is linked in mavencentral so we no longer need our own repository. Also updated publish process to new server (escudo is in, libertad is out). --- .gitignore | 4 +-- build.xml | 60 ++++++++++++++++++++++++-------------------- doc/maven-pom.xml | 19 ++++---------- website/mavenrepo/index.html | 27 ++++++-------------- 4 files changed, 48 insertions(+), 62 deletions(-) diff --git a/.gitignore b/.gitignore index c6194f44..5eae78c0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ ivyCache google.properties debug LombokizedEclipse.launch -libertad-upload.key +escudo-upload.key findbugsReport.html lib .settings @@ -14,4 +14,4 @@ lib .factorypath lombok.iml .idea -*.markdown.html \ No newline at end of file +*.markdown.html diff --git a/build.xml b/build.xml index 563e5d25..f3de4339 100644 --- a/build.xml +++ b/build.xml @@ -274,48 +274,54 @@ the common tasks and can be called on to run the main aspects of all the sub-scr All tests successful. - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - You don't have the libertad-upload.key; you'll need it to get write access to the server. + + You don't have the escudo-upload.key; you'll need it to get write access to the server. + keyfile="escudo-upload.key" passphrase="" + sftp="false" verbose="true" trust="true" /> + keyfile="escudo-upload.key" passphrase="" + trust="true" command="./publishToMavenCentral" /> diff --git a/doc/maven-pom.xml b/doc/maven-pom.xml index 96568567..61738a72 100644 --- a/doc/maven-pom.xml +++ b/doc/maven-pom.xml @@ -12,7 +12,7 @@ The MIT License - http://www.opensource.org/licenses/mit-license.php + http://projectlombok.org/LICENSE repo @@ -38,20 +38,11 @@ roel@projectlombok.org +1 - - - - rgrootjans + + rgrootjans Robbert Jan Grootjans +1 - - - + + diff --git a/website/mavenrepo/index.html b/website/mavenrepo/index.html index 6b8ea48d..aa7f4935 100644 --- a/website/mavenrepo/index.html +++ b/website/mavenrepo/index.html @@ -43,7 +43,7 @@
-

Use Lombok via Maven

+

Use Lombok via Maven or ivy

You can use lombok with maven by adding the following to your pom.xml:
<dependencies> @@ -53,25 +53,14 @@ <version>@VERSION@</version> <scope>provided</scope> </dependency> -</dependencies> -<repositories> - <repository> - <id>projectlombok.org</id> - <url>http://projectlombok.org/mavenrepo</url> - </repository> -</repositories>
+</dependencies>
+
+
+ You can use lombok with ivy by adding the following to your ivy.xml: +
<dependency org="projectlombok.org" name="lombok" rev="@VERSION@" conf="build" />
+
- CAREFUL: lombok requires using the javac v1.6 compiler. If this is not your default compiler, you'll need to add the following to your - pom file to explicitly set the java compiler version to use: -
<plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerVersion>1.6</compilerVersion> - <source>1.6</source> - <target>1.6</target> - </configuration> -</plugin>
+ CAREFUL: lombok requires using the javac v1.6 compiler or higher.
That's all there is to it!
note: You'll still need to download lombok, or doubleclick on the lombok.jar file downloaded by maven, to install lombok into your eclipse installation.
-- cgit