diff options
| author | Jan Rieke <rieke@subshell.com> | 2018-09-12 09:30:40 +0200 |
|---|---|---|
| committer | Jan Rieke <rieke@subshell.com> | 2018-09-12 09:30:40 +0200 |
| commit | da0020cd48bfd321ec68adc99af7ec46e1551231 (patch) | |
| tree | c85ff3b3a2bf2ed391bdeda50c349b8831d13e13 /buildScripts | |
| parent | ddd42acb599d45c432a200313a0f403a8a2a3928 (diff) | |
| parent | 2027ffc49f194da2892938e0cd5868cd286a06f6 (diff) | |
| download | lombok-da0020cd48bfd321ec68adc99af7ec46e1551231.tar.gz lombok-da0020cd48bfd321ec68adc99af7ec46e1551231.tar.bz2 lombok-da0020cd48bfd321ec68adc99af7ec46e1551231.zip | |
Merge remote-tracking branch 'upstream/master' into superToBuilder
Diffstat (limited to 'buildScripts')
| -rw-r--r-- | buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.24.xml | 14 | ||||
| -rw-r--r-- | buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.28.xml (renamed from buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.26.xml) | 4 | ||||
| -rw-r--r-- | buildScripts/ivy.xml | 2 | ||||
| -rw-r--r-- | buildScripts/website.ant.xml | 21 |
4 files changed, 23 insertions, 18 deletions
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.28.xml index 6525604f..5ff77341 100644 --- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.26.xml +++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.28.xml @@ -1,5 +1,5 @@ <ivy-module version="2.0"> - <info organisation="org.projectlombok" module="lombok.patcher" revision="0.26" publication="20180528200000"> + <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" /> @@ -9,6 +9,6 @@ <conf name="default" /> </configurations> <publications> - <artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.26.jar" /> + <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" /> diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index 5c996fc6..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> @@ -209,6 +211,23 @@ 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="branch" /> + <arg value="-f" /> + <arg value="edge" /> + <arg value="master" /> + </exec> + <exec executable="/usr/bin/git"> + <arg value="push" /> + <arg value="origin" /> + <arg value="edge:refs/heads/edge" /> + </exec> </target> <target name="javadoc" description="Generates the javadoc" depends="-ensure-version, -ensure-fullversion" unless="skip.javadoc"> |