Merge remote-tracking branch 'remotes/upstream/master'

3 files changed, 78 insertions, 8 deletions

diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 81f50f4c..a27c909e 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -14,6 +14,7 @@
 		<conf name="ecj9" />
 		<conf name="javac6" />
 		<conf name="javac7" />
+		<conf name="supporters" />
 	</configurations>
 	<dependencies>
 		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.24" conf="buildBase->default; runtime->default" />
@@ -22,10 +23,10 @@
 		<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" />
 		<dependency org="log4j" name="log4j" rev="1.2.16" conf="test->default; contrib->sources" />
 		<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.0-beta4" conf="test->default; contrib->sources" />
-		<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="test->default; contrib->sources"/>
-		<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="test->default; contrib->sources"/>
-		<dependency org="org.slf4j" name="slf4j-ext" rev="1.6.1" conf="test->default; contrib->sources"/>
-		<dependency org="org.jboss.logging" name="jboss-logging" rev="3.3.0.Final"  conf="test->default; contrib->sources"/>
+		<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="test->default; contrib->sources" />
+		<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="test->default; contrib->sources" />
+		<dependency org="org.slf4j" name="slf4j-ext" rev="1.6.1" conf="test->default; contrib->sources" />
+		<dependency org="org.jboss.logging" name="jboss-logging" rev="3.3.0.Final"  conf="test->default; contrib->sources" />
 	
 		<dependency org="com.google.guava" name="guava" rev="18.0" conf="test->default; contrib->sources" />
 		<dependency org="com.google.code.findbugs" name="findbugs" rev="3.0.0" conf="test->master" />
@@ -56,5 +57,11 @@
 		<dependency org="org.eclipse.custom" name="osgi" rev="3.9.0" conf="eclipseBuild->default; contrib->sources" />
 		<dependency org="org.eclipse.custom" name="core.resources" rev="3.8.100" conf="eclipseBuild->default; contrib->sources" />
 		<dependency org="org.eclipse.custom" name="core.jobs" rev="3.5.300" conf="eclipseBuild->default; contrib->sources" />
+		
+		<dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant" rev="4.11.0.201803080745-r" conf="supporters->default" />
+		<dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="4.11.0.201803080745-r" conf="supporters->default" />
+		<dependency org="com.jcraft" name="jsch" rev="0.1.54" conf="supporters->default" />
+		<dependency org="com.rimerosolutions.ant" name="ant-git-tasks" rev="1.3.2" conf="supporters->default" />
+		<dependency org="org.slf4j" name="slf4j-simple" rev="1.6.1" conf="supporters->default" />
 	</dependencies>
 </ivy-module>
diff --git a/buildScripts/supporters.ant.xml b/buildScripts/supporters.ant.xml
new file mode 100644
index 00000000..d1d3fedc
--- /dev/null
+++ b/buildScripts/supporters.ant.xml
@@ -0,0 +1,57 @@
+<!--
+  Copyright (C) 2010-2017 The Project Lombok Authors.
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+-->
+<project name="lombok-supporters" default="updateRepo" basedir=".." xmlns:ivy="antlib:com.zwitserloot.ivyplusplus" xmlns:git="antlib:com.rimerosolutions.ant.git">
+	<description>
+This buildfile is part of projectlombok.org. It is responsible for updating/maintaining the separate git repository
+containing the status of lombok's supporters.
+	</description>
+	
+	<path id="supporters.path">
+		<fileset dir="lib/supporters">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<taskdef uri="antlib:com.rimerosolutions.ant.git" resource="com/rimerosolutions/ant/git/jgit-ant-lib.xml" classpathref="supporters.path" />
+	
+	<target name="checkIfRepoExists">
+		<available file="website/lombokSupporters/.git/HEAD" property="supportersrepo.exists" />
+	</target>
+	
+	<target name="initRepo" depends="checkIfRepoExists" unless="supportersrepo.exists">
+		<git:git directory="website/lombokSupporters">
+			<git:clone uri="escudo2:/data/git/lombokSupporters.git" />
+		</git:git>
+	</target>
+	
+	<target name="updateRepo" depends="initRepo" unless="noUpdateRepo">
+		<git:git directory="website/lombokSupporters">
+			<git:pull />
+		</git:git>
+	</target>
+	
+	<target name="deployToWebsiteBuild" depends="updateRepo">
+		<copy todir="build/website/files" overwrite="true" failonerror="false" quiet="true">
+			<fileset dir="website/lombokSupporters" />
+		</copy>
+	</target>
+</project>
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index 36b3a193..5c996fc6 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -37,13 +37,17 @@ such as applying the templates to produce the website, converting the changelog
 		<delete dir="build/website" quiet="true" />
 	</target>
 	
-	<target name="website-only" description="Prepares the website for distribution using the lombok version currently 'live'." depends="-fetch-version-from-site, -show-version, -ensure-version, -website-main, -delete-edge-page, -website-only-dist" />
+	<target name="website-only" description="Prepares the website for distribution using the lombok version currently 'live'." depends="-fetch-version-from-site, -show-version, -ensure-version, -website-main, -delete-edge-page" />
 	
 	<target name="-delete-edge-page">
 		<delete file="build/website/download-edge.html" />
 	</target>
 	
-	<target name="website" description="Prepares the website for distribution" depends="javadoc, -website-main, -website-dist" />
+	<target name="website" description="Prepares the website for distribution" depends="javadoc, -website-main" />
+	
+	<target name="website-supporters" description="Updates website supporters store and adds it to the website build.">
+		<ant antfile="buildScripts/supporters.ant.xml" target="deployToWebsiteBuild" inheritAll="false" />
+	</target>
 	
 	<target name="-fetch-version-from-site" depends="-compile-webclasses">
 		<fail if="lombok.version">lombok.version already set.</fail>
@@ -80,6 +84,8 @@ such as applying the templates to produce the website, converting the changelog
 	<target name="-compile-webclasses">
 		<mkdir dir="build/webclasses" />
 		<javac includeDestClasses="false" includeantruntime="false" destdir="build/webclasses" debug="on" source="1.8" target="1.8">
+			<compilerarg value="-proc:none" />
+			<compilerarg value="-Xlint:-options" />
 			<classpath refid="build.path" />
 			<src path="src/website" />
 		</javac>
@@ -132,8 +138,8 @@ such as applying the templates to produce the website, converting the changelog
 		</tar>
 	</target>
 	
-	<target name="website-publish" depends="website, -send-site-to-remote" />
-	<target name="website-only-publish" depends="website-only, -send-site-to-remote" />
+	<target name="website-publish" depends="website, website-supporters, -website-dist, -send-site-to-remote" />
+	<target name="website-only-publish" depends="website-only, website-supporters, -website-only-dist, -send-site-to-remote" />
 	<target name="-send-site-to-remote" depends="-requires-ssh">
 		<ivy:scpUpload
 			from="dist/website.tar.bz2"