Merge branch 'master' into split-back-mvn

apache · Mar 10, 2023 · 87ce5ea · 87ce5ea
2 parents 4ee4574 + 65da451
commit 87ce5ea
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 2,066 deletions.
diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml
@@ -84,8 +84,14 @@ jobs:
           name: daemon-test-logs-${{ env.OS }}
           path: integration-tests/target/mvnd-tests/**/daemon*.log
 
-      - name: 'Upload artifact'
+      - name: 'Upload m39 artifact'
         uses: actions/upload-artifact@v2
         with:
-          name: mvnd-${{ env.OS }}
-          path: dist-m*/target/maven-*-mvnd-*.zip
+          name: mvnd-m39-${{ env.OS }}
+          path: dist-m39/target/maven-*-mvnd-*.zip
+
+      - name: 'Upload m40 artifact'
+        uses: actions/upload-artifact@v2
+        with:
+          name: mvnd-m40-${{ env.OS }}
+          path: dist-m40/target/maven-*-mvnd-*.zip
diff --git a/daemon/pom.xml b/daemon/pom.xml
@@ -54,6 +54,12 @@
       <artifactId>plexus-interactivity-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>io.takari.maven</groupId>
+      <artifactId>takari-smart-builder</artifactId>
+      <version>0.6.2</version>
+    </dependency>
+
     <!-- Logging -->
     <dependency>
       <groupId>ch.qos.logback</groupId>

diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java b/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java