[MSCMPUB-58] Upgrade plugins and components (in ITs)

This closes #21
apache · Mar 26, 2023 · 603ee6f · 603ee6f
1 parent f240e7d
commit 603ee6f
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 52 deletions.
diff --git a/pom.xml b/pom.xml
@@ -65,9 +65,14 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <scmVersion>2.0.0-M3</scmVersion>
     <mavenVersion>3.2.5</mavenVersion>
     <javaVersion>8</javaVersion>
+    <scmVersion>2.0.0</scmVersion>
+    <releaseVersion>3.0.0</releaseVersion>
+    <sitePluginVersion>3.12.1</sitePluginVersion>
+    <antrunPluginVersion>3.1.0</antrunPluginVersion>
+    <projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion>
+    <javadocPluginVersion>3.5.0</javadocPluginVersion>
 
     <!-- for documentation purpose -->
     <maven-scm-provider-svnjava-version>2.0.6</maven-scm-provider-svnjava-version>
@@ -78,39 +83,43 @@ under the License.
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.release</groupId>
-      <artifactId>maven-release-manager</artifactId>
-      <version>3.0.0-M7</version>
+      <artifactId>maven-release-api</artifactId>
+      <version>${releaseVersion}</version>
     </dependency>
-    <!-- remove with maven-release-manager upgrade -->
     <dependency>
-      <groupId>org.apache.sshd</groupId>
-      <artifactId>sshd-core</artifactId>
-      <version>2.9.2</version>
+      <groupId>org.apache.maven.release</groupId>
+      <artifactId>maven-release-manager</artifactId>
+      <version>${releaseVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.sshd</groupId>
-      <artifactId>sshd-common</artifactId>
-      <version>2.9.2</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.sshd</groupId>
-      <artifactId>sshd-osgi</artifactId>
-      <version>2.9.2</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
+      <artifactId>maven-settings</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
+      <artifactId>maven-settings-builder</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
+      <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -122,6 +131,11 @@ under the License.
       <artifactId>maven-shared-utils</artifactId>
       <version>3.3.4</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.5.1</version>
+    </dependency>
     <!-- remove with maven-shared-utils upgrade -->
     <dependency>
       <groupId>commons-io</groupId>
@@ -140,13 +154,10 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-gitexe</artifactId>
-      <version>${scmVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-svnexe</artifactId>
+      <artifactId>maven-scm-providers-standard</artifactId>
       <version>${scmVersion}</version>
+      <type>pom</type>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>

diff --git a/src/it/issue-mscmpub-50/pom.xml b/src/it/issue-mscmpub-50/pom.xml
@@ -40,7 +40,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
+          <version>@sitePluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>@antrunPluginVersion@</version>
         <executions>
           <execution>
             <id>ln</id>
@@ -83,7 +83,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
+        <version>@projectInfoReportsPluginVersion@</version>
         <configuration>
           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -92,7 +92,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>@javadocPluginVersion@</version>
         <configuration>
         </configuration>
       </plugin>

diff --git a/src/it/publish-scm-skip/pom.xml b/src/it/publish-scm-skip/pom.xml
@@ -40,7 +40,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
+          <version>@sitePluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>@antrunPluginVersion@</version>
         <executions>
           <execution>
             <id>ln</id>
@@ -83,7 +83,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
+        <version>@projectInfoReportsPluginVersion@</version>
         <configuration>
           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -92,9 +92,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-        </configuration>
+        <version>@javadocPluginVersion@</version>
       </plugin>
     </plugins>
   </reporting>

diff --git a/src/it/publish-scm-staged/pom.xml b/src/it/publish-scm-staged/pom.xml
@@ -40,7 +40,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
+          <version>@sitePluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -56,7 +56,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
+        <version>@projectInfoReportsPluginVersion@</version>
         <configuration>
           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -65,9 +65,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-        </configuration>
+        <version>@javadocPluginVersion@</version>
       </plugin>
     </plugins>
   </reporting>

diff --git a/src/it/publish-scm/pom.xml b/src/it/publish-scm/pom.xml
@@ -40,7 +40,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
+          <version>@sitePluginVersion@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -56,7 +56,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>@antrunPluginVersion@</version>
         <executions>
           <execution>
             <id>ln</id>
@@ -82,7 +82,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
+        <version>@projectInfoReportsPluginVersion@</version>
         <configuration>
           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -91,9 +91,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-        </configuration>
+        <version>@javadocPluginVersion@</version>
       </plugin>
     </plugins>
   </reporting>

diff --git a/src/it/site-deploy/pom.xml b/src/it/site-deploy/pom.xml
@@ -40,7 +40,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
+          <version>@sitePluginVersion@</version>
           <configuration>
             <skipDeploy>true</skipDeploy>
           </configuration>
@@ -63,9 +63,6 @@
             <goals>
               <goal>stage</goal>
             </goals>
-            <configuration>
-              <skipDeploy>false</skipDeploy><!-- MSITE-652: configuration won't be necessary with m-site-p 3.2 -->
-            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -91,7 +88,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
+        <version>@projectInfoReportsPluginVersion@</version>
         <configuration>
           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -100,9 +97,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-        </configuration>
+        <version>@javadocPluginVersion@</version>
       </plugin>
     </plugins>
   </reporting>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -35,7 +35,7 @@ under the License.
     <menu name="Example">
       <item name="Maven Mono Module Configuration" href="examples/one-module-configuration.html"/>
       <item name="Maven Multi module Configuration" href="examples/multi-module-configuration.html"/>
-      <item name="Importing Maven sites" href="examples/importing-maven-site.html"/>
+      <item name="Importing Maven Sites" href="examples/importing-maven-site.html"/>
     </menu>
   </body>
 </project>