feat: downgrade maven to 4.0.0-alpha-7

teletha · Sep 11, 2024 · ebde1ad · ebde1ad
1 parent a05e53b
commit ebde1ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/bee/Bee.java b/src/main/java/bee/Bee.java
@@ -301,7 +301,7 @@ public void execute() {
      * @param tasks A list of task commands
      */
     public static void main(String... tasks) {
-        if (tasks.length == 0) tasks = new String[] {"-c", "test"};
+        if (tasks.length == 0) tasks = new String[] {"install"};
 
         System.exit(new Bee().execute(BeeOption.parse(tasks)));
     }

diff --git a/src/main/java/bee/api/Repository.java b/src/main/java/bee/api/Repository.java
@@ -79,15 +79,14 @@
 import org.eclipse.aether.installation.InstallationException;
 import org.eclipse.aether.internal.impl.DefaultArtifactResolver;
 import org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider;
-import org.eclipse.aether.internal.impl.DefaultChecksumProcessor;
 import org.eclipse.aether.internal.impl.DefaultDeployer;
+import org.eclipse.aether.internal.impl.DefaultFileProcessor;
 import org.eclipse.aether.internal.impl.DefaultInstaller;
 import org.eclipse.aether.internal.impl.DefaultLocalPathComposer;
 import org.eclipse.aether.internal.impl.DefaultLocalPathPrefixComposerFactory;
 import org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider;
 import org.eclipse.aether.internal.impl.DefaultMetadataResolver;
 import org.eclipse.aether.internal.impl.DefaultOfflineController;
-import org.eclipse.aether.internal.impl.DefaultPathProcessor;
 import org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager;
 import org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider;
 import org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher;
@@ -150,8 +149,7 @@
 import org.eclipse.aether.spi.connector.transport.Transporter;
 import org.eclipse.aether.spi.connector.transport.TransporterFactory;
 import org.eclipse.aether.spi.connector.transport.TransporterProvider;
-import org.eclipse.aether.spi.io.ChecksumProcessor;
-import org.eclipse.aether.spi.io.PathProcessor;
+import org.eclipse.aether.spi.io.FileProcessor;
 import org.eclipse.aether.spi.synccontext.SyncContextFactory;
 import org.eclipse.aether.transfer.ChecksumFailureException;
 import org.eclipse.aether.transfer.NoTransporterException;
@@ -461,7 +459,7 @@ private File resolveSubArtifact(Library library, String suffix) {
                 ArtifactResult result = system.resolveArtifact(session, request);
 
                 if (result.isResolved()) {
-                    return Locator.file(result.getArtifact().getPath());
+                    return Locator.file(result.getArtifact().getFile().getPath());
                 } else {
                     ui.info("Artifact [", sub, "] is not resolved.");
                 }
@@ -540,7 +538,7 @@ public void install(Project project, File classes, File sources, File javadoc) {
      * @return
      */
     public final Directory getLocalRepository() {
-        return Locator.directory(localRepository.getBasePath());
+        return Locator.directory(localRepository.getBasedir().getPath());
     }
 
     /**
@@ -705,8 +703,7 @@ private Lifestyles() {
             define(RemoteRepositoryManager.class, DefaultRemoteRepositoryManager.class);
             define(UpdateCheckManager.class, DefaultUpdateCheckManager.class);
             define(UpdatePolicyAnalyzer.class, DefaultUpdatePolicyAnalyzer.class);
-            define(PathProcessor.class, DefaultPathProcessor.class);
-            define(ChecksumProcessor.class, DefaultChecksumProcessor.class);
+            define(FileProcessor.class, DefaultFileProcessor.class);
             define(SyncContextFactory.class, DefaultSyncContextFactory.class);
             define(RepositoryEventDispatcher.class, DefaultRepositoryEventDispatcher.class);
             define(OfflineController.class, DefaultOfflineController.class);

diff --git a/src/project/java/bee/Project.java b/src/project/java/bee/Project.java
@@ -41,10 +41,9 @@ public class Project extends bee.api.Project {
         // Maven seems to thoroughly adhere to backward compatibility, so further version upgrades
         // are currently unnecessary.
         //
-        // jakarta.inject has replaced javax.inject since alpha-9, but some maven-resolver APIs do
-        // not support jakarta.inject, so it was stopped in alpha-8
-        String version = "2.0.0-alpha-8";
-        require("org.apache.maven", "maven-resolver-provider", "4.0.0-alpha-8");
+        // The use of alpha-8 causes a dependency on woodstox, so it is stopped at alpha-7.
+        String version = "2.0.0-alpha-7";
+        require("org.apache.maven", "maven-resolver-provider", "4.0.0-alpha-7");
         require("org.apache.maven.resolver", "maven-resolver-api", version);
         require("org.apache.maven.resolver", "maven-resolver-spi", version);
         require("org.apache.maven.resolver", "maven-resolver-util", version);