Merge branch 'master' into extensionmethod

Conflicts:
	build.xml

1 files changed, 88 insertions, 53 deletions

diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 1d8fc26b..3dfbde7e 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -1,64 +1,64 @@
 <ivy-module version="2.0">
 	<info organisation="projectlombok.org" module="lombok" />
 	<configurations>
-		<conf name="eclipseBuild" />
-		<conf name="netbeansBuild" />
-		<conf name="buildBase" extends="netbeansBuild, javac6" />
-		<conf name="build" extends="buildBase, eclipseBuild" />
-		<conf name="moduleBuild" />
-		<conf name="buildWithoutEclipse" extends="buildBase" />
-		<conf name="runtime" />
-		<conf name="test" extends="runtime" />
-		<conf name="contrib" />
-		<conf name="ecj7" />
-		<conf name="ecj8" />
-		<conf name="ecj9" />
+		<!-- dependencies for the build itself, such as tools to create the website or deploy to servers. -->
+		<conf name="buildtools" />
+		
+		<!-- dependencies needed only for the 'manage lombok supporters' part of the build -->
+		<conf name="supporters" />
+		
+		<!-- test: base dependencies required to run the tests. Does not include javac or ecj. -->
+		<conf name="test" />
+		
+		<!-- stripe: dependencies that need to be on the classpath during builds -->
+		<conf name="build" />
+		
+		<!-- stripe: dependencies that need to be striped into lombok.jar itself, and are required for both build and test/run purposes -->
+		<conf name="stripe" />
+		
+		<!-- sources of various dependencies where having the sources is useful (for example for debugging purposes) -->
+		<conf name="sources" />
+		
+		<!-- and now for custom configs for testing lombok against -->
+		
 		<conf name="javac6" />
 		<conf name="javac7" />
-		<conf name="supporters" />
+		<conf name="javac8" />
+		
+		<conf name="ecj8" />
+		<conf name="ecj11" />
+		<conf name="ecj14" />
+		
+		<conf name="eclipse-oxygen" />
+		<conf name="eclipse-202006" />
+		
+		<conf name="mapstruct" />
 	</configurations>
 	<dependencies>
-		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.36" 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" />
-		<dependency org="log4j" name="log4j" rev="1.2.17" conf="test->default; contrib->sources" />
-		<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.11.1" conf="test->default; contrib->sources" />
-		<dependency org="commons-logging" name="commons-logging" rev="1.2" conf="test->default; contrib->sources" />
-		<dependency org="org.slf4j" name="slf4j-api" rev="1.8.0-beta2" conf="test->default; contrib->sources" />
-		<dependency org="org.slf4j" name="slf4j-ext" rev="1.8.0-beta2" 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.flogger" name="flogger" rev="0.2" conf="test->default; contrib->sources" />
-	
-		<dependency org="com.google.guava" name="guava" rev="18.0" conf="test->default; contrib->sources" />
+		
+		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.36" conf="build,stripe->default" />
+		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build,stripe->runtime" />
+		<dependency org="projectlombok.org" name="spi" rev="0.2.7" conf="build" />
+		<dependency org="org.apache.ant" name="ant" rev="1.10.5" conf="build->default" />
+		
+		<!-- test deps -->
+		<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; sources" />
+		<dependency org="log4j" name="log4j" rev="1.2.17" conf="test->default; sources" />
+		<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.11.1" conf="test->default; sources" />
+		<dependency org="commons-logging" name="commons-logging" rev="1.2" conf="test->default; sources" />
+		<dependency org="org.slf4j" name="slf4j-api" rev="1.8.0-beta2" conf="test->default; sources" />
+		<dependency org="org.slf4j" name="slf4j-ext" rev="1.8.0-beta2" conf="test->default; sources" />
+		<dependency org="org.jboss.logging" name="jboss-logging" rev="3.3.0.Final" conf="test->default; sources" />
+		<dependency org="com.google.flogger" name="flogger" rev="0.2" conf="test->default; sources" />
+		<dependency org="com.google.guava" name="guava" rev="18.0" conf="test->default; sources" />
 		<dependency org="com.google.code.findbugs" name="findbugs" rev="3.0.1" conf="test->master" />
 		
-		<dependency org="org.apache.ant" name="ant" rev="1.10.5" conf="buildBase->default; contrib->sources" />
-		<dependency org="projectlombok.org" name="spi" rev="0.2.7" conf="buildBase->build" />
-		<dependency org="com.hierynomus" name="sshj" rev="0.26.0" conf="buildBase->default" />
-		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="buildBase->build" />
-		<dependency org="de.java2html" name="java2html" rev="5.0" conf="buildBase->default" />
-		<dependency org="org.freemarker" name="freemarker" rev="2.3.28" conf="buildBase->default" />
-		
-		<dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="javac6->runtime; contrib->sources" />
-		<dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" />
-		<dependency org="org.eclipse.custom" name="ecj" rev="4.3.1" conf="ecj7->default; contrib->sources" />
-		<dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="4.6.1" conf="ecj8->default; contrib->sources" />
-		<dependency org="org.eclipse.jdt" name="ecj" rev="3.15.1" conf="ecj9->default; eclipseBuild->default" />
-		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.compiler.apt" rev="1.3.300" conf="ecj9->default; eclipseBuild->default" />
-		
-		<dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" />
-		<dependency org="netbeans.org" name="openide.modules" rev="6.8beta" conf="netbeansBuild->build" />
-		<dependency org="netbeans.org" name="openide.util" rev="6.8beta" conf="netbeansBuild->build" />
-		<dependency org="netbeans.org" name="modules.java.source" rev="6.8beta" conf="netbeansBuild->build" />
-		
-		<dependency org="org.eclipse.platform" name="org.eclipse.core.runtime" rev="3.17.0" conf="eclipseBuild->default; contrib->sources" transitive="false" />
-		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.20.0" conf="eclipseBuild->default; contrib->sources" transitive="false" />
-		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.12.2" conf="eclipseBuild->default; contrib->sources" transitive="false" />
-		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.common" rev="3.10.600" conf="eclipseBuild->default; contrib->sources" transitive="false" />
-		<dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.15.100" conf="eclipseBuild->default; contrib->sources" transitive="false" />
-		<dependency org="org.eclipse.platform" name="org.eclipse.core.resources" rev="3.13.600" conf="eclipseBuild->default; contrib->sources" transitive="false" />
-		<dependency org="org.eclipse.platform" name="org.eclipse.core.jobs" rev="3.10.600" conf="eclipseBuild->default; contrib->sources" transitive="false" />
+		<!-- build tooling -->
+		<dependency org="com.hierynomus" name="sshj" rev="0.26.0" conf="buildtools->default" />
+		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="buildtools->build" />
+		<dependency org="de.java2html" name="java2html" rev="5.0" conf="buildtools->default" />
+		<dependency org="org.freemarker" name="freemarker" rev="2.3.28" conf="buildtools->default" />
+		<dependency org="com.sparkjava" name="spark-core" rev="2.9.2" conf="buildtools->default" />
 		
 		<dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant" rev="5.2.0.201812061821-r" conf="supporters->default" />
 		<dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="5.2.0.201812061821-r" conf="supporters->default" />
@@ -66,6 +66,41 @@
 		<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.8.0-beta2" conf="supporters->default" />
 		
-		<dependency org="org.mapstruct" name="mapstruct-processor" rev="1.3.0.Beta1" conf="moduleBuild->default" />
+		<!-- javacs -->
+		<dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="javac6->runtime" />
+		<dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime" />
+		<dependency org="net.java.openjdk.custom" name="javac8" rev="1.8.0" conf="javac8->runtime" />
+		
+		<!-- ecjs -->
+		
+		<dependency org="org.eclipse.jdt" name="ecj" rev="3.22.0.v20200530-2032" conf="ecj14->master" />
+		<dependency org="org.eclipse.jdt" name="ecj" rev="3.16.0" conf="ecj11->master" />
+		<!-- until oct 2016, ecj was released under org 'org.eclipse.jdt.core.compiler', and the versioning followed eclipse's versions. -->
+		<!-- after that, it switched to group 'org.eclipse.jdt', and follows its own version. That means 3.16.0 is a later release than 4.6.1 on the old group! -->
+		<dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="4.4.2" conf="ecj8->master" />
+		
+		<!-- eclipses -->
+		
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.runtime" rev="3.13.0" conf="eclipse-oxygen->default" transitive="false" />
+		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.13.102" conf="eclipse-oxygen->default" transitive="false" />
+		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.13.100" conf="eclipse-oxygen->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.common" rev="3.9.0" conf="eclipse-oxygen->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.resources" rev="3.12.0" conf="eclipse-oxygen->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.jobs" rev="3.9.0" conf="eclipse-oxygen->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.12.100" conf="eclipse-oxygen->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.text" rev="3.6.100" conf="eclipse-oxygen->default" transitive="false" />
+		
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.runtime" rev="3.18.0" conf="eclipse-202006->default" transitive="false" />
+		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.22.0" conf="eclipse-202006->default" transitive="false" />
+		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.21.100" conf="eclipse-202006->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.common" rev="3.12.0" conf="eclipse-202006->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.preferences" rev="3.8.0" conf="eclipse-202006->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.resources" rev="3.13.700" conf="eclipse-202006->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.jobs" rev="3.10.800" conf="eclipse-202006->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.15.300" conf="eclipse-202006->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.text" rev="3.10.200" conf="eclipse-202006->default" transitive="false" />
+		
+		<!-- integration with other libraries -->
+		<dependency org="org.mapstruct" name="mapstruct-processor" rev="1.3.1.Final" conf="mapstruct->default" transitive="false" />
 	</dependencies>
 </ivy-module>