This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch updates in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
commit fefe857d29e88e1ab2faa5a5903434bbfec2f843 Author: Michael Osipov <[email protected]> AuthorDate: Sun Mar 26 14:51:07 2023 +0200 updates --- pom.xml | 27 +++++++++------------------ src/it/issue-mscmpub-50/pom.xml | 8 ++++---- src/it/publish-scm-skip/pom.xml | 10 ++++------ src/it/publish-scm-staged/pom.xml | 8 +++----- src/it/publish-scm/pom.xml | 10 ++++------ src/it/site-deploy/pom.xml | 11 +++-------- src/site/site.xml | 2 +- 7 files changed, 28 insertions(+), 48 deletions(-) diff --git a/pom.xml b/pom.xml index 33b006b..aec175a 100644 --- a/pom.xml +++ b/pom.xml @@ -65,9 +65,13 @@ under the License. </distributionManagement> <properties> - <scmVersion>2.0.0-M3</scmVersion> + <scmVersion>2.0.0</scmVersion> <mavenVersion>3.2.5</mavenVersion> <javaVersion>8</javaVersion> + <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> @@ -79,38 +83,25 @@ under the License. <dependency> <groupId>org.apache.maven.release</groupId> <artifactId>maven-release-manager</artifactId> - <version>3.0.0-M7</version> - </dependency> - <!-- remove with maven-release-manager upgrade --> - <dependency> - <groupId>org.apache.sshd</groupId> - <artifactId>sshd-core</artifactId> - <version>2.9.2</version> - </dependency> - <dependency> - <groupId>org.apache.sshd</groupId> - <artifactId>sshd-common</artifactId> - <version>2.9.2</version> - </dependency> - <dependency> - <groupId>org.apache.sshd</groupId> - <artifactId>sshd-osgi</artifactId> - <version>2.9.2</version> + <version>3.0.0</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> <version>${mavenVersion}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>${mavenVersion}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-settings</artifactId> <version>${mavenVersion}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> diff --git a/src/it/issue-mscmpub-50/pom.xml b/src/it/issue-mscmpub-50/pom.xml index e6d27dc..1240af6 100644 --- 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 index 6620d64..e5e265e 100644 --- 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 index a6c8f23..c9652c9 100644 --- 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 index 4347fab..f7cbb48 100644 --- 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 index 130cf11..7dc8039 100644 --- 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 index ac80c7c..0600ff3 100644 --- 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>
