Build by Maven 4

.github/workflows/maven-verify.yml

@@ -25,3 +25,5 @@ jobs:
   build:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
+    with:
+      maven4-enabled: true

src/it/projects/list-repositories/verify.groovy

@@ -24,5 +24,7 @@ String buildLog = file.getText( "UTF-8" )
 assert buildLog.contains( 'Project remote repositories used by this build:')
 assert buildLog.contains( '* fake-remote-repository (http://localhost:2345, default, releases+snapshots)')
 assert buildLog.contains( '* sonatype-nexus-snapshots (https://oss.sonatype.org/content/repositories/snapshots, default, snapshots) mirrored by mrm-maven-plugin')
-assert buildLog.contains( '* central (https://repo.maven.apache.org/maven2, default, releases) mirrored by mrm-maven-plugin')
-
+if (!mavenVersion.startsWith('4.')) {
+    // Maven 4 drop central repo from default super pom - so model doesn't have it
+    assert buildLog.contains('* central (https://repo.maven.apache.org/maven2, default, releases) mirrored by mrm-maven-plugin')
+}

src/it/projects/tree-excluded/expected-v4.txt

@@ -0,0 +1,13 @@
+org.apache.maven.its.dependency:test:jar:1.0-SNAPSHOT
+\- org.apache.maven:maven-project:jar:2.0.6:compile
+   +- org.apache.maven:maven-settings:jar:2.0.6:compile
+   +- org.apache.maven:maven-profile:jar:2.0.6:compile
+   +- org.apache.maven:maven-model:jar:2.0.6:compile
+   +- org.apache.maven:maven-artifact-manager:jar:2.0.6:compile
+   |  +- org.apache.maven:maven-repository-metadata:jar:2.0.6:compile
+   |  \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile
+   +- org.apache.maven:maven-plugin-registry:jar:2.0.6:compile
+   +- org.apache.maven:maven-artifact:jar:2.0.6:compile
+   \- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile
+      +- junit:junit:jar:3.8.1:compile
+      \- classworlds:classworlds:jar:1.1:compile

src/it/projects/tree-excluded/verify.groovy

@@ -19,7 +19,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat
 
+// Maven 4 use transitive dependency manager
+def expected = mavenVersion.startsWith('4.') ? "expected-v4.txt" : "expected.txt"
+
 assertThat(new File(basedir, "target/tree.txt"))
-        .hasSameTextualContentAs(new File(basedir, "expected.txt"))
+        .hasSameTextualContentAs(new File(basedir, expected))
 
 return true

src/it/projects/tree-multimodule/module-a/expected-v4.txt

@@ -0,0 +1,14 @@
+org.apache.maven.its.dependency:tree-multimodule-module-a:jar:1.0-SNAPSHOT
+\- org.apache.maven:maven-project:jar:2.0.6:compile
+   +- org.apache.maven:maven-settings:jar:2.0.6:compile
+   +- org.apache.maven:maven-profile:jar:2.0.6:compile
+   +- org.apache.maven:maven-model:jar:2.0.6:compile
+   +- org.apache.maven:maven-artifact-manager:jar:2.0.6:compile
+   |  +- org.apache.maven:maven-repository-metadata:jar:2.0.6:compile
+   |  \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile
+   +- org.apache.maven:maven-plugin-registry:jar:2.0.6:compile
+   +- org.codehaus.plexus:plexus-utils:jar:1.4.1:compile
+   +- org.apache.maven:maven-artifact:jar:2.0.6:compile
+   \- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile
+      +- junit:junit:jar:3.8.1:compile
+      \- classworlds:classworlds:jar:1.1:compile

src/it/projects/tree-multimodule/module-b/expected-v4.txt

@@ -0,0 +1,15 @@
+org.apache.maven.its.dependency:tree-multimodule-module-b:jar:1.0-SNAPSHOT
+\- org.apache.maven.its.dependency:tree-multimodule-module-a:jar:1.0-SNAPSHOT:compile
+   \- org.apache.maven:maven-project:jar:2.0.6:compile
+      +- org.apache.maven:maven-settings:jar:2.0.6:compile
+      +- org.apache.maven:maven-profile:jar:2.0.6:compile
+      +- org.apache.maven:maven-model:jar:2.0.6:compile
+      +- org.apache.maven:maven-artifact-manager:jar:2.0.6:compile
+      |  +- org.apache.maven:maven-repository-metadata:jar:2.0.6:compile
+      |  \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile
+      +- org.apache.maven:maven-plugin-registry:jar:2.0.6:compile
+      +- org.codehaus.plexus:plexus-utils:jar:1.4.1:compile
+      +- org.apache.maven:maven-artifact:jar:2.0.6:compile
+      \- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile
+         +- junit:junit:jar:3.8.1:compile
+         \- classworlds:classworlds:jar:1.1:compile

src/it/projects/tree-multimodule/test.properties

@@ -16,4 +16,3 @@
 # under the License.
 
 outputFile = target/tree.txt
-maven.resolver.dependencyManagerTransitivity=false

src/it/projects/tree-multimodule/verify.groovy

@@ -19,13 +19,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat
 
+// Maven 4 use transitive dependency manager
+def expected = mavenVersion.startsWith('4.') ? "expected-v4.txt" : "expected.txt"
+
 assertThat(new File(basedir, "target/tree.txt"))
         .hasSameTextualContentAs(new File(basedir, "expected.txt"))
 
 assertThat(new File(basedir, "module-a/target/tree.txt"))
-        .hasSameTextualContentAs(new File(basedir, "module-a/expected.txt"))
+        .hasSameTextualContentAs(new File(basedir, "module-a/" + expected))
 
 assertThat(new File(basedir, "module-b/target/tree.txt"))
-        .hasSameTextualContentAs(new File(basedir, "module-b/expected.txt"))
+        .hasSameTextualContentAs(new File(basedir, "module-b/" + expected))
 
 return true;

src/it/projects/tree-scope/expected1-v4.txt

@@ -0,0 +1,37 @@
+org.apache.maven.its.dependency:test:jar:1.0-SNAPSHOT
+\- org.apache.maven:maven-core:jar:3.6.3:compile
+   +- org.apache.maven:maven-model:jar:3.6.3:compile
+   +- org.apache.maven:maven-settings:jar:3.6.3:compile
+   +- org.apache.maven:maven-settings-builder:jar:3.6.3:compile
+   |  +- org.codehaus.plexus:plexus-interpolation:jar:1.25:compile
+   |  \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.4:compile
+   |     \- org.sonatype.plexus:plexus-cipher:jar:1.7:compile
+   +- org.apache.maven:maven-builder-support:jar:3.6.3:compile
+   +- org.apache.maven:maven-repository-metadata:jar:3.6.3:compile
+   +- org.apache.maven:maven-artifact:jar:3.6.3:compile
+   +- org.apache.maven:maven-plugin-api:jar:3.6.3:compile
+   +- org.apache.maven:maven-model-builder:jar:3.6.3:compile
+   +- org.apache.maven:maven-resolver-provider:jar:3.6.3:compile
+   +- org.apache.maven.resolver:maven-resolver-impl:jar:1.4.1:compile
+   +- org.apache.maven.resolver:maven-resolver-api:jar:1.4.1:compile
+   +- org.apache.maven.resolver:maven-resolver-spi:jar:1.4.1:compile
+   +- org.apache.maven.resolver:maven-resolver-util:jar:1.4.1:compile
+   +- org.apache.maven.shared:maven-shared-utils:jar:3.2.1:compile
+   |  \- commons-io:commons-io:jar:2.5:compile
+   +- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.4:compile
+   |  \- javax.enterprise:cdi-api:jar:1.0:compile
+   |     \- javax.annotation:jsr250-api:jar:1.0:compile
+   +- org.eclipse.sisu:org.eclipse.sisu.inject:jar:0.3.4:compile
+   +- com.google.inject:guice:jar:no_aop:4.2.1:compile
+   |  +- aopalliance:aopalliance:jar:1.0:compile
+   |  \- com.google.guava:guava:jar:25.1-android:compile
+   |     +- com.google.code.findbugs:jsr305:jar:3.0.1:compile
+   |     +- org.checkerframework:checker-compat-qual:jar:2.0.0:compile
+   |     +- com.google.errorprone:error_prone_annotations:jar:2.1.3:compile
+   |     +- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+   |     \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile
+   +- javax.inject:javax.inject:jar:1:compile
+   +- org.codehaus.plexus:plexus-utils:jar:3.2.1:compile
+   +- org.codehaus.plexus:plexus-classworlds:jar:2.6.0:compile
+   +- org.codehaus.plexus:plexus-component-annotations:jar:2.1.0:compile
+   \- org.apache.commons:commons-lang3:jar:3.8.1:compile

src/it/projects/tree-scope/expected2-v4.txt

@@ -0,0 +1,39 @@
+org.apache.maven.its.dependency:test:jar:1.0-SNAPSHOT
++- org.apache.maven:maven-core:jar:3.6.3:compile
+|  +- org.apache.maven:maven-model:jar:3.6.3:compile
+|  +- org.apache.maven:maven-settings:jar:3.6.3:compile
+|  +- org.apache.maven:maven-settings-builder:jar:3.6.3:compile
+|  |  +- org.codehaus.plexus:plexus-interpolation:jar:1.25:compile
+|  |  \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.4:compile
+|  |     \- org.sonatype.plexus:plexus-cipher:jar:1.7:compile
+|  +- org.apache.maven:maven-builder-support:jar:3.6.3:compile
+|  +- org.apache.maven:maven-repository-metadata:jar:3.6.3:compile
+|  +- org.apache.maven:maven-artifact:jar:3.6.3:compile
+|  +- org.apache.maven:maven-plugin-api:jar:3.6.3:compile
+|  +- org.apache.maven:maven-model-builder:jar:3.6.3:compile
+|  +- org.apache.maven:maven-resolver-provider:jar:3.6.3:compile
+|  +- org.apache.maven.resolver:maven-resolver-impl:jar:1.4.1:compile
+|  +- org.apache.maven.resolver:maven-resolver-api:jar:1.4.1:compile
+|  +- org.apache.maven.resolver:maven-resolver-spi:jar:1.4.1:compile
+|  +- org.apache.maven.resolver:maven-resolver-util:jar:1.4.1:compile
+|  +- org.apache.maven.shared:maven-shared-utils:jar:3.2.1:compile
+|  |  \- commons-io:commons-io:jar:2.5:compile
+|  +- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.4:compile
+|  |  \- javax.enterprise:cdi-api:jar:1.0:compile
+|  |     \- javax.annotation:jsr250-api:jar:1.0:compile
+|  +- org.eclipse.sisu:org.eclipse.sisu.inject:jar:0.3.4:compile
+|  +- com.google.inject:guice:jar:no_aop:4.2.1:compile
+|  |  +- aopalliance:aopalliance:jar:1.0:compile
+|  |  \- com.google.guava:guava:jar:25.1-android:compile
+|  |     +- com.google.code.findbugs:jsr305:jar:3.0.1:compile
+|  |     +- org.checkerframework:checker-compat-qual:jar:2.0.0:compile
+|  |     +- com.google.errorprone:error_prone_annotations:jar:2.1.3:compile
+|  |     +- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+|  |     \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile
+|  +- javax.inject:javax.inject:jar:1:compile
+|  +- org.codehaus.plexus:plexus-utils:jar:3.2.1:compile
+|  +- org.codehaus.plexus:plexus-classworlds:jar:2.6.0:compile
+|  +- org.codehaus.plexus:plexus-component-annotations:jar:2.1.0:compile
+|  \- org.apache.commons:commons-lang3:jar:3.8.1:compile
+\- org.slf4j:slf4j-simple:jar:2.0.13:test
+   \- org.slf4j:slf4j-api:jar:2.0.13:compile

src/it/projects/tree-scope/invoker.properties

@@ -16,7 +16,7 @@
 # under the License.
 
 invoker.goals.1 = ${project.groupId}:${project.artifactId}:${project.version}:tree
-invoker.systemPropertiesFile.1 = test1.properties
+invoker.userPropertiesFile.1 = test1.properties
 
 invoker.goals.2 = ${project.groupId}:${project.artifactId}:${project.version}:tree
-invoker.systemPropertiesFile.2 = test2.properties
+invoker.userPropertiesFile.2 = test2.properties

src/it/projects/tree-scope/test1.properties

@@ -17,4 +17,3 @@
 
 outputFile = target/tree1.txt
 scope = compile
-maven.resolver.dependencyManagerTransitivity = false

src/it/projects/tree-scope/test2.properties

@@ -17,4 +17,3 @@
 
 outputFile = target/tree2.txt
 scope = test
-maven.resolver.dependencyManagerTransitivity = false

src/it/projects/tree-scope/verify.groovy

@@ -20,10 +20,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat
 
+// Maven 4 use transitive dependency manager
+def expected1 = mavenVersion.startsWith('4.') ? "expected1-v4.txt" : "expected1.txt"
+def expected2 = mavenVersion.startsWith('4.') ? "expected2-v4.txt" : "expected2.txt"
+
 assertThat(new File(basedir, "target/tree1.txt"))
-        .hasSameTextualContentAs(new File(basedir, "expected1.txt"))
+        .hasSameTextualContentAs(new File(basedir, expected1))
 
 assertThat(new File(basedir, "target/tree2.txt"))
-        .hasSameTextualContentAs(new File(basedir, "expected2.txt"))
+        .hasSameTextualContentAs(new File(basedir, expected2))
 
 return true

src/it/projects/tree-verbose-multimodule/module-a/expected-v4.txt

@@ -0,0 +1,30 @@
+org.apache.maven.its.dependency:tree-multimodule-module-a:jar:1.0-SNAPSHOT
+\- org.apache.maven:maven-project:jar:2.0.6:compile
+   +- org.apache.maven:maven-settings:jar:2.0.6:compile
+   |  +- (org.apache.maven:maven-model:jar:2.0.6:compile - version managed from 2.0.6; omitted for duplicate)
+   |  +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+   |  \- (org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - version managed from 1.0-alpha-9-stable-1; omitted for duplicate)
+   +- org.apache.maven:maven-profile:jar:2.0.6:compile
+   |  +- (org.apache.maven:maven-model:jar:2.0.6:compile - version managed from 2.0.6; omitted for duplicate)
+   |  +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+   |  \- (org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - version managed from 1.0-alpha-9-stable-1; omitted for duplicate)
+   +- org.apache.maven:maven-model:jar:2.0.6:compile
+   |  \- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+   +- org.apache.maven:maven-artifact-manager:jar:2.0.6:compile
+   |  +- org.apache.maven:maven-repository-metadata:jar:2.0.6:compile (version managed from 2.0.6)
+   |  |  \- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+   |  +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+   |  +- (org.apache.maven:maven-artifact:jar:2.0.6:compile - version managed from 2.0.6; omitted for duplicate)
+   |  +- (org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - version managed from 1.0-alpha-9-stable-1; omitted for duplicate)
+   |  \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile (version managed from 1.0-beta-2)
+   |     \- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.0.4; omitted for duplicate)
+   +- org.apache.maven:maven-plugin-registry:jar:2.0.6:compile
+   |  +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+   |  \- (org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - version managed from 1.0-alpha-9-stable-1; omitted for duplicate)
+   +- org.codehaus.plexus:plexus-utils:jar:1.4.1:compile
+   +- org.apache.maven:maven-artifact:jar:2.0.6:compile
+   |  \- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+   \- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile
+      +- junit:junit:jar:3.8.1:compile
+      +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.0.4; omitted for duplicate)
+      \- classworlds:classworlds:jar:1.1:compile (version managed from 1.1-alpha-2)

src/it/projects/tree-verbose-multimodule/module-b/expected-v4.txt

@@ -0,0 +1,31 @@
+org.apache.maven.its.dependency:tree-multimodule-module-b:jar:1.0-SNAPSHOT
+\- org.apache.maven.its.dependency:tree-multimodule-module-a:jar:1.0-SNAPSHOT:compile
+   \- org.apache.maven:maven-project:jar:2.0.6:compile
+      +- org.apache.maven:maven-settings:jar:2.0.6:compile
+      |  +- (org.apache.maven:maven-model:jar:2.0.6:compile - version managed from 2.0.6; omitted for duplicate)
+      |  +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+      |  \- (org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - version managed from 1.0-alpha-9-stable-1; omitted for duplicate)
+      +- org.apache.maven:maven-profile:jar:2.0.6:compile
+      |  +- (org.apache.maven:maven-model:jar:2.0.6:compile - version managed from 2.0.6; omitted for duplicate)
+      |  +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+      |  \- (org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - version managed from 1.0-alpha-9-stable-1; omitted for duplicate)
+      +- org.apache.maven:maven-model:jar:2.0.6:compile
+      |  \- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+      +- org.apache.maven:maven-artifact-manager:jar:2.0.6:compile
+      |  +- org.apache.maven:maven-repository-metadata:jar:2.0.6:compile (version managed from 2.0.6)
+      |  |  \- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+      |  +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+      |  +- (org.apache.maven:maven-artifact:jar:2.0.6:compile - version managed from 2.0.6; omitted for duplicate)
+      |  +- (org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - version managed from 1.0-alpha-9-stable-1; omitted for duplicate)
+      |  \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile (version managed from 1.0-beta-2)
+      |     \- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.0.4; omitted for duplicate)
+      +- org.apache.maven:maven-plugin-registry:jar:2.0.6:compile
+      |  +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+      |  \- (org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - version managed from 1.0-alpha-9-stable-1; omitted for duplicate)
+      +- org.codehaus.plexus:plexus-utils:jar:1.4.1:compile
+      +- org.apache.maven:maven-artifact:jar:2.0.6:compile
+      |  \- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.4.1; omitted for duplicate)
+      \- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile
+         +- junit:junit:jar:3.8.1:compile
+         +- (org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - version managed from 1.0.4; omitted for duplicate)
+         \- classworlds:classworlds:jar:1.1:compile (version managed from 1.1-alpha-2)

src/it/projects/tree-verbose-multimodule/test.properties

@@ -16,4 +16,3 @@
 # under the License.
 
 outputFile = target/tree.txt
-maven.resolver.dependencyManagerTransitivity=false

src/it/projects/tree-verbose-multimodule/verify.groovy

@@ -19,13 +19,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat
 
+// Maven 4 use transitive dependency manager
+def expected = mavenVersion.startsWith('4.') ? "expected-v4.txt" : "expected.txt"
+
 assertThat(new File(basedir, "target/tree.txt"))
         .hasSameTextualContentAs(new File(basedir, "expected.txt"))
 
 assertThat(new File(basedir, "module-a/target/tree.txt"))
-        .hasSameTextualContentAs(new File(basedir, "module-a/expected.txt"))
+        .hasSameTextualContentAs(new File(basedir, "module-a/" + expected))
 
 assertThat(new File(basedir, "module-b/target/tree.txt"))
-        .hasSameTextualContentAs(new File(basedir, "module-b/expected.txt"))
+        .hasSameTextualContentAs(new File(basedir, "module-b/" + expected))
 
 return true;