update maven stuff

extras/groovy-eclipse-batch-builder/build.properties

@@ -1,6 +1,6 @@
 # version numbers
-version2.5=2.5.14-01
-version3.0=3.0.8-02
+version2.5=2.5.14-02
+version3.0=3.0.8-01
 version4.0=4.0.0-01
 
 # uncomment to do a particular build -- only one should be uncommented at a time

extras/groovy-eclipse-compiler-tests/.project

@@ -2,15 +2,11 @@
 <projectDescription>
 	<name>groovy-eclipse-compiler-tests</name>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

extras/groovy-eclipse-compiler-tests/src/it/apt-explicit/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>29.0-jre</version>
+      <version>30.1.1-jre</version>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
@@ -36,13 +36,13 @@
     <dependency>
       <groupId>org.immutables</groupId>
       <artifactId>value</artifactId>
-      <version>2.7.4</version>
+      <version>2.8.8</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/apt-implicit/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>29.0-jre</version>
+      <version>30.1.1-jre</version>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
@@ -36,13 +36,13 @@
     <dependency>
       <groupId>org.immutables</groupId>
       <artifactId>value</artifactId>
-      <version>2.7.4</version>
+      <version>2.8.8</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/apt-lombok/pom.xml

@@ -10,7 +10,7 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
-    <lombok.version>1.18.12</lombok.version>
+    <lombok.version>1.18.20</lombok.version>
 
     <maven.compiler.fork>true</maven.compiler.fork>
     <maven.compiler.source>1.8</maven.compiler.source>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/apt-mapstruct/pom.xml

@@ -10,7 +10,7 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
-    <mapstruct.version>1.3.1.Final</mapstruct.version>
+    <mapstruct.version>1.4.2.Final</mapstruct.version>
 
     <maven.compiler.fork>true</maven.compiler.fork>
     <maven.compiler.source>1.8</maven.compiler.source>
@@ -26,14 +26,14 @@
     </dependency>
     <dependency>
       <groupId>org.mapstruct</groupId>
-      <artifactId>mapstruct-jdk8</artifactId>
+      <artifactId>mapstruct</artifactId>
       <version>${mapstruct.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/basic-java/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/basic-mixed/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/basic-no-java0/pom.xml

@@ -26,7 +26,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/basic-no-java1/pom.xml

@@ -26,7 +26,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/basic-no-java2/pom.xml

@@ -26,7 +26,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/basic-standard/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/config-script/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/enable-preview/pom.xml

@@ -24,7 +24,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/invoke-dynamic/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/not-incremental/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-compiler-tests/src/it/toolchain-aware/pom.xml

@@ -24,7 +24,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

extras/groovy-eclipse-maven-tests/pom.xml

@@ -23,19 +23,20 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<version>4.13.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>2.13.3</version>
+			<version>2.14.1</version>
 			<scope>runtime</scope>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
+			<classifier>indy</classifier>
 			<version>2.5.14</version>
 		</dependency>
 	</dependencies>
@@ -48,13 +49,13 @@
 				<version>3.8.1</version>
 				<configuration>
 					<compilerId>groovy-eclipse-compiler</compilerId>
-					<!--compilerArgs>
-						<arg>-indy</arg>
-						<arg>-configScript=</arg>
-					</compilerArgs-->
+					<compilerArguments>
+						<!--configScript></configScript-->
+						<indy/>
+					</compilerArguments>
 					<includes>
-						<include>**/*.java</include>
 						<include>**/*.groovy</include>
+						<include>**/*.java</include>
 					</includes>
 					<excludes>
 						<exclude>scripts/**</exclude>
@@ -71,7 +72,7 @@
 					<dependency>
 						<groupId>org.codehaus.groovy</groupId>
 						<artifactId>groovy-eclipse-batch</artifactId>
-						<version>2.5.14-01</version>
+						<version>2.5.14-02</version>
 					</dependency>
 				</dependencies>
 			</plugin>

extras/groovy-eclipse-quickstart/.project

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>groovy-eclipse-quickstart</name>
 	<buildSpec>

extras/groovy-eclipse-quickstart/.settings/org.eclipse.core.runtime.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n

extras/groovy-eclipse-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -1,24 +1,24 @@
-<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 https://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
- name="groovy-eclipse-quickstart">
-  <fileSets>
-    <fileSet encoding="UTF-8" filtered="true" packaged="true">
-      <directory>src/main/groovy</directory>
-    </fileSet>
-    <fileSet encoding="UTF-8" filtered="true" packaged="true">
-      <directory>src/main/java</directory>
-    </fileSet>
-    <fileSet encoding="UTF-8" filtered="true" packaged="true">
-      <directory>src/test/groovy</directory>
-    </fileSet>
-    <fileSet encoding="UTF-8" filtered="true" packaged="true">
-      <directory>src/test/java</directory>
-    </fileSet>
-    <fileSet encoding="UTF-8">
-      <directory></directory>
-      <includes>
-        <include>config.groovy</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
+<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 https://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
+ name="groovy-eclipse-quickstart">
+  <fileSets>
+    <fileSet encoding="UTF-8" filtered="true" packaged="true">
+      <directory>src/main/groovy</directory>
+    </fileSet>
+    <fileSet encoding="UTF-8" filtered="true" packaged="true">
+      <directory>src/main/java</directory>
+    </fileSet>
+    <fileSet encoding="UTF-8" filtered="true" packaged="true">
+      <directory>src/test/groovy</directory>
+    </fileSet>
+    <fileSet encoding="UTF-8" filtered="true" packaged="true">
+      <directory>src/test/java</directory>
+    </fileSet>
+    <fileSet encoding="UTF-8">
+      <directory></directory>
+      <includes>
+        <include>config.groovy</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</archetype-descriptor>

extras/groovy-eclipse-quickstart/src/main/resources/archetype-resources/config.groovy

@@ -1,2 +1,2 @@
-configuration.optimizationOptions.indy = true
-configuration.parameters = true
+configuration.optimizationOptions.indy = true
+configuration.parameters = true

extras/groovy-eclipse-quickstart/src/main/resources/archetype-resources/pom.xml

@@ -38,7 +38,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -64,7 +64,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.5.14-01</version>
+            <version>2.5.14-02</version>
           </dependency>
         </dependencies>
       </plugin>