chore: working provisioner (WIP)

simschla · simschla · commit 1defe689d7c0 · 2025-11-27T08:26:08.000+01:00
diff --git a/.idea/copilotDiffState.xml b/.idea/copilotDiffState.xml
diff --git a/provisioner/build.gradle b/provisioner/build.gradle
@@ -8,16 +8,26 @@ dependencies {
 	//
 	//    implementation libs.bundles.maven.resolver.libs
 
-	implementation( platform("org.apache.maven:maven-resolver-provider:3.9.11"))
-	implementation "org.apache.maven:maven-resolver-provider"
-	implementation "org.apache.maven.resolver:maven-resolver-api"
+    api( platform("org.apache.maven.resolver:maven-resolver:2.0.13"))
+
+//	implementation "org.apache.maven:maven-resolver-provider"
+
+	api "org.apache.maven.resolver:maven-resolver-api"
 	implementation "org.apache.maven.resolver:maven-resolver-spi"
 	implementation "org.apache.maven.resolver:maven-resolver-util"
 	implementation "org.apache.maven.resolver:maven-resolver-impl"
 	implementation "org.apache.maven.resolver:maven-resolver-connector-basic"
 	implementation "org.apache.maven.resolver:maven-resolver-transport-file"
-	implementation "org.apache.maven.resolver:maven-resolver-transport-http"
-	implementation "org.apache.maven.resolver:maven-resolver-supplier:1.9.24"
+	implementation "org.apache.maven.resolver:maven-resolver-transport-apache"
+
+//    implementation "org.apache.maven.resolver:maven-resolver-supplier-mvn3"
+    implementation "org.apache.maven.resolver:maven-resolver-supplier-mvn4"
+
+    implementation "org.apache.maven:maven-resolver-provider:3.9.11"
+
+    // ✅ THESE are required to support parent POM resolution
+    implementation "org.apache.maven:maven-model-builder:3.9.11"
+    implementation "org.apache.maven:maven-resolver-provider:3.9.11"
 
 	implementation libs.bundles.spotless.libs
 }
diff --git a/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.jar b/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.jar
diff --git a/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.jar.md5 b/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.jar.md5
@@ -0,0 +1 @@
+d11a0d604b7aaa200a42b6f3fd832ac5
diff --git a/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.jar.sha1 b/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.jar.sha1
@@ -0,0 +1 @@
+c1ab5f0977e05482b8d6ac175e58edcdd4fcb1cc
diff --git a/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.pom b/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.pom
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.example</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <artifactId>lib3</artifactId>
+    <version>1.0.0</version>
+    <packaging>jar</packaging>
+    <name>lib3</name>
+    <dependencies>
+        <dependency>
+            <groupId>com.example</groupId>
+            <artifactId>lib1</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.pom.md5 b/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.pom.md5
@@ -0,0 +1 @@
+f96aa442a61b82ad9736bcd074852151
diff --git a/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.pom.sha1 b/provisioner/maven-test-repo/com/example/lib3/1.0.0/lib3-1.0.0.pom.sha1
@@ -0,0 +1 @@
+97a773a23deb56b8c2be06d6564348507596ede4
diff --git a/provisioner/maven-test-repo/com/example/lib3/maven-metadata.xml b/provisioner/maven-test-repo/com/example/lib3/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.example</groupId>
+  <artifactId>lib3</artifactId>
+  <versioning>
+    <release>1.0.0</release>
+    <latest>1.0.0</latest>
+    <versions>
+      <version>1.0.0</version>
+    </versions>
+    <lastUpdated>20251126052323</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/provisioner/maven-test-repo/com/example/lib3/maven-metadata.xml.md5 b/provisioner/maven-test-repo/com/example/lib3/maven-metadata.xml.md5
@@ -0,0 +1 @@
+ae4ee3a6aa20ae12eea3a00912d06c7c
diff --git a/provisioner/maven-test-repo/com/example/lib3/maven-metadata.xml.sha1 b/provisioner/maven-test-repo/com/example/lib3/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+c898730b87da5e256f15314726257eac4703571b
diff --git a/provisioner/maven-test-repo/com/example/parent/1.0.0/parent-1.0.0.pom b/provisioner/maven-test-repo/com/example/parent/1.0.0/parent-1.0.0.pom
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.example</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <name>parent</name>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.example</groupId>
+                <artifactId>lib1</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>
diff --git a/provisioner/maven-test-repo/com/example/parent/1.0.0/parent-1.0.0.pom.md5 b/provisioner/maven-test-repo/com/example/parent/1.0.0/parent-1.0.0.pom.md5
@@ -0,0 +1 @@
+15892e797686f4b7b3a81f4ba30de214
diff --git a/provisioner/maven-test-repo/com/example/parent/1.0.0/parent-1.0.0.pom.sha1 b/provisioner/maven-test-repo/com/example/parent/1.0.0/parent-1.0.0.pom.sha1
@@ -0,0 +1 @@
+36b3c1d01d70e406c8ddd45e7fc42ce313b4629a
diff --git a/provisioner/maven-test-repo/com/example/parent/maven-metadata.xml b/provisioner/maven-test-repo/com/example/parent/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.example</groupId>
+  <artifactId>parent</artifactId>
+  <versioning>
+    <release>1.0.0</release>
+    <latest>1.0.0</latest>
+    <versions>
+      <version>1.0.0</version>
+    </versions>
+    <lastUpdated>20251126052323</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/provisioner/maven-test-repo/com/example/parent/maven-metadata.xml.md5 b/provisioner/maven-test-repo/com/example/parent/maven-metadata.xml.md5
@@ -0,0 +1 @@
+53ff457661f4896f7238e635badfdd09
diff --git a/provisioner/maven-test-repo/com/example/parent/maven-metadata.xml.sha1 b/provisioner/maven-test-repo/com/example/parent/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+5d6b48695b6cf0dbfad096ca9e8d1d55e9709a65
diff --git a/provisioner/src/main/java/com/diffplug/spotless/cli/provisioner/DynamicMavenResolverPublisher.java b/provisioner/src/main/java/com/diffplug/spotless/cli/provisioner/DynamicMavenResolverPublisher.java
@@ -30,13 +30,15 @@
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
 import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.impl.ArtifactDescriptorReader;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResult;
 import org.eclipse.aether.supplier.RepositorySystemSupplier;
+import org.eclipse.aether.supplier.SessionBuilderSupplier;
 import org.eclipse.aether.util.artifact.JavaScopes;
 import org.eclipse.aether.util.filter.DependencyFilterUtils;
 
@@ -75,16 +77,25 @@ private RepositorySystem newRepositorySystem() {
     }
 
     private RepositorySystemSession newSession(RepositorySystem system) {
-        DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
-        LocalRepository localRepo = new LocalRepository(localMavenRepo.toFile());
-        session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
-        return session;
+        SessionBuilderSupplier sessionBuilderSupplier = new SessionBuilderSupplier(system);
+        return sessionBuilderSupplier.get()
+                .withLocalRepositoryBaseDirectories(localMavenRepo)
+                .build();
+//        DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
+//        LocalRepository localRepo = new LocalRepository(localMavenRepo.toFile());
+//        session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
+//        return session;
     }
 
     @Override
     public Set<File> provisionWithTransitives(boolean withTransitives, Collection<String> mavenCoordinates) {
         RepositorySystem repositorySystem = newRepositorySystem();
         RepositorySystemSession repositorySystemSession = newSession(repositorySystem);
+
+        // Let the resolver apply mirrors / proxies / repo managers etc. (like Maven)
+        List<RemoteRepository> resolutionRepos =
+                repositorySystem.newResolutionRepositories(repositorySystemSession, remoteRepositories);
+
         Set<File> jarFiles = new LinkedHashSet<>();
 
         for (String coord : mavenCoordinates) {
@@ -95,14 +106,15 @@ public Set<File> provisionWithTransitives(boolean withTransitives, Collection<St
                     // Resolve full dependency graph
                     CollectRequest collectRequest = new CollectRequest();
                     collectRequest.setRoot(new Dependency(artifact, JavaScopes.RUNTIME));
-                    remoteRepositories.forEach(collectRequest::addRepository);
+                    collectRequest.setRepositories(resolutionRepos);
 
                     DependencyRequest dependencyRequest = new DependencyRequest(
                             collectRequest, DependencyFilterUtils.classpathFilter(JavaScopes.RUNTIME));
 
                     DependencyResult result =
                             repositorySystem.resolveDependencies(repositorySystemSession, dependencyRequest);
 
+                    System.out.println(result.getRoot());
                     result.getArtifactResults().forEach(r -> {
                         File f = r.getArtifact().getFile();
                         if (f != null) jarFiles.add(f);
diff --git a/provisioner/src/test/java/com/diffplug/spotless/cli/provisioner/DynamicMavenResolverPublisherTest.java b/provisioner/src/test/java/com/diffplug/spotless/cli/provisioner/DynamicMavenResolverPublisherTest.java
@@ -47,6 +47,23 @@ void itResolvesDiffplugSpotlessLib(@TempDir Path tempDir) {
         });
     }
 
+    @Test
+    void itResolvesGoogleJavaFormat(@TempDir Path tempDir) {
+        // Given
+        DynamicMavenResolverPublisher provisioner =
+                new DynamicMavenResolverPublisher(DynamicMavenResolverPublisher.DEFAULT_REMOTE_REPOSITORIES, tempDir);
+        // When
+        Set<File> files = provisioner.provisionWithTransitives(true, "com.google.googlejavaformat:google-java-format:1.28.0");
+        Set<String> fileNames = files.stream().map(File::getName).collect(Collectors.toSet());
+        // Then
+        SoftAssertions.assertSoftly(softly -> {
+            softly.assertThat(files).isNotEmpty();
+            softly.assertThat(fileNames)
+                    .contains("google-java-format-1.28.0.jar")
+                    .contains("guava-32.1.3-jre.jar");
+        });
+    }
+
     @Test
     void itResolvesTestLib1(@TempDir Path tempDir) {
         // Given
@@ -91,6 +108,38 @@ void itResolvesTestLib2WithoutTransitives(@TempDir Path tempDir) {
         });
     }
 
+    @Test
+    void itResolvesLib2WhenRepeatedlyProvisioning(@TempDir Path tempDir) {
+        // Given
+        DynamicMavenResolverPublisher provisioner = provisionerForLocalMavenTestRepo(tempDir);
+        // When
+        Set<File> firstProvisioning = provisioner.provisionWithTransitives(true, "com.example:lib2:1.0.0");
+        Set<File> secondProvisioning = provisioner.provisionWithTransitives(true, "com.example:lib2:1.0.0");
+        Set<String> fileNames = secondProvisioning.stream().map(File::getName).collect(Collectors.toSet());
+
+        // Then
+        SoftAssertions.assertSoftly(softly -> {
+            softly.assertThat(secondProvisioning).isNotEmpty();
+            softly.assertThat(fileNames).contains("lib2-1.0.0.jar").contains("lib1-1.0.0.jar");
+            softly.assertThat(secondProvisioning).isEqualTo(firstProvisioning);
+        });
+    }
+
+    @Test
+    void itResolvesLib3WithTransitivesRespectingParentPom(@TempDir Path tempDir) {
+        // Given
+        DynamicMavenResolverPublisher provisioner = provisionerForLocalMavenTestRepo(tempDir);
+        // When
+        Set<File> files = provisioner.provisionWithTransitives(true, "com.example:lib3:1.0.0");
+        Set<String> fileNames = files.stream().map(File::getName).collect(Collectors.toSet());
+
+        // Then
+        SoftAssertions.assertSoftly(softly -> {
+            softly.assertThat(files).isNotEmpty();
+            softly.assertThat(fileNames).contains("lib3-1.0.0.jar").contains("lib1-1.0.0.jar");
+        });
+    }
+
     private static @NotNull DynamicMavenResolverPublisher provisionerForLocalMavenTestRepo(Path tempDir) {
         return new DynamicMavenResolverPublisher(localMavenTestRepo(), tempDir);
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+c1ab5f0977e05482b8d6ac175e58edcdd4fcb1cc`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+97a773a23deb56b8c2be06d6564348507596ede4`