You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/31 18:58:30 UTC
[maven-release] branch master updated: [MRELEASE-1096] Many cleanups and updates
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new 281b6801 [MRELEASE-1096] Many cleanups and updates
281b6801 is described below
commit 281b68016dcceaded2fa9308bd07e2efa4bf747d
Author: Niels Basjes <ni...@basjes.nl>
AuthorDate: Fri May 27 11:11:32 2022 +0200
[MRELEASE-1096] Many cleanups and updates
* Upgrade to SLF4J 1.7.36
* Upgrade to JUnit 4.13.2
In ITs:
* Upgrade to Maven Compiler Plugin 3.10.1
* Upgrade to Maven Invoker Plugin 3.2.2
* Upgrade to Plexus Maven Plugin 1.3.8
* Upgrade to Plexus Component Metadata 1.7.1
This closes #132
---
maven-release-manager/pom.xml | 16 +------------
.../src/test/resources/pomfinder/pom1.xml | 4 ++--
.../subproject1/expected-release-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-release-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-release-pom.xml | 2 +-
.../pom-with-namespace/subproject1/pom.xml | 2 +-
.../basic-pom-namespace/expected-pom.xml | 28 +---------------------
.../rewrite-for-branch/basic-pom-namespace/pom.xml | 28 +---------------------
.../subproject1/expected-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-pom.xml | 2 +-
.../pom-with-namespace/subproject1/pom.xml | 2 +-
.../subproject1/expected-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-pom.xml | 2 +-
.../pom-with-namespace/subproject1/pom.xml | 2 +-
.../basic-pom-namespace/expected-pom.xml | 28 +---------------------
.../basic-pom-namespace/pom.xml | 28 +---------------------
.../subproject1/expected-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-pom.xml | 2 +-
.../subproject1/pom.xml | 2 +-
.../subproject1/expected-pom.xml | 2 +-
.../pom-with-namespace/subproject1/pom.xml | 2 +-
maven-release-plugin/pom.xml | 6 ++---
.../src/it/projects/branch/MRELEASE-458/pom.xml | 2 +-
.../src/it/projects/branch/MRELEASE-694/pom.xml | 2 +-
.../prepare/MRELEASE-1053/module-a/pom.xml | 2 +-
.../prepare/MRELEASE-1053/module-parent/pom.xml | 2 +-
.../prepare/flat-multi-module/module-a/pom.xml | 2 +-
.../prepare/flat-multi-module/module-b/pom.xml | 2 +-
.../flat-multi-module/parent-project/pom.xml | 2 +-
.../prepare/regular-multi-module/module-a/pom.xml | 2 +-
.../prepare/regular-multi-module/module-b/pom.xml | 2 +-
.../projects/prepare/regular-multi-module/pom.xml | 2 +-
.../src/it/projects/prepare/semver-policy/pom.xml | 2 +-
.../setup/maven-project-naming-stub-policy/pom.xml | 4 ++--
.../maven-project-version-stub-policy/pom.xml | 4 ++--
.../src/it/setup/maven-scm-provider-dummy/pom.xml | 6 ++---
.../src/it/setup/maven-scm-provider-stub/pom.xml | 6 ++---
.../it/setup/maven-wagon-provider-dummy/pom.xml | 4 ++--
pom.xml | 20 ++++++++++++----
50 files changed, 75 insertions(+), 181 deletions(-)
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 7b3d442c..c896a466 100644
--- 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>
@@ -274,18 +274,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>reporting</id>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- </profiles>
</project>
diff --git a/maven-release-manager/src/test/resources/pomfinder/pom1.xml b/maven-release-manager/src/test/resources/pomfinder/pom1.xml
index e4c16d44..739cc86d 100644
--- 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/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml
index 84659e29..0a7660a2 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/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/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/pom.xml
index 8e2e0791..b79838c6 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject1/pom.xml
+++ b/maven-release-manager/src/test/resources/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/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml
index 84659e29..0a7660a2 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/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/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/pom.xml
index 8e2e0791..b79838c6 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-extension/subproject1/pom.xml
+++ b/maven-release-manager/src/test/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/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml
index 84659e29..0a7660a2 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/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/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/pom.xml
index fe46ed57..a95fe7b6 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-namespace/subproject1/pom.xml
+++ b/maven-release-manager/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/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml
index 53c4eed8..4da3a856 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml
+++ b/maven-release-manager/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/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml
index b85fbbed..69e6355d 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml
+++ b/maven-release-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/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/expected-pom.xml
index 8e2e0791..b79838c6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/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/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/pom.xml
index 8e2e0791..b79838c6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/pom.xml
+++ b/maven-release-manager/src/test/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/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/expected-pom.xml
index 8e2e0791..b79838c6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/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/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/pom.xml
index 8e2e0791..b79838c6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/pom.xml
+++ b/maven-release-manager/src/test/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/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/expected-pom.xml
index e7527c36..c1e9e8f8 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/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/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/pom.xml
index fe46ed57..a95fe7b6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/pom.xml
+++ b/maven-release-manager/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/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/expected-pom.xml
index b2cc4e3f..cbdbe197 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-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/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/pom.xml
index ca188f0c..69b6fd52 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-development/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/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/expected-pom.xml
index b2cc4e3f..cbdbe197 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/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/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/pom.xml
index ca188f0c..69b6fd52 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject1/pom.xml
+++ b/maven-release-manager/src/test/resources/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/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/expected-pom.xml
index b2cc4e3f..cbdbe197 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/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/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/pom.xml
index ca188f0c..69b6fd52 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-extension/subproject1/pom.xml
+++ b/maven-release-manager/src/test/resources/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/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml
index ce6629d0..71b7e4e0 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/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/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/pom.xml
index f847350f..55a039f5 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/pom.xml
+++ b/maven-release-manager/src/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/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/expected-pom.xml
index 9da9aa3a..81c4c7ac 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/expected-pom.xml
+++ b/maven-release-manager/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/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/pom.xml
index b85fbbed..69e6355d 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-namespace/pom.xml
+++ b/maven-release-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/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml
index ca188f0c..69b6fd52 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/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>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/pom.xml
index 8e2e0791..b79838c6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/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/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-extension/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-extension/subproject1/expected-pom.xml
index ca188f0c..69b6fd52 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-extension/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/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/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-extension/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-extension/subproject1/pom.xml
index 8e2e0791..b79838c6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-extension/subproject1/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/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/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml
index 36944d8f..cd25b04f 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/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/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml
index fe46ed57..a95fe7b6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/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/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 3e582d6f..5f2ecf9d 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-manager</artifactId>
- <version>3.0.0-M6-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -81,13 +81,13 @@
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-oddeven-policy</artifactId>
- <version>3.0.0-M6-SNAPSHOT</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-semver-policy</artifactId>
- <version>3.0.0-M6-SNAPSHOT</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
diff --git a/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml b/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml
index 46954b51..1dbd1b2a 100644
--- a/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml
+++ b/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-plugin/src/it/projects/branch/MRELEASE-694/pom.xml b/maven-release-plugin/src/it/projects/branch/MRELEASE-694/pom.xml
index e84c5ea1..96886a6b 100644
--- a/maven-release-plugin/src/it/projects/branch/MRELEASE-694/pom.xml
+++ b/maven-release-plugin/src/it/projects/branch/MRELEASE-694/pom.xml
@@ -54,7 +54,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4.2</version>
+ <version>@project.version@</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<updateBranchVersions>true</updateBranchVersions>
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
index 522ad946..27b10e64 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
@@ -32,7 +32,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/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml
index 9d7f7438..2fa53f76 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-a/pom.xml b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-a/pom.xml
index 061222fc..5dd958c9 100644
--- a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-a/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-a/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-b/pom.xml b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-b/pom.xml
index 81563eab..eb3b9429 100644
--- a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-b/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-b/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
index 8c27df66..7fefdf7b 100644
--- a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-a/pom.xml b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-a/pom.xml
index fa942cb2..a36a18a3 100644
--- a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-a/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-a/pom.xml
@@ -33,7 +33,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/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-b/pom.xml b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-b/pom.xml
index eafd261c..2103af3f 100644
--- a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-b/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-b/pom.xml
@@ -33,7 +33,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/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml
index 083c8df6..cd94c059 100644
--- a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>@junitVersion@</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-plugin/src/it/projects/prepare/semver-policy/pom.xml b/maven-release-plugin/src/it/projects/prepare/semver-policy/pom.xml
index df9eec73..53059f7a 100644
--- a/maven-release-plugin/src/it/projects/prepare/semver-policy/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/semver-policy/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugin.release.it</groupId>
- <artifactId>oddversion-policy</artifactId>
+ <artifactId>semver-policy</artifactId>
<version>1.0-SNAPSHOT</version>
<scm>
<connection>scm:dummy|nul</connection>
diff --git a/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/pom.xml b/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/pom.xml
index 5a5a96ed..2f6f9bf3 100644
--- a/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/pom.xml
+++ b/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/pom.xml
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -46,7 +46,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.7.1</version>
+ <version>@plexusComponentMetadataVersion@</version>
<executions>
<execution>
<id>process-classes</id>
diff --git a/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/pom.xml b/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/pom.xml
index 9d385278..6f0385bb 100644
--- a/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/pom.xml
+++ b/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/pom.xml
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.7.1</version>
+ <version>@plexusComponentMetadataVersion@</version>
<executions>
<execution>
<id>process-classes</id>
diff --git a/maven-release-plugin/src/it/setup/maven-scm-provider-dummy/pom.xml b/maven-release-plugin/src/it/setup/maven-scm-provider-dummy/pom.xml
index 9cfbe221..2564ff8e 100644
--- a/maven-release-plugin/src/it/setup/maven-scm-provider-dummy/pom.xml
+++ b/maven-release-plugin/src/it/setup/maven-scm-provider-dummy/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.1</version>
+ <version>@scmVersion@</version>
</dependency>
</dependencies>
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
+ <version>@plexusMavenPluginVersion@</version>
<executions>
<execution>
<goals>
diff --git a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/pom.xml b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/pom.xml
index 26cef6f3..0f3c6aa9 100644
--- a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/pom.xml
+++ b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.1</version>
+ <version>@scmVersion@</version>
</dependency>
</dependencies>
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
+ <version>@plexusMavenPluginVersion@</version>
<executions>
<execution>
<goals>
diff --git a/maven-release-plugin/src/it/setup/maven-wagon-provider-dummy/pom.xml b/maven-release-plugin/src/it/setup/maven-wagon-provider-dummy/pom.xml
index b2d9a0e1..85a1ca8a 100644
--- a/maven-release-plugin/src/it/setup/maven-wagon-provider-dummy/pom.xml
+++ b/maven-release-plugin/src/it/setup/maven-wagon-provider-dummy/pom.xml
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
+ <version>@plexusMavenPluginVersion@</version>
<executions>
<execution>
<goals>
diff --git a/pom.xml b/pom.xml
index b9054f7a..56caab4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,9 @@
<contributor>
<name>Thorsten Heit</name>
</contributor>
+ <contributor>
+ <name>Niels Basjes</name>
+ </contributor>
</contributors>
<properties>
@@ -93,8 +96,16 @@
<resolverVersion>1.0.0.v20140518</resolverVersion>
<wagonVersion>3.5.1</wagonVersion>
<surefire.version>3.0.0-M6</surefire.version>
+ <slf4jVersion>1.7.36</slf4jVersion>
+ <junitVersion>4.13.2</junitVersion>
<maven.site.path>maven-release-archives/maven-release-LATEST</maven.site.path>
<project.build.outputTimestamp>2022-01-02T10:18:49Z</project.build.outputTimestamp>
+
+ <mavenCompilerPluginVersion>3.10.1</mavenCompilerPluginVersion>
+ <mavenInvokerPluginVersion>3.2.2</mavenInvokerPluginVersion>
+
+ <plexusComponentMetadataVersion>1.7.1</plexusComponentMetadataVersion>
+ <plexusMavenPluginVersion>1.3.8</plexusMavenPluginVersion>
</properties>
<build>
@@ -106,6 +117,8 @@
<configuration>
<excludes combine.children="append">
<exclude>.repository</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/target/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -268,13 +281,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
- <scope>provided</scope>
+ <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.36</version>
+ <version>${slf4jVersion}</version>
<scope>test</scope>
</dependency>
@@ -297,7 +309,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <version>${junitVersion}</version>
<scope>test</scope>
</dependency>
<dependency>