Upgrade org.apache.maven.archetype to 3.3.0

mojohaus · Sep 28, 2024 · f624be7 · f624be7
1 parent 1f8cc24
commit f624be7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/mrm-api/src/main/java/org/codehaus/mojo/mrm/api/maven/Artifact.java b/mrm-api/src/main/java/org/codehaus/mojo/mrm/api/maven/Artifact.java
@@ -24,7 +24,7 @@
 import java.util.Objects;
 import java.util.TimeZone;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Represents a specific artifact in a Maven repository. Implements {@link Comparable} to sort based on

diff --git a/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStore.java b/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStore.java
@@ -328,12 +328,12 @@ public long getMetadataLastModified(String path) throws MetadataNotFoundExceptio
 
     @Override
     public ArchetypeCatalog getArchetypeCatalog() {
-        return archetypeManager.getLocalCatalog(session.getProjectBuildingRequest());
+        return archetypeManager.getLocalCatalog(session.getRepositorySession());
     }
 
     @Override
     public long getArchetypeCatalogLastModified() throws ArchetypeCatalogNotFoundException {
-        if (archetypeManager.getLocalCatalog(session.getProjectBuildingRequest()) != null) {
+        if (archetypeManager.getLocalCatalog(session.getRepositorySession()) != null) {
             return System.currentTimeMillis();
         } else {
             throw new ArchetypeCatalogNotFoundException();

diff --git a/pom.xml b/pom.xml
@@ -155,20 +155,20 @@
       <dependency>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-common</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
         <exclusions>
           <!-- exclude some unneeded staff -->
           <exclusion>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-aether-provider</artifactId>
+            <artifactId>maven-resolver-provider</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-component-annotations</artifactId>
           </exclusion>
           <exclusion>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.apache.ivy</groupId>
@@ -179,7 +179,7 @@
       <dependency>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-catalog</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
       </dependency>
 
       <!-- http server -->