switch to component annotations and update dependency versions

#972
groovy · Oct 16, 2019 · 9473964 · 9473964
1 parent f948e3a
commit 9473964
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/extras/groovy-eclipse-compiler/pom.xml b/extras/groovy-eclipse-compiler/pom.xml
@@ -57,6 +57,11 @@
 			<artifactId>maven-plugin-api</artifactId>
 			<version>3.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugin-tools</groupId>
+			<artifactId>maven-plugin-annotations</artifactId>
+			<version>3.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-eclipse-batch</artifactId>
@@ -66,17 +71,17 @@
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-compiler-api</artifactId>
-			<version>2.8.2</version>
+			<version>2.8.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-component-annotations</artifactId>
-			<version>1.7.1</version>
+			<version>2.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-container-default</artifactId>
-			<version>1.7.1</version>
+			<version>2.0.0</version>
 		</dependency>
 	</dependencies>
 
@@ -106,7 +111,7 @@
 								<requireMavenVersion>
 									<version>[3.0.0,)</version>
 								</requireMavenVersion>
-								<!-- TODO: maven-compiler-plugin [3.6.2,) or tycho-compiler-plugin [1.?.0,) <https://bugs.eclipse.org/bugs/show_bug.cgi?id=548409> -->
+								<!-- TODO: maven-compiler-plugin [3.6.2,) or tycho-compiler-plugin [1.5.0,) -->
 							</rules>
 						</configuration>
 					</execution>
@@ -115,7 +120,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.1</version>
+				<version>3.1.1</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -138,7 +143,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.0.1</version>
+				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>

diff --git a/...e-compiler/src/main/java/org/codehaus/groovy/eclipse/compiler/AddGroovySourceFolders.java b/...e-compiler/src/main/java/org/codehaus/groovy/eclipse/compiler/AddGroovySourceFolders.java
@@ -18,23 +18,20 @@
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
 /**
  * Adds <tt>src/main/groovy</tt> and <tt>src/test/groovy</tt> as source folders.
  *
- * @goal  add-groovy-build-paths
- * @phase initialize
  * @since 2.6.0
- * @threadSafe
  */
+@Mojo(name = "add-groovy-build-paths", defaultPhase = LifecyclePhase.INITIALIZE, requiresProject = true, threadSafe = true)
 public class AddGroovySourceFolders extends AbstractMojo {
 
-    /**
-     * @parameter property="project"
-     * @readonly
-     * @required
-     */
+    @Parameter(defaultValue = "${project}", readonly = true, required = true)
     private MavenProject project;
 
     @Override

diff --git a/...se-compiler/src/main/java/org/codehaus/groovy/eclipse/compiler/GroovyEclipseCompiler.java b/...se-compiler/src/main/java/org/codehaus/groovy/eclipse/compiler/GroovyEclipseCompiler.java
@@ -288,7 +288,7 @@ public String[] createCommandLine(CompilerConfiguration config) throws CompilerE
                 args.put("-target", target.trim());
             }
         }
-        // TODO: Maven 3.7.1: <multiReleaseOutput>
+        // TODO: Maven Compiler 3.7.1: <multiReleaseOutput>
 
         if (config.isShowDeprecation()) {
             args.put("-deprecation", null);