[MRELEASE-1096] Many cleanups and updates

apache · May 27, 2022 · a32681c · a32681c
1 parent e4abd0f
commit a32681c
Show file tree

Hide file tree

Showing 50 changed files with 76 additions and 167 deletions.
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.maven.release</groupId>
       <artifactId>maven-release-api</artifactId>
-      <version>3.0.0-M6-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -284,7 +284,7 @@
           <plugin>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-maven-plugin</artifactId>
-            <version>1.3.8</version>
+            <version>${plexusMavenPluginVersion}</version>
           </plugin>
         </plugins>
       </reporting>

diff --git a/maven-release-manager/src/test/resources/pomfinder/pom1.xml b/maven-release-manager/src/test/resources/pomfinder/pom1.xml
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>${junitVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -193,7 +193,7 @@
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>
-        <version>1.3.8</version>
+        <version>@plexusMavenPluginVersion@</version>
         <executions>
           <execution>
             <id>create-component-descriptor</id>

diff --git a/...generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml b/...generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml
@@ -67,7 +67,7 @@ under the License.
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...sources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/pom.xml b/...sources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...ts/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml b/...ts/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml
@@ -67,7 +67,7 @@ under the License.
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/.../resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/pom.xml b/.../resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...es/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml b/...es/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml
@@ -67,7 +67,7 @@ under the License.
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/.../src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/pom.xml b/.../src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...nager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml b/...nager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml
@@ -92,7 +92,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.2</version>
+            <version>${mavenInvokerPluginVersion}</version>
             <configuration>
               <projectsDirectory>src/it</projectsDirectory>
               <pomIncludes>
@@ -125,32 +125,6 @@
               </execution>
             </executions>
           </plugin>
-          <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>it-preparation</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>${project.packaging}</packaging>
-                  <pomFile>${basedir}/pom.xml</pomFile>
-                  <createChecksum>true</createChecksum>
-                  <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-                  <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
-                  <localRepositoryId>local</localRepositoryId>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/...elease-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml b/...elease-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml
@@ -94,7 +94,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.2</version>
+            <version>${mavenInvokerPluginVersion}</version>
             <configuration>
               <projectsDirectory>src/it</projectsDirectory>
               <pomIncludes>
@@ -127,32 +127,6 @@
               </execution>
             </executions>
           </plugin>
-          <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>it-preparation</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>${project.packaging}</packaging>
-                  <pomFile>${basedir}/pom.xml</pomFile>
-                  <createChecksum>true</createChecksum>
-                  <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-                  <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
-                  <localRepositoryId>local</localRepositoryId>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/...s/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/expected-pom.xml b/...s/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/expected-pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/.../resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/pom.xml b/.../resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...rces/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/expected-pom.xml b/...rces/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/expected-pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...est/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/pom.xml b/...est/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...est/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/expected-pom.xml b/...est/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/expected-pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...ger/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/pom.xml b/...ger/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...al-snapshot-dependencies-without-dependencies-version-update/subproject1/expected-pom.xml b/...al-snapshot-dependencies-without-dependencies-version-update/subproject1/expected-pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...nt/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/pom.xml b/...nt/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...jects/rewrite-for-development/internal-snapshot-dependencies/subproject1/expected-pom.xml b/...jects/rewrite-for-development/internal-snapshot-dependencies/subproject1/expected-pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...urces/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/pom.xml b/...urces/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...projects/rewrite-for-development/internal-snapshot-extension/subproject1/expected-pom.xml b/...projects/rewrite-for-development/internal-snapshot-extension/subproject1/expected-pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...esources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/pom.xml b/...esources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...esources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml b/...esources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...rc/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/pom.xml b/...rc/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...ager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/expected-pom.xml b/...ager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/expected-pom.xml
@@ -92,7 +92,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.2</version>
+            <version>${mavenInvokerPluginVersion}</version>
             <configuration>
               <projectsDirectory>src/it</projectsDirectory>
               <pomIncludes>
@@ -125,32 +125,6 @@
               </execution>
             </executions>
           </plugin>
-          <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>it-preparation</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>${project.packaging}</packaging>
-                  <pomFile>${basedir}/pom.xml</pomFile>
-                  <createChecksum>true</createChecksum>
-                  <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-                  <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
-                  <localRepositoryId>local</localRepositoryId>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/...lease-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/pom.xml b/...lease-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/pom.xml
@@ -94,7 +94,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.2</version>
+            <version>${mavenInvokerPluginVersion}</version>
             <configuration>
               <projectsDirectory>src/it</projectsDirectory>
               <pomIncludes>
@@ -127,32 +127,6 @@
               </execution>
             </executions>
           </plugin>
-          <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>it-preparation</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>${project.packaging}</packaging>
-                  <pomFile>${basedir}/pom.xml</pomFile>
-                  <createChecksum>true</createChecksum>
-                  <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-                  <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
-                  <localRepositoryId>local</localRepositoryId>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/.../projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml b/.../projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>@junitVersion@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>