diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml index 536a5b90fd29..6bb0069a2791 100644 --- a/its/core-it-suite/pom.xml +++ b/its/core-it-suite/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.its core-its - 2.1-SNAPSHOT + 4.0.0-rc-4-SNAPSHOT core-it-suite @@ -36,12 +36,22 @@ under the License. mvn clean test -Prun-its - This will subject the Maven version running the build to the integration tests. If you would like to test a different - Maven distribution, you can use the system property "mavenHome" to specify the path of the Maven distribution to test: + This will test the Maven distribution generated by the current build (apache-maven/target/apache-maven-xxx.zip). + + If you would like to test the Maven version running the build instead, use the "maven-from-build" profile: + + mvn clean test -Prun-its,maven-from-build + + The "maven-from-build" profile restores the old default behavior where the integration tests run against the + Maven installation that is executing the build (i.e., the value of ${maven.home}). This is useful when you want + to test against a specific Maven installation without having to build the distribution first. + + You can also specify the path of a specific Maven distribution to test using the "mavenHome" property (this + automatically activates the "maven-from-build" profile): mvn clean test -Prun-its -DmavenHome= - Alternatively, you can just specify the version of a previously installed/deployed Maven distribution which will be + Alternatively, you can specify the version of a previously installed/deployed Maven distribution which will be downloaded, unpacked and tested: mvn clean test -Prun-its -DmavenVersion=2.2.1 @@ -62,8 +72,8 @@ under the License. --> - - ${maven.home} + + ${project.build.directory}/apache-maven ${mavenHome} @@ -80,6 +90,8 @@ under the License. 9.4.57.v20241219 0.1-stub-SNAPSHOT + + 2.1-SNAPSHOT @@ -125,37 +137,37 @@ under the License. org.apache.maven.its maven-it-plugin-bootstrap - ${project.version} + ${core-it-support-version} org.apache.maven.its core-it-component - ${project.version} + ${core-it-support-version} org.apache.maven.its core-it-toolchain - ${project.version} + ${core-it-support-version} org.apache.maven.its core-it-wagon - ${project.version} + ${core-it-support-version} org.apache.maven.its maven-it-helper - ${project.version} + ${core-it-support-version} org.apache.maven.its core-it-extension - ${project.version} + ${core-it-support-version} org.apache.maven.its core-it-javaagent - ${project.version} + ${core-it-support-version} org.apache.maven.plugins @@ -235,227 +247,227 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-active-collection - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-artifact - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-class-loader - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-configuration - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-context-passing - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-dependency-collection - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-dependency-resolution - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-expression - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-error - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-extension-consumer - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-extension-provider - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-fork - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-invalid-descriptor - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-log-file - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-model-interpolation - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-no-default-comp - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-no-project - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-online - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-optional-mojos - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-packaging - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-plugin-dependency - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-project - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-project-interpolation - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-setter - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-singleton-component - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-site - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-toolchain - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-touch - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-uses-properties - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-uses-wagon - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-all - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-plexus-utils-11 - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-plexus-utils-new - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-plexus-component-api - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-log4j - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-extension1 - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-extension2 - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-plexus-lifecycle - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins maven-it-plugin-settings - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins mng-5805-pkg-type-mojo-configuration-extension - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins mng-5805-pkg-type-mojo-configuration-extension2 - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins mng-5805-pkg-type-mojo-configuration-plugin - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins mng-5805-pkg-type-mojo-configuration-plugin-dep - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins mng-5958-pkg-type-extension - ${project.version} + ${core-it-support-version} org.apache.maven.its.plugins mng-6759-resolves-project-dependencies-plugin - ${project.version} + ${core-it-support-version} @@ -539,9 +551,59 @@ under the License. + + + org.apache.maven.plugins + maven-antrun-plugin + + + unpack-built-maven-distro + + run + + process-test-resources + + + + + + + + + + + + + + maven-from-build + + + mavenHome + + + + + ${maven.home} + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + unpack-built-maven-distro + none + + + + + + mimir @@ -590,7 +652,7 @@ under the License. org.apache.maven apache-maven - ${maven-version} + ${project.version} bin zip @@ -710,6 +772,11 @@ under the License. org.apache.maven.plugins maven-antrun-plugin + + + unpack-built-maven-distro + none + unpack-maven-distro @@ -753,6 +820,11 @@ under the License. org.apache.maven.plugins maven-antrun-plugin + + + unpack-built-maven-distro + none + unpack-maven-distro diff --git a/its/core-it-support/maven-it-helper/pom.xml b/its/core-it-support/maven-it-helper/pom.xml index eb11a34c386b..ae2d88e65cb4 100644 --- a/its/core-it-support/maven-it-helper/pom.xml +++ b/its/core-it-support/maven-it-helper/pom.xml @@ -34,14 +34,14 @@ under the License. org.apache.maven maven-executor - ${maven-version} + org.apache.maven maven-artifact - 3.6.3 + org.codehaus.plexus diff --git a/its/core-it-support/pom.xml b/its/core-it-support/pom.xml index 8f536ad61e27..f1a990ecba32 100644 --- a/its/core-it-support/pom.xml +++ b/its/core-it-support/pom.xml @@ -23,10 +23,11 @@ under the License. org.apache.maven.its core-its - 2.1-SNAPSHOT + 4.0.0-rc-4-SNAPSHOT core-it-support + 2.1-SNAPSHOT pom Maven Core IT Support @@ -46,6 +47,7 @@ under the License. + org.apache.maven.plugin-tools maven-plugin-annotations diff --git a/its/pom.xml b/its/pom.xml index 2b442de3c393..6aca5ef151ba 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -28,7 +28,6 @@ under the License. org.apache.maven.its core-its - 2.1-SNAPSHOT pom Maven Core ITs @@ -73,8 +72,11 @@ under the License. - 4.0.0-rc-4-SNAPSHOT 3.15.1 + + 4.0.0-rc-4-SNAPSHOT + + 2.1-SNAPSHOT @@ -239,6 +241,11 @@ under the License. maven-compat ${maven-version} + + org.apache.maven + maven-executor + ${maven-version} + org.apache.maven.shared