diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2018-09-10 22:20:41 +0200 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2018-09-10 22:20:41 +0200 |
| commit | 3c6513073b4aa89fc5ae2fa52528de79d07d33a6 (patch) | |
| tree | a466717b8d506986b2c1873f10e936ef45b79335 | |
| parent | b60541526c7047aff0f4b2a1aac37804913c61de (diff) | |
| download | lombok-3c6513073b4aa89fc5ae2fa52528de79d07d33a6.tar.gz lombok-3c6513073b4aa89fc5ae2fa52528de79d07d33a6.tar.bz2 lombok-3c6513073b4aa89fc5ae2fa52528de79d07d33a6.zip | |
create edge-SNAPSHOT maven artifacts
| -rw-r--r-- | build.xml | 32 | ||||
| -rw-r--r-- | doc/maven-pom.xml | 13 | ||||
| -rw-r--r-- | jitpack.yml | 5 |
3 files changed, 20 insertions, 30 deletions
@@ -374,30 +374,25 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo> </condition> </target> - <target name="generate-pom" depends="version,dist"> - <echo message="Lombok version: ${lombok.version}-SNAPSHOT" /> - - <echo file="build/pom.xml"><![CDATA[<project> - <modelVersion>4.0.0</modelVersion> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>]]>${lombok.version}-SNAPSHOT<![CDATA[</version> -</project>]]></echo> + <target name="-version-edge"> + <property name="lombok.version.mvn" value="edge-SNAPSHOT" /> </target> - <target name="install-maven" depends="generate-pom,-mvn-ext" description="Install THE lombok.jar into the local maven repository using Apache Maven"> + <target name="edge-maven" depends="-version-edge,-mvn-ext,-prepare-maven" description="Install THE lombok.jar into the local maven repository using Apache Maven"> <condition property="mvn-exe" value="${env.MAVEN_HOME}/bin/mvn${mvn-ext}" else="mvn${mvn-ext}"> <isset property="env.MAVEN_HOME" /> </condition> <exec executable="${mvn-exe}" failifexecutionfails="false" resultproperty="mvn-result"> - <arg value="install:install-file" /> + <arg value="deploy:deploy-file" /> <arg value="-Dfile=dist/lombok-${lombok.version}.jar" /> + <arg value="-Dsources=dist/lombok-${lombok.version}-sources.jar" /> + <arg value="-Djavadoc=dist/lombok-${lombok.version}-javadoc.jar" /> <arg value="-DgroupId=org.projectlombok" /> <arg value="-DartifactId=lombok" /> - <arg value="-Dversion=${lombok.version}-SNAPSHOT" /> - <arg value="-Dpackaging=jar" /> - <arg value="-DpomFile=build/pom.xml" /> + <arg value="-Dversion=edge-SNAPSHOT" /> + <arg value="-DpomFile=build/mavenPublish/pom.xml" /> + <arg value="-Durl=file://${basedir}/build/edgePublish" /> </exec> <condition property="mvn-notfound" value="true"> <not><isset property="mvn-result" /></not> @@ -835,7 +830,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The </ant> </target> - <target name="maven" depends="version, dist, javadoc" description="Build a maven artifact bundle."> + <target name="-prepare-maven" depends="version, dist, javadoc"> <jar destfile="dist/lombok-${lombok.version}-javadoc.jar"> <fileset dir="doc/api" /> </jar> @@ -850,13 +845,18 @@ You can also create your own by writing a 'testenvironment.properties' file. The <fileset dir="test/core/src" /> </jar> <mkdir dir="build/mavenPublish" /> + <!-- Could already be set for edge releases --> + <property name="lombok.version.mvn" value="${lombok.version}" /> <copy tofile="build/mavenPublish/pom.xml" overwrite="true" file="doc/maven-pom.xml"> <filterchain> <replacetokens> - <token key="VERSION" value="${lombok.version}" /> + <token key="VERSION" value="${lombok.version.mvn}" /> </replacetokens> </filterchain> </copy> + </target> + + <target name="maven" depends="-prepare-maven" description="Build a maven artifact bundle."> <tar destfile="build/mavenPublish/mavenPublish.tar.bz2" compression="bzip2"> <tarfileset dir="dist"> <include name="lombok-${lombok.version}.jar" /> diff --git a/doc/maven-pom.xml b/doc/maven-pom.xml index baba7ca6..99643f64 100644 --- a/doc/maven-pom.xml +++ b/doc/maven-pom.xml @@ -21,8 +21,8 @@ <url>http://github.com/rzwitserloot/lombok</url> </scm> <issueManagement> - <system>Google Code</system> - <url>http://code.google.com/p/projectlombok/issues</url> + <system>GitHub Issues</system> + <url>https://github.com/rzwitserloot/lombok/issues</url> </issueManagement> <developers> <developer> @@ -30,18 +30,13 @@ <name>Reinier Zwitserloot</name> <email>reinier@projectlombok.org</email> <url>http://zwitserloot.com</url> - <timezone>+1</timezone> + <timezone>Europe/Amsterdam</timezone> </developer> <developer> <id>rspilker</id> <name>Roel Spilker</name> <email>roel@projectlombok.org</email> - <timezone>+1</timezone> - </developer> - <developer> - <id>rgrootjans</id> - <name>Robbert Jan Grootjans</name> - <timezone>+1</timezone> + <timezone>Europe/Amsterdam</timezone> </developer> </developers> </project> diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index b8c08047..00000000 --- a/jitpack.yml +++ /dev/null @@ -1,5 +0,0 @@ -jdk: -- openjdk10 -install: -- echo "Running a custom install command" -- ant install-maven
\ No newline at end of file |