From b60541526c7047aff0f4b2a1aac37804913c61de Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Tue, 4 Sep 2018 01:59:22 +0200
Subject: running the edge-release task also sets the git tag now.

---
 buildScripts/website.ant.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'buildScripts')

diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index 5c996fc6..ddcb2219 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -209,6 +209,16 @@ such as applying the templates to produce the website, converting the changelog
 			username="${ssh.username}"
 			keyfile="${ssh.keyfile}"
 			knownHosts="ssh.knownHosts" />
+		<exec executable="/usr/bin/git">
+			<arg value="tag" />
+			<arg value="-f" />
+			<arg value="live" />
+		</exec>
+		<exec executable="/usr/bin/git">
+			<arg value="push" />
+			<arg value="-f" />
+			<arg value="--tags" />
+		</exec>
 	</target>
 	
 	<target name="javadoc" description="Generates the javadoc" depends="-ensure-version, -ensure-fullversion" unless="skip.javadoc">
-- 
cgit 


From 8c28302705a027646c0ee0a83379b4084cb475ba Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 10 Sep 2018 22:23:42 +0200
Subject: Upgraded our objectweb ASM dep and moved API level up to 6, to avoid
 a ‘this feature requires ASM5’ error that occurs when patching recent eclipse
 releases.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ivy-repo/org.projectlombok-lombok.patcher-0.24.xml     | 14 --------------
 .../ivy-repo/org.projectlombok-lombok.patcher-0.26.xml     | 14 --------------
 .../ivy-repo/org.projectlombok-lombok.patcher-0.28.xml     | 14 ++++++++++++++
 buildScripts/ivy.xml                                       |  2 +-
 4 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.24.xml
 delete mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.26.xml
 create mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.28.xml

(limited to 'buildScripts')

diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.24.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.24.xml
deleted file mode 100644
index 87e1594f..00000000
--- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.24.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.24" publication="20171128000000">
-		<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
-		<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
-		<ivyauthor name="rspilker" url="http://github.com/rspilker" />
-		<description homepage="https://projectlombok.org/" />
-	</info>
-	<configurations>
-		<conf name="default" />
-	</configurations>
-	<publications>
-		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.24.jar" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.26.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.26.xml
deleted file mode 100644
index 6525604f..00000000
--- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.26.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.26" publication="20180528200000">
-		<license name="MIT License" url="https://www.opensource.org/licenses/mit-license.php" />
-		<ivyauthor name="rzwitserloot" url="https://github.com/rzwitserloot" />
-		<ivyauthor name="rspilker" url="https://github.com/rspilker" />
-		<description homepage="https://projectlombok.org/" />
-	</info>
-	<configurations>
-		<conf name="default" />
-	</configurations>
-	<publications>
-		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.26.jar" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.28.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.28.xml
new file mode 100644
index 00000000..5ff77341
--- /dev/null
+++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.28.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.28" publication="20180910222000">
+		<license name="MIT License" url="https://www.opensource.org/licenses/mit-license.php" />
+		<ivyauthor name="rzwitserloot" url="https://github.com/rzwitserloot" />
+		<ivyauthor name="rspilker" url="https://github.com/rspilker" />
+		<description homepage="https://projectlombok.org/" />
+	</info>
+	<configurations>
+		<conf name="default" />
+	</configurations>
+	<publications>
+		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.28.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 4eed2fa6..15c03ed1 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -18,7 +18,7 @@
 		<conf name="supporters" />
 	</configurations>
 	<dependencies>
-		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.26" conf="buildBase->default; runtime->default" />
+		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.28" conf="buildBase->default; runtime->default" />
 		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="buildBase->runtime; runtime" />
 		
 		<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" />
-- 
cgit 


From 7319256a37b1ca78d6ff736e3db2caaf59b55e68 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 10 Sep 2018 22:24:42 +0200
Subject: [website] some work on releasing edge and updating git.

---
 buildScripts/website.ant.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'buildScripts')

diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index ddcb2219..f7a86fd4 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -209,15 +209,22 @@ such as applying the templates to produce the website, converting the changelog
 			username="${ssh.username}"
 			keyfile="${ssh.keyfile}"
 			knownHosts="ssh.knownHosts" />
+		<exec executable="/usr/bin/git" failonerror="true">
+			<arg value="merge-base" />
+			<arg value="--is-ancestor" />
+			<arg value="edge" />
+			<arg value="master" />
+		</exec>
 		<exec executable="/usr/bin/git">
-			<arg value="tag" />
+			<arg value="branch" />
 			<arg value="-f" />
-			<arg value="live" />
+			<arg value="edge" />
+			<arg value="master" />
 		</exec>
 		<exec executable="/usr/bin/git">
 			<arg value="push" />
-			<arg value="-f" />
-			<arg value="--tags" />
+			<arg value="origin" />
+			<arg value="edge:refs/heads/edge" />
 		</exec>
 	</target>
 	
-- 
cgit 


From db91eb8e9cec2686d3dc0a6e880985e070fc9430 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 10 Sep 2018 22:42:08 +0200
Subject: Fully integrating ‘ant edge-release’ to include updating the site,
 our mavenrepo on projectlombok.org, and the branch on git.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.xml                    | 72 +++++++++++++++++++++++---------------------
 buildScripts/website.ant.xml |  4 ++-
 2 files changed, 40 insertions(+), 36 deletions(-)

(limited to 'buildScripts')

diff --git a/build.xml b/build.xml
index a33b31e3..02c1e343 100644
--- a/build.xml
+++ b/build.xml
@@ -32,7 +32,6 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	<property name="rt-openjdk8" location="lib/openJDK8Environment/openjdk8_rt.jar" />
 	<available file="${rt-openjdk6}" property="rt-openjdk6.available" />
 	<available file="${rt-openjdk8}" property="rt-openjdk8.available" />
-	<property environment="env"/>
 	
 	<path id="build.path">
 		<fileset dir="lib/build">
@@ -368,38 +367,6 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo>
 		<property name="lombok.dist.built" value="true" />
 	</target>
 	
-	<target name="-mvn-ext">
-		<condition property="mvn-ext" value=".cmd" else="">
-			<os family="windows" />
-		</condition>
-	</target>
-	
-	<target name="-version-edge">
-		<property name="lombok.version.mvn" value="edge-SNAPSHOT" />
-	</target>
-	
-	<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="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=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>
-		</condition>
-		<fail message="mvn is not on your path and/or MAVEN_HOME is not set. Add mvn to your path or set MAVEN_HOME to continue." if="mvn-notfound" />
-	</target>
-	
 	<target name="dist-utils" description="Builds lombok-utils.jar, which is a library used by i.e. lombok.ast project." depends="version, compile">
 		<mkdir dir="dist" />
 		<jar destfile="dist/lombok-utils-${lombok.version}.jar">
@@ -929,7 +896,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 	<target name="publish-all" depends="clean, version, website-publish, maven-publish, publish"
 		description="Publishes lombok itself, updates the maven repository and the website." />
 	
-	<target name="edge-release" depends="config-ssh, clean, version, dist"
+	<target name="edge-release" depends="config-ssh, clean, version, dist, make-edge-as-maven_snapshot_repo"
 		description="Publishes an edge release for those who need to test a cutting edge build.">
 		<ant antfile="buildScripts/website.ant.xml" target="edgeRelease" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
@@ -991,7 +958,42 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 			<property name="ssh.keyfile" value="${ssh.keyfile}" />
 		</ant>
 	</target>
-
+	
+	<target name="-mvn-ext">
+		<condition property="mvn-ext" value=".cmd" else="">
+			<os family="windows" />
+		</condition>
+	</target>
+	
+	<target name="-version-edge">
+		<property name="lombok.version.mvn" value="edge-SNAPSHOT" />
+	</target>
+	
+	<target name="make-edge-as-maven_snapshot_repo" depends="-version-edge,-mvn-ext,-prepare-maven" description="Create a maven repo for the current snapshot into a build dir. The intent is for you to put that on a server someplace. Will invoke your local mvn installation.">
+		<property environment="env" />
+		<delete quiet="true" dir="build/edge-releases" />
+		<mkdir dir="build/edge-releases" />
+		<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="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=edge-SNAPSHOT" />
+			<arg value="-DpomFile=build/mavenPublish/pom.xml" />
+			<arg value="-Durl=file://${basedir}/build/edge-releases" />
+		</exec>
+		<condition property="mvn-notfound" value="true">
+			<not><isset property="mvn-result" /></not>
+		</condition>
+		<fail message="mvn is not on your path and/or MAVEN_HOME is not set. Add mvn to your path or set MAVEN_HOME to continue." if="mvn-notfound" />
+	</target>
+	
 	<target name="testAp-compile" depends="ensureBuildDeps">
 		<delete file="build/testAP/META-INF/services/javax.annotation.processing.Processor" quiet="true" />
 		<ivy:compile destdir="build/testAP" source="1.7" target="1.7">
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index f7a86fd4..a799e7fe 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -185,9 +185,11 @@ such as applying the templates to produce the website, converting the changelog
 			<arg value="build/website-edge/download-edge.html" />
 		</java>
 		<copy file="dist/lombok.jar" tofile="build/website-edge/lombok-edge.jar" />
-		
 		<tar destfile="dist/website-edge.tar.bz2" compression="bzip2">
 			<tarfileset dir="build/website-edge" />
+			<tarfileset dir="build">
+				<include name="edge-releases/**" />
+			</tarfileset>
 		</tar>
 	</target>
 	
-- 
cgit