diff options
| -rw-r--r-- | build.xml | 67 | ||||
| -rw-r--r-- | doc/maven-pom.xml | 31 | ||||
| -rw-r--r-- | website/download.html | 3 | ||||
| -rw-r--r-- | website/index.css | 3 | ||||
| -rw-r--r-- | website/index.html | 4 | ||||
| -rw-r--r-- | website/mavenrepo/index.html | 22 |
6 files changed, 117 insertions, 13 deletions
@@ -87,6 +87,7 @@ <fileset dir="website"> <include name="index.html" /> <include name="download.html" /> + <incldue name="mavenrepo/index.html" /> </fileset> <filterchain> <replacetokens> @@ -352,4 +353,70 @@ public class CompileChangelog { <arg value="${CHANGELOG_HTML}" /> </java> </target> + + <target name="maven" depends="version, dist"> + <loadresource property="mvn.oldversions"> + <url url="http://projectlombok.org/mavenrepo/org/projectlombok/lombok/maven-metadata.xml" /> + <filterchain> + <linecontains><contains value="/version>" /></linecontains> + <headfilter lines="-1" skip="1" /> + </filterchain> + </loadresource> + <mkdir dir="build" /> + <echo file="build/version.tagged.tmp"><version>${lombok.version}</version></echo> + <loadfile srcFile="build/version.tagged.tmp" property="lombok.version.tagged" /> + <delete file="build/version.tagged.tmp" /> + <fail message="You already created a maven target for this version. You'll have to update the version to something new!"> + <condition> + <contains string="${mvn.oldversions}" substring="${lombok.version.tagged}" /> + </condition> + </fail> + + <delete dir="build/maven" quiet="true" /> + <property name="mvn.dir" value="build/maven/org/projectlombok/lombok" /> + <property name="mvn.bin" value="${mvn.dir}/${lombok.version}" /> + <property name="mvn.pom" value="${mvn.bin}/lombok-${lombok.version}.pom" /> + <mkdir dir="${mvn.bin}" /> + <tstamp> + <format property="now.millis" pattern="yyyyMMddHHmmss" timezone="UTC" /> + </tstamp> + <copy todir="${mvn.bin}" file="dist/lombok-${lombok.version}.jar" /> + <checksum property="mvn.bin.md5" file="${mvn.bin}/lombok-${lombok.version}.jar" algorithm="MD5" /> + <checksum property="mvn.bin.sha1" file="${mvn.bin}/lombok-${lombok.version}.jar" algorithm="SHA1" /> + <echo file="${mvn.bin}/lombok-${lombok.version}.jar.md5">${mvn.bin.md5}</echo> + <echo file="${mvn.bin}/lombok-${lombok.version}.jar.sha1">${mvn.bin.sha1}</echo> + <copy tofile="${mvn.pom}" file="doc/maven-pom.xml"> + <filterchain> + <replacetokens> + <token key="VERSION" value="${lombok.version}" /> + </replacetokens> + </filterchain> + </copy> + <checksum property="mvn.pom.md5" file="${mvn.pom}" algorithm="MD5" /> + <checksum property="mvn.pom.sha1" file="${mvn.pom}" algorithm="SHA1" /> + <echo file="${mvn.pom}.md5">${mvn.pom.md5}</echo> + <echo file="${mvn.pom}.sha1">${mvn.pom.sha1}</echo> + <echo file="${mvn.dir}/maven-metadata.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + <versioning> + <versions> + <version>${lombok.version}</version> +${mvn.oldversions} + </versions> + <lastUpdated>${now.millis}</lastUpdated> + </versioning> +</metadata> +]]></echo> + <checksum property="mvn.manifest.md5" file="${mvn.dir}/maven-metadata.xml" algorithm="MD5" /> + <checksum property="mvn.manifest.sha1" file="${mvn.dir}/maven-metadata.xml" algorithm="SHA1" /> + <echo file="${mvn.dir}/maven-metadata.xml.md5">${mvn.manifest.md5}</echo> + <echo file="${mvn.dir}/maven-metadata.xml.sha1">${mvn.manifest.sha1}</echo> + <tar destfile="dist/maven.tar.bz2" compression="bzip2"> + <tarfileset dir="build/maven" /> + </tar> + <echo>Now copy maven.tar.bz2 to the website and unpack it in the mavenrepo directory, overwriting whatever's there.</echo> + </target> </project> diff --git a/doc/maven-pom.xml b/doc/maven-pom.xml new file mode 100644 index 00000000..bf22ea5d --- /dev/null +++ b/doc/maven-pom.xml @@ -0,0 +1,31 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <name>Project Lombok</name> + <url>http://projectlombok.org</url> + <description>Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more!</description> + <dependencies></dependencies> + <licenses> + <license> + <name>The MIT License</name> + <url>http://www.opensource.org/licenses/mit-license.php</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:git:git://github.com/rzwitserloot/lombok.git</connection> + <url>scm:git:git://github.com/rzwitserloot/lombok.git</url> + </scm> + <!-- + 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 + --> +</project> + diff --git a/website/download.html b/website/download.html index 5b546b72..cc8ac1c5 100644 --- a/website/download.html +++ b/website/download.html @@ -48,6 +48,9 @@ <a href="http://projectlombok.googlecode.com/files/lombok.jar" id="downloadLink"> Download now! </a> + <p> + <a href="mavenrepo/index.html">Using maven? Click here!</a> + </p> <div class="backLink"> <a href="index.html">back to the project homepage</a> </div> diff --git a/website/index.css b/website/index.css index a1480c40..66dcf3bb 100644 --- a/website/index.css +++ b/website/index.css @@ -127,9 +127,6 @@ code { margin-top: 8px; margin-left: 32px; } -.downloadActions a { - display: block; -} .footer { margin-top: 8px; diff --git a/website/index.html b/website/index.html index f28db795..a2a1e748 100644 --- a/website/index.html +++ b/website/index.html @@ -20,8 +20,8 @@ <div id="downloadInfo" class="buttonBar" style="display: none;"> <span></span> <div class="downloadActions"> - <a class="backToBar" href="http://projectlombok.googlecode.com/files/lombok.jar">Okay, download <strong>lombok</strong></a> - <a href="#" class="backToBar">No, don't</a> + <a class="backToBar" href="http://projectlombok.googlecode.com/files/lombok.jar">Okay, download <strong>lombok</strong></a> | <a href="mavenrepo/index.html">I use maven</a><br /> + <a href="#" class="backToBar">Cancel</a> </div> </div> <div id="buttonBar" class="buttonBar"> diff --git a/website/mavenrepo/index.html b/website/mavenrepo/index.html index 70cd2778..1d791e31 100644 --- a/website/mavenrepo/index.html +++ b/website/mavenrepo/index.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link rel="stylesheet" type="text/css" href="logi/reset.css" /> + <link rel="stylesheet" type="text/css" href="../logi/reset.css" /> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> <title>Project Lombok</title> @@ -32,7 +32,13 @@ h1 { padding-bottom: 0; - margin-bottom: 4px; + margin-bottom: 8px; + } + + #downloadLink { + display: block; + margin-top: 32px; + font-size: 14px; } </style> </head><body> @@ -46,19 +52,19 @@ <artifactId>lombok</artifactId> <version>@VERSION@</version> </dependency> -</dependencies></div> - For now you also need to add the following repository, though we've put in a request at apache to add lombok to - the central maven repository, so you may want to try it without this extra block first and see if it works. If not, also add: - <div class="snippet"><repositories> +</dependencies> +<repositories> <repository> <id>projectlombok.org</id> <url>http://projectlombok.org/mavenrepo</url> </repository> </repositories></div> - That's all there is to it! + 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 /> + <a id="downloadLink" href="http://projectlombok.googlecode.com/files/lombok.jar">Download lombok.jar</a> </div> <div class="backLink"> - <a href="index.html">back to the project homepage</a> + <a href="../index.html">back to the project homepage</a> </div> </div> <script type="text/javascript"> |