You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2024/05/03 14:58:23 UTC
(maven-changelog-plugin) 03/03: [MCHANGELOG-154] Cleanup after update
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCHANGELOG-154
in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
commit d4dbaf0da296391517117497c3c911523276e03a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri May 3 16:58:08 2024 +0200
[MCHANGELOG-154] Cleanup after update
---
pom.xml | 20 ++++++--------------
src/it/with-svnjava-maven-3/pom.xml | 32 +++++++++++++++-----------------
2 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3b69d3b..d417844 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,12 +145,11 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <surefire.version>2.21.0</surefire.version>
<maven-scm.version>1.9.2</maven-scm.version>
<doxiaVersion>1.1.4</doxiaVersion>
<mavenVersion>2.2.1</mavenVersion>
<!-- used in ITs -->
- <sitePluginVersion>3.3</sitePluginVersion>
+ <sitePluginVersion>${version.maven-site-plugin}</sitePluginVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -160,25 +159,30 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</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-settings</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- shared -->
@@ -320,18 +324,6 @@ under the License.
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.6.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<reporting>
<plugins>
<plugin>
diff --git a/src/it/with-svnjava-maven-3/pom.xml b/src/it/with-svnjava-maven-3/pom.xml
index 2d09c9c..e5cc1d4 100644
--- a/src/it/with-svnjava-maven-3/pom.xml
+++ b/src/it/with-svnjava-maven-3/pom.xml
@@ -60,25 +60,23 @@
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>@pom.version@</version>
<configuration>
- <reportPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>@pom.version@</version>
- <configuration>
- <issueIDRegexPattern>[A-Z]{2,}-\d+</issueIDRegexPattern>
- <issueLinkUrl>http://jira.example.co.uk</issueLinkUrl>
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
- </configuration>
- </plugin>
- </reportPlugins>
+ <issueIDRegexPattern>[A-Z]{2,}-\d+</issueIDRegexPattern>
+ <issueLinkUrl>http://jira.example.co.uk</issueLinkUrl>
+ <providerImplementations>
+ <svn>javasvn</svn>
+ </providerImplementations>
</configuration>
</plugin>
</plugins>
-
- </build>
-
+ </reporting>
</project>