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).

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
 		<echo level="info">All tests successful.</echo>
 	</target>
 	
-	<target name="maven" depends="version, dist, test" description="Build a maven repository.">
+	<target name="maven" depends="version, dist, test" description="Build a maven artifact bundle.">
 		<ant antfile="buildScripts/website.ant.xml" target="javadoc" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
 		</ant>
 		<jar destfile="dist/lombok-${lombok.version}-javadoc.jar">
 			<fileset dir="doc/api" />
 		</jar>
-		<ivy:make-maven-repo
-				group="org.projectlombok" artifact="lombok"
-				version="${lombok.version}"
-				url="http://projectlombok.org/mavenrepo"
-				outfile="dist/maven.tar.bz2"
-				artifactfile="dist/lombok-${lombok.version}.jar"
-				pomfile="doc/maven-pom.xml">
-				
-				<sources>
-					<fileset dir="src/core" />
-					<fileset dir="src/eclipseAgent" />
-					<fileset dir="src/installer" />
-					<fileset dir="src/delombok" />
-					<fileset dir="experimental/src" />
-					<fileset dir="test/transform/src" />
-					<fileset dir="test/core/src" />
-				</sources>
-		</ivy:make-maven-repo>
+		<jar destfile="dist/lombok-${lombok.version}-sources.jar">
+			<fileset dir="src/core" />
+			<fileset dir="src/eclipseAgent" />
+			<fileset dir="src/installer" />
+			<fileset dir="src/delombok" />
+			<fileset dir="test/transform/src" />
+			<fileset dir="test/core/src" />
+		</jar>
+		<mkdir dir="build/mavenPublish" />
+		<copy tofile="build/mavenPublish/pom.xml" overwrite="true" file="doc/maven-pom.xml">
+			<filterchain>
+				<replacetokens>
+					<token key="VERSION" value="${lombok.version}" />
+				</replacetokens>
+			</filterchain>
+		</copy>
+		<tar destfile="build/mavenPublish/mavenPublish.tar.bz2" compression="bzip2">
+			<tarfileset dir="dist">
+				<include name="lombok-${lombok.version}.jar" />
+				<include name="lombok-${lombok.version}-sources.jar" />
+				<include name="lombok-${lombok.version}-javadoc.jar" />
+			</tarfileset>
+			<tarfileset dir="build/mavenPublish" includes="pom.xml" />
+		</tar>
 	</target>
 	
-	<target name="maven-publish" depends="maven" description="Build a maven repository then upload it to projectlombok.org.">
+	<target name="maven-publish" depends="maven" description="Build a maven artifact bundle then upload it to projectlombok.org and ask the server to upload it to maven central">
 		<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" />
 		<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
-		<available file="libertad-upload.key" property="libertad.key.available" />
-		<fail unless="libertad.key.available">You don't have the libertad-upload.key; you'll need it to get write access to the server.</fail>
+		<available file="escudo-upload.key" property="escudo.key.available" />
+		<fail unless="escudo.key.available">You don't have the escudo-upload.key; you'll need it to get write access to the server.</fail>
 		<scp
-			localFile="dist/maven.tar.bz2"
+			localFile="build/mavenPublish/mavenPublish.tar.bz2"
 			todir="lombokup@projectlombok.org:/staging"
-			keyfile="libertad-upload.key" passphrase=""
-			sftp="true" verbose="true" trust="true" />
+			keyfile="escudo-upload.key" passphrase=""
+			sftp="false" verbose="true" trust="true" />
 		<sshexec
 			host="projectlombok.org"
 			username="lombokup"
-			keyfile="libertad-upload.key" passphrase=""
-			trust="true" command="./deployMavenRepo" />
+			keyfile="escudo-upload.key" passphrase=""
+			trust="true" command="./publishToMavenCentral" />
 	</target>
 	
 	<target name="-credentials">
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 @@
 	<licenses>
 		<license>
 			<name>The MIT License</name>
-			<url>http://www.opensource.org/licenses/mit-license.php</url>
+			<url>http://projectlombok.org/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@@ -38,20 +38,11 @@
 			<email>roel@projectlombok.org</email>
 			<timezone>+1</timezone>
 		</developer>
-	</developers>
-	<contributors>
-		<contributor>
-			<id>rgrootjans<id>
+		<developer>
+			<id>rgrootjans</id>
 			<name>Robbert Jan Grootjans</name>
 			<timezone>+1</timezone>
-		</contributor>
-	</contributors>
-	<!--
-		For auto-syncing to the main maven repository:
-		"org.projectlombok","mavensync@projectlombok.org:/home/mavensync/public_html/m2repo","rsync_ssh","Reinier Zwitserloot", "reinier@projectlombok.org",,
-		
-		For deploying to the remote repo on projectlombok.org:
-		mvn deploy:deploy-file -DrepositoryId=projectlombok.org url=scp://reinier@projectlombok.org/home/mavensync/public_html/m2repo -Dfile=dist/lombok.jar -DpomFile=doc/maven-pom.xml
-	-->
+		</developer>
+	</developers>
 </project>
 
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 @@
 	</style>
 </head><body>
 	<div class="meat">
-		<h1>Use Lombok via Maven</h1>
+		<h1>Use Lombok via Maven or ivy</h1>
 		<div>
 			You can use lombok with maven by adding the following to your <strong>pom.xml</strong>:
 			<div class="snippet">&lt;dependencies&gt;
@@ -53,25 +53,14 @@
 		&lt;version&gt;@VERSION@&lt;/version&gt;
 		&lt;scope&gt;provided&lt;/scope&gt;
 	&lt;/dependency&gt;
-&lt;/dependencies&gt;
-&lt;repositories&gt;
-	&lt;repository&gt;
-		&lt;id&gt;projectlombok.org&lt;/id&gt;
-		&lt;url&gt;http://projectlombok.org/mavenrepo&lt;/url&gt;
-	&lt;/repository&gt;
-&lt;/repositories&gt;</div>
+&lt;/dependencies&gt;</div>
+		</div>
+		<div>
+			You can use lombok with ivy by adding the following to your <strong>ivy.xml</strong>:
+			<div class="snippet">&lt;dependency org="projectlombok.org" name="lombok" rev="@VERSION@" conf="build" /&gt;</div>
+		</div>
 		<div>
-			<em><strong>CAREFUL:</strong></em> 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:
-			<div class="snippet">&lt;plugin&gt;
-	&lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-	&lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
-	&lt;configuration&gt;
-		&lt;compilerVersion&gt;1.6&lt;/compilerVersion&gt;
-		&lt;source&gt;1.6&lt;/source&gt;
-		&lt;target&gt;1.6&lt;/target&gt;
-	&lt;/configuration&gt;
-&lt;/plugin&gt;</div>
+			<em><strong>CAREFUL:</strong></em> lombok requires using the javac v1.6 compiler or higher.
 		</div>
 		That's all there is to it!<br />
 		<em>note:</em> You'll still need to download lombok, or doubleclick on the lombok.jar file downloaded by maven, to install lombok into your eclipse installation.<br />