You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2022/07/07 08:18:04 UTC

[GitHub] [maven-integration-testing] gnodet opened a new pull request, #184: Modernize IT plugins to use annotations

gnodet opened a new pull request, #184:
URL: https://github.com/apache/maven-integration-testing/pull/184

   This is to be applied on top of #176.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] michael-o commented on pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
michael-o commented on PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#issuecomment-1242789633

   @gnodet Kindly rebase.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet closed pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet closed pull request #184: Modernize IT plugins to use annotations
URL: https://github.com/apache/maven-integration-testing/pull/184


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet merged pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet merged PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] michael-o commented on a diff in pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
michael-o commented on code in PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#discussion_r991616440


##########
core-it-suite/src/test/resources/mng-3703/project/pom.xml:
##########
@@ -19,7 +19,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.9.1</version>

Review Comment:
   Does it make sense to move to a newer version here? 3.9.1 is old already.



##########
core-it-suite/src/test/resources-filtered/bootstrap.txt:
##########
@@ -122,34 +114,29 @@ org.apache.maven.resolver:maven-resolver-util:1.7.3
 org.apache.maven.shared:maven-artifact-transfer:0.11.0
 org.apache.maven.shared:maven-common-artifact-filters:3.1.0
 org.apache.maven.shared:maven-shared-utils:3.3.3
-org.apache.maven.skins:maven-default-skin:1.0
-org.apache.maven.surefire:surefire-junit4:2.12.4
-org.apache.maven.surefire:surefire-junit4:2.22.0
-org.apache.maven.wagon:wagon-webdav-jackrabbit:2.0
+org.apache.maven.skins:maven-default-skin:1.3
+org.apache.maven.surefire:surefire-junit4:3.0.0-M7
 org.apache.maven.wagon:wagon-webdav-jackrabbit:2.10
-org.apache.maven:maven-aether-provider:3.1.1
-org.apache.maven:maven-artifact-manager:2.1.0
-org.apache.maven:maven-core:3.1.0
-org.apache.maven:maven-core:3.3.1
-org.apache.maven:maven-model:2.1.0
+org.apache.maven.wagon:wagon-webdav:1.0-beta-2

Review Comment:
   We must be rid of this ancient extension if possible. Likely separate PR.



##########
core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml:
##########
@@ -47,7 +47,7 @@ under the License.
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-webdav-jackrabbit</artifactId>
-        <version>2.0</version>
+        <version>2.10</version>

Review Comment:
   See my comment in `bootstrap.txt`



##########
core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/pom.xml:
##########
@@ -42,7 +42,35 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.6.5-20221006.213415-47</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.6.5-20221006.213415-47</version>

Review Comment:
   So this requires a snapshot and shouldn't be on master, right?



##########
core-it-suite/src/test/resources/mng-6506-package-annotation/plugin/pom.xml:
##########
@@ -27,21 +27,17 @@ under the License.
   <version>0.1</version>
   <packaging>maven-plugin</packaging>
 
-  <properties>
-    <maven-version>3.6.0</maven-version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>${maven-version}</version>
+      <version>3.3</version>

Review Comment:
   3.6.4?



##########
core-it-suite/src/test/resources/mng-6189-site-reportPlugins-warning/pom.xml:
##########
@@ -52,7 +52,7 @@ under the License.
             <reportPlugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-surefire-report-plugin</artifactId>
-              <version>2.5</version>
+              <version>3.0.0-M5</version>

Review Comment:
   M7?



##########
core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java:
##########
@@ -615,16 +615,16 @@ protected Verifier newVerifier( String basedir, String settings, boolean debug )
             // Java9 requires at least 1.6
             if ( VersionRange.createFromVersionSpec( "[9,12)" ).containsVersion( getJavaVersion() ) )
             {
-                verifier.getSystemProperties().put( "maven.compiler.source", "1.7" );
-                verifier.getSystemProperties().put( "maven.compiler.target", "1.7" );
-                verifier.getSystemProperties().put( "maven.compiler.release", "7" );
+                verifier.getSystemProperties().put( "maven.compiler.source", "1.8" );
+                verifier.getSystemProperties().put( "maven.compiler.target", "1.8" );
+                verifier.getSystemProperties().put( "maven.compiler.release", "8" );
             }
             // Java12 requires at least 7
             if ( VersionRange.createFromVersionSpec( "[12,)" ).containsVersion( getJavaVersion() ) )
             {
-                verifier.getSystemProperties().put( "maven.compiler.source", "7" );
-                verifier.getSystemProperties().put( "maven.compiler.target", "7" );
-                verifier.getSystemProperties().put( "maven.compiler.release", "7" );
+                verifier.getSystemProperties().put( "maven.compiler.source", "8" );
+                verifier.getSystemProperties().put( "maven.compiler.target", "8" );
+                verifier.getSystemProperties().put( "maven.compiler.release", "8" );
             }

Review Comment:
   This distinction is useless by now, isn't it? Like the TLS version setting.



##########
core-it-suite/src/test/resources/mng-5561-plugin-relocation-loses-configuration/old-plugin-with-relocation/pom.xml:
##########
@@ -9,8 +9,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <maven-version>3.1.0</maven-version>

Review Comment:
   Is this used in deps?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet commented on pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet commented on PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#issuecomment-1378679796

   > > > verifier.getSystemProperties()
   > > 
   > > 
   > > > Don't use `verifier.getSystemProperties().put(String, String)`, but `#AddCliArgument("-D....")`.
   > > 
   > > 
   > > Please consider the fact that I haven't changed much code, and I certainly have not introduced such constructs. These changes are unrelated to the current PR which is already quite big. I'd rather not expand the focus of this PR too much. It's already been sitting there for 6 months and the longer it waits the harder it will be to review / maintain.
   > 
   > I agree, you are right. This is a separate topic.
   
   Also, `verifier.getProperties()` isn't deprecated, so it may be worth deprecating it...


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet commented on pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet commented on PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#issuecomment-1378614669

   > verifier.getSystemProperties()
   
   
   
   > Don't use `verifier.getSystemProperties().put(String, String)`, but `#AddCliArgument("-D....")`.
   
   Please consider the fact that I haven't changed much code, and I certainly have not introduced such constructs.  These changes are unrelated to the current PR which is already quite big.  I'd rather not expand the focus of this PR too much.  It's already been sitting there for 6 months and the longer it waits the harder it will be to review / maintain.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] slawekjaranowski commented on a diff in pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
slawekjaranowski commented on code in PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#discussion_r989720602


##########
core-it-suite/pom.xml:
##########
@@ -495,7 +832,7 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.0</version>
+            <version>3.3.0</version>

Review Comment:
   Is version needed here, in line 358 you remove version tag



##########
core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml:
##########
@@ -10,24 +10,32 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>3.0-beta-3</version>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>3.8.6</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.0-beta-3</version>
+      <artifactId>maven-core</artifactId>
+      <version>3.8.6</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>3.8.6</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>3.0-beta-3</version>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.4.2</version>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>junit</groupId>-->
+<!--      <artifactId>junit</artifactId>-->
+<!--      <version>3.8.1</version>-->
+<!--      <scope>test</scope>-->
+<!--    </dependency>-->

Review Comment:
   please remove commented block



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet commented on pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet commented on PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#issuecomment-1378485124

   Fwiw, this [commit](https://github.com/apache/maven-integration-testing/pull/184/commits/c4709de0e64a65a05c02db5c0ed2bb2ccf187a33) removes two ITs which [are not supported](https://issues.apache.org/jira/browse/MPLUGIN-435) by recent versions of the `maven-plugin-plugin`.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet commented on pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet commented on PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#issuecomment-1273641816

   @slawekjaranowski would you mind having another look ?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet commented on a diff in pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#discussion_r989466447


##########
core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java:
##########
@@ -35,42 +38,35 @@
 /**
  * Checks the general retrieval of components from active component collections.
  *
- * @goal check
- * @phase validate
- *
  * @author Benjamin Bentmann
  */
+@Mojo( name = "check", defaultPhase = LifecyclePhase.VALIDATE )
 public class CheckMojo
     extends AbstractMojo
 {
 
     /**
      * Project base directory used for manual path alignment.
-     *
-     * @parameter default-value="${basedir}"
-     * @readonly
      */
+    @Parameter( defaultValue = "${basedir}", readonly = true )
     private File basedir;
 
     /**
      * The available components, as a map.
-     *
-     * @component role="org.apache.maven.plugin.coreit.Component"
      */
-    private Map componentMap;
+    @org.apache.maven.plugins.annotations.Component

Review Comment:
   This is not doable.  The full declaration looks like:
   ```
       @org.apache.maven.plugins.annotations.Component
       private Map<String, Component> componentMap;
   ```
   The `Component` interface is defined by at least 4 modules...



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] slawekjaranowski commented on a diff in pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
slawekjaranowski commented on code in PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#discussion_r989426423


##########
core-it-suite/src/test/resources/mng-5663-nested-import-scope-pom-resolution/pom-template.xml:
##########
@@ -65,7 +65,7 @@ under the License.
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>3.2.0</version>

Review Comment:
   3.3.0



##########
core-it-suite/src/test/resources/mng-5663-nested-import-scope-pom-resolution/pom-template.xml:
##########
@@ -75,7 +75,7 @@ under the License.
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>3.2.2</version>

Review Comment:
   3.3.0 ?



##########
core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml:
##########
@@ -70,12 +70,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.0-M1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
+          <version>3.0.0-M2</version>

Review Comment:
   3.0.0 ?



##########
core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml:
##########
@@ -70,12 +70,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.0-M1</version>

Review Comment:
   3.0.1 ?



##########
core-it-suite/src/test/resources/mng-5663-nested-import-scope-pom-resolution/pom-template.xml:
##########
@@ -85,7 +85,7 @@ under the License.
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.2</version>
+                    <version>3.0.0-M1</version>

Review Comment:
   3.0.1 ?



##########
core-it-suite/src/test/resources/mng-5868/pom.xml:
##########
@@ -33,6 +33,11 @@
             <artifactClassifier>run</artifactClassifier>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>3.0.0-M2</version>

Review Comment:
   3.3.0 ?



##########
core-it-suite/src/test/resources/mng-5669-read-poms-once/pom.xml:
##########
@@ -49,12 +49,12 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M5</version>
+          <version>3.0.0-M7</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.2.2</version>

Review Comment:
   3.3.0 ?



##########
core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml:
##########
@@ -37,17 +37,17 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.4.0</version>

Review Comment:
   3.4.2 ?



##########
core-it-suite/src/test/resources/mng-7349-relocation-warning/artifacts/pom.xml:
##########
@@ -11,7 +11,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>

Review Comment:
   1.8 ?



##########
core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml:
##########
@@ -37,17 +37,17 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.4.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.2</version>
+          <version>3.2.2</version>

Review Comment:
   3.3.0 ?



##########
core-it-support/core-it-plugins/maven-it-plugin-active-collection/pom.xml:
##########
@@ -45,12 +45,18 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>2.0</version>

Review Comment:
   to remove ?



##########
core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalAggregatorMojo.java:
##########
@@ -21,34 +21,36 @@
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
 import java.util.List;
 
 /**
- * @goal fork-goal-aggregator
- * @aggregator true
- * @execute goal="touch"
  */
+@Mojo( name = "fork-goal-aggregator", aggregator = true )
+@Execute( goal = "touch" )
 public class ForkGoalAggregatorMojo
     extends AbstractMojo
 {
     /**
-     * @parameter default-value="${project}"
      */
+    @Parameter( defaultValue = "${project}" )
     private MavenProject project;
 
     /**
-     * @parameter default-value="${reactorProjects}"
      */
-    private List reactorProjects;
+    @Parameter( defaultValue = "${reactorProjects}" )
+    private List<MavenProject> reactorProjects;
 
     public void execute()
         throws MojoExecutionException
     {
-        for ( Object reactorProject : reactorProjects )
+        for ( MavenProject reactorProject : reactorProjects )
         {
-            MavenProject executedProject = ( (MavenProject) reactorProject ).getExecutionProject();
+            MavenProject executedProject = ( reactorProject ).getExecutionProject();

Review Comment:
   parentheses not needed



##########
core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java:
##########
@@ -35,42 +38,35 @@
 /**
  * Checks the general retrieval of components from active component collections.
  *
- * @goal check
- * @phase validate
- *
  * @author Benjamin Bentmann
  */
+@Mojo( name = "check", defaultPhase = LifecyclePhase.VALIDATE )
 public class CheckMojo
     extends AbstractMojo
 {
 
     /**
      * Project base directory used for manual path alignment.
-     *
-     * @parameter default-value="${basedir}"
-     * @readonly
      */
+    @Parameter( defaultValue = "${basedir}", readonly = true )
     private File basedir;
 
     /**
      * The available components, as a map.
-     *
-     * @component role="org.apache.maven.plugin.coreit.Component"
      */
-    private Map componentMap;
+    @org.apache.maven.plugins.annotations.Component

Review Comment:
   please add import



##########
core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java:
##########
@@ -34,47 +37,42 @@
  *
  * @author Benjamin Bentmann
  *
- * @goal it
- * @phase initialize
- */
+  */
+@Mojo( name = "it", defaultPhase = LifecyclePhase.INITIALIZE )
 public class ItMojo
     extends AbstractMojo
 {
 
     /**
      * The path to the output file.
-     *
-     * @parameter property="touch.outputFile" default-value="target/comp.properties"
      */
+    @Parameter( property = "touch.outputFile", defaultValue = "target/comp.properties" )
     private File outputFile;
 
     /**
      * Component lookup without role hint.
      *
-     * @component
      */
+    @org.apache.maven.plugins.annotations.Component
     private Component componentWithoutRoleHint;
 
     /**
      * Component lookup with explicit role hint.
-     *
-     * @component roleHint="default"
      */
+    @org.apache.maven.plugins.annotations.Component( hint = "default" )
     private Component componentWithRoleHint;
 
     /**
      * Component lookup via active map.
-     *
-     * @component role="org.apache.maven.plugin.coreit.Component"
      */
-    private Map componentMap;
+    @org.apache.maven.plugins.annotations.Component

Review Comment:
   import



##########
core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/ParameterImplementationMojo.java:
##########
@@ -30,6 +30,9 @@
 /**
  * Check that we correctly use the implementation parameter.
  *
+ * TODO: this mojo can not be converted to mojo annotations
+ * TODO: because the @Parameter#implementation has never been implemented.
+ *
  * @goal param-implementation

Review Comment:
   https://issues.apache.org/jira/browse/MPLUGIN-410 



##########
core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java:
##########
@@ -32,25 +35,23 @@
  *
  * @author Benjamin Bentmann
  *
- * @goal it
- * @phase initialize
- */
+  */
+@Mojo( name = "it", defaultPhase = LifecyclePhase.INITIALIZE )
 public class ItMojo
     extends AbstractMojo
 {
 
     /**
      * The path to the output file.
-     *
-     * @parameter property="touch.outputFile" default-value="target/comp.properties"
      */
+    @Parameter( property = "touch.outputFile", defaultValue = "target/comp.properties" )
     private File outputFile;
 
     /**
      * NOTE: We don't specify a role hint here!
      *
-     * @component
      */
+    @org.apache.maven.plugins.annotations.Component

Review Comment:
   import



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] michael-o commented on pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
michael-o commented on PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#issuecomment-1273773077

   Looking through...


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet commented on a diff in pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#discussion_r991848926


##########
core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/pom.xml:
##########
@@ -42,7 +42,35 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.6.5-20221006.213415-47</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.6.5-20221006.213415-47</version>

Review Comment:
   Ah, right.  Though we're never releasing this project, so not sure it's as much a problem...
   I'll try to get a release of `maven-plugin-tools` out asap.  
   @michael-o @slawekjaranowski any problem with a release ?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] slawekjaranowski commented on a diff in pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
slawekjaranowski commented on code in PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#discussion_r991874718


##########
core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/pom.xml:
##########
@@ -42,7 +42,35 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.6.5-20221006.213415-47</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.6.5-20221006.213415-47</version>

Review Comment:
   @gnodet  - No problem with next releases, we have many resolved issues. 
   Only open issues for next release should be reviewed.
   Give me a day or two, I would like to look into it.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet commented on pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet commented on PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#issuecomment-1251006199

   > @gnodet Kindly rebase.
   
   I plan to rebase on master once #176 is merged.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] gnodet commented on a diff in pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#discussion_r1003463011


##########
core-it-suite/src/test/resources/mng-3703/project/pom.xml:
##########
@@ -19,7 +19,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.9.1</version>

Review Comment:
   Moved to latest.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-integration-testing] michael-o commented on pull request #184: Modernize IT plugins to use annotations

Posted by GitBox <gi...@apache.org>.
michael-o commented on PR #184:
URL: https://github.com/apache/maven-integration-testing/pull/184#issuecomment-1378619448

   > > verifier.getSystemProperties()
   > 
   > > Don't use `verifier.getSystemProperties().put(String, String)`, but `#AddCliArgument("-D....")`.
   > 
   > Please consider the fact that I haven't changed much code, and I certainly have not introduced such constructs. These changes are unrelated to the current PR which is already quite big. I'd rather not expand the focus of this PR too much. It's already been sitting there for 6 months and the longer it waits the harder it will be to review / maintain.
   
   I agree, you are right. This is a separate topic.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org