diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml index 7b3d442c5..c896a4667 100644 --- a/maven-release-manager/pom.xml +++ b/maven-release-manager/pom.xml @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 3.0.0-M6-SNAPSHOT + ${project.version} @@ -274,18 +274,4 @@ - - - reporting - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.8 - - - - - diff --git a/maven-release-manager/src/test/resources/pomfinder/pom1.xml b/maven-release-manager/src/test/resources/pomfinder/pom1.xml index e4c16d445..739cc86da 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 @@ junit junit - 3.8.2 + ${junitVersion} test @@ -193,7 +193,7 @@ org.codehaus.plexus plexus-maven-plugin - 1.3.8 + @plexusMavenPluginVersion@ create-component-descriptor 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 84659e29e..0a7660a2b 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. junit junit - 3.8.1 + @junitVersion@ test 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 8e2e0791d..b79838c6f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 84659e29e..0a7660a2b 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. junit junit - 3.8.1 + @junitVersion@ test 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 8e2e0791d..b79838c6f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 84659e29e..0a7660a2b 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. junit junit - 3.8.1 + @junitVersion@ test 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 fe46ed579..a95fe7b6b 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 53c4eed8e..4da3a8565 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 @@ org.apache.maven.plugins maven-invoker-plugin - 1.2 + ${mavenInvokerPluginVersion} src/it @@ -125,32 +125,6 @@ - - - org.apache.maven.plugins - maven-install-plugin - - - it-preparation - pre-integration-test - - install-file - - - ${project.build.directory}/${project.build.finalName}.jar - ${project.groupId} - ${project.artifactId} - ${project.version} - ${project.packaging} - ${basedir}/pom.xml - true - ${project.build.directory}/local-repo - - local - - - - 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 b85fbbed9..69e6355de 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 @@ org.apache.maven.plugins maven-invoker-plugin - 1.2 + ${mavenInvokerPluginVersion} src/it @@ -127,32 +127,6 @@ - - - org.apache.maven.plugins - maven-install-plugin - - - it-preparation - pre-integration-test - - install-file - - - ${project.build.directory}/${project.build.finalName}.jar - ${project.groupId} - ${project.artifactId} - ${project.version} - ${project.packaging} - ${basedir}/pom.xml - true - ${project.build.directory}/local-repo - - local - - - - 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 8e2e0791d..b79838c6f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 8e2e0791d..b79838c6f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 8e2e0791d..b79838c6f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 8e2e0791d..b79838c6f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 e7527c36f..c1e9e8f80 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 fe46ed579..a95fe7b6b 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 b2cc4e3ff..cbdbe197f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 ca188f0c5..69b6fd521 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 b2cc4e3ff..cbdbe197f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 ca188f0c5..69b6fd521 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 b2cc4e3ff..cbdbe197f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 ca188f0c5..69b6fd521 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 ce6629d01..71b7e4e00 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 f847350fe..55a039f5d 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 9da9aa3a6..81c4c7ac7 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 @@ org.apache.maven.plugins maven-invoker-plugin - 1.2 + ${mavenInvokerPluginVersion} src/it @@ -125,32 +125,6 @@ - - - org.apache.maven.plugins - maven-install-plugin - - - it-preparation - pre-integration-test - - install-file - - - ${project.build.directory}/${project.build.finalName}.jar - ${project.groupId} - ${project.artifactId} - ${project.version} - ${project.packaging} - ${basedir}/pom.xml - true - ${project.build.directory}/local-repo - - local - - - - 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 b85fbbed9..69e6355de 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 @@ org.apache.maven.plugins maven-invoker-plugin - 1.2 + ${mavenInvokerPluginVersion} src/it @@ -127,32 +127,6 @@ - - - org.apache.maven.plugins - maven-install-plugin - - - it-preparation - pre-integration-test - - install-file - - - ${project.build.directory}/${project.build.finalName}.jar - ${project.groupId} - ${project.artifactId} - ${project.version} - ${project.packaging} - ${basedir}/pom.xml - true - ${project.build.directory}/local-repo - - local - - - - 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 ca188f0c5..69b6fd521 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 8e2e0791d..b79838c6f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 ca188f0c5..69b6fd521 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 8e2e0791d..b79838c6f 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 36944d8f8..cd25b04f0 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 fe46ed579..a95fe7b6b 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 @@ junit junit - 3.8.1 + @junitVersion@ test diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml index 3e582d6f4..5f2ecf9d2 100644 --- a/maven-release-plugin/pom.xml +++ b/maven-release-plugin/pom.xml @@ -42,7 +42,7 @@ org.apache.maven.release maven-release-manager - 3.0.0-M6-SNAPSHOT + ${project.version} org.apache.maven @@ -81,13 +81,13 @@ org.apache.maven.release maven-release-oddeven-policy - 3.0.0-M6-SNAPSHOT + ${project.version} true org.apache.maven.release maven-release-semver-policy - 3.0.0-M6-SNAPSHOT + ${project.version} true 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 46954b51c..1dbd1b2a1 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 e84c5ea17..96886a6b8 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 @@ org.apache.maven.plugins maven-release-plugin - 2.4.2 + @project.version@ true true 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 522ad946c..27b10e643 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. junit junit - 3.8.1 + @junitVersion@ test 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 9d7f7438d..2fa53f764 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 061222fcf..5dd958c94 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 81563eab0..eb3b94296 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 8c27df667..7fefdf7b8 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 fa942cb22..a36a18a3e 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. junit junit - 3.8.1 + @junitVersion@ test 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 eafd261c4..2103af3ff 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. junit junit - 3.8.1 + @junitVersion@ test 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 083c8df6a..cd94c059d 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 @@ junit junit - 3.8.1 + @junitVersion@ test 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 df9eec731..53059f7ab 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"> 4.0.0 org.apache.maven.plugin.release.it - oddversion-policy + semver-policy 1.0-SNAPSHOT scm:dummy|nul 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 5a5a96edb..2f6f9bf37 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 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ UTF-8 @@ -46,7 +46,7 @@ org.codehaus.plexus plexus-component-metadata - 1.7.1 + @plexusComponentMetadataVersion@ process-classes 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 9d3852782..6f0385bbc 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 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ UTF-8 @@ -51,7 +51,7 @@ org.codehaus.plexus plexus-component-metadata - 1.7.1 + @plexusComponentMetadataVersion@ process-classes 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 9cfbe221f..2564ff8ed 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 @@ org.apache.maven.scm maven-scm-api - 1.1 + @scmVersion@ @@ -41,7 +41,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ UTF-8 @@ -49,7 +49,7 @@ org.codehaus.plexus plexus-maven-plugin - 1.3.8 + @plexusMavenPluginVersion@ 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 26cef6f39..0f3c6aa95 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 @@ org.apache.maven.scm maven-scm-api - 1.1 + @scmVersion@ @@ -43,7 +43,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ UTF-8 @@ -51,7 +51,7 @@ org.codehaus.plexus plexus-maven-plugin - 1.3.8 + @plexusMavenPluginVersion@ 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 b2d9a0e15..85a1ca8a7 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 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ UTF-8 @@ -51,7 +51,7 @@ org.codehaus.plexus plexus-maven-plugin - 1.3.8 + @plexusMavenPluginVersion@ diff --git a/pom.xml b/pom.xml index b9054f7ae..56caab4d4 100644 --- a/pom.xml +++ b/pom.xml @@ -84,6 +84,9 @@ Thorsten Heit + + Niels Basjes + @@ -93,8 +96,16 @@ 1.0.0.v20140518 3.5.1 3.0.0-M6 + 1.7.36 + 4.13.2 maven-release-archives/maven-release-LATEST 2022-01-02T10:18:49Z + + 3.10.1 + 3.2.2 + + 1.7.1 + 1.3.8 @@ -106,6 +117,8 @@ .repository + **/*.iml + **/target/** @@ -268,13 +281,12 @@ org.slf4j slf4j-api - 1.7.5 - provided + ${slf4jVersion} org.slf4j slf4j-simple - 1.7.36 + ${slf4jVersion} test @@ -297,7 +309,7 @@ junit junit - 4.13.2 + ${junitVersion} test