[MNG-7151] Upgrade Maven Resolver to 1.7.0

apache · May 11, 2021 · fc806a2 · fc806a2
1 parent 3e91767
commit fc806a2
Show file tree

Hide file tree

Showing 7 changed files with 767 additions and 85 deletions.
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -62,7 +62,7 @@ subject to the terms and conditions of the following licenses:
 #*    *###
 #*    *### copy license file to lib/$artifactId.license
 #*    *##set ( $licFile = $directory + '/' + $project.artifact.artifactId + '.license' )
-#*    *##if ( $spdx == "MIT" )
+#*    *##if ( $spdx == "MIT" || $spdx == "unrecognized" )
 #*      *### MIT license contains date and copyright that makes the file specific to each artifact
 #*      *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}-${project.artifact.artifactId}-${project.artifact.version}.txt", "licenses/${licFile}" ) )
 #*    *##else

diff --git a/...he-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt b/...he-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt
diff --git a/...vider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/...vider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -28,7 +28,6 @@
 import org.eclipse.aether.SyncContext;
 import org.eclipse.aether.impl.MetadataResolver;
 import org.eclipse.aether.impl.RepositoryEventDispatcher;
-import org.eclipse.aether.impl.SyncContextFactory;
 import org.eclipse.aether.impl.VersionRangeResolver;
 import org.eclipse.aether.metadata.DefaultMetadata;
 import org.eclipse.aether.metadata.Metadata;
@@ -42,6 +41,7 @@
 import org.eclipse.aether.resolution.VersionRangeResult;
 import org.eclipse.aether.spi.locator.Service;
 import org.eclipse.aether.spi.locator.ServiceLocator;
+import org.eclipse.aether.spi.synccontext.SyncContextFactory;
 import org.eclipse.aether.util.version.GenericVersionScheme;
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
 import org.eclipse.aether.version.Version;

diff --git a/...r-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/...r-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -33,7 +33,6 @@
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.impl.MetadataResolver;
 import org.eclipse.aether.impl.RepositoryEventDispatcher;
-import org.eclipse.aether.impl.SyncContextFactory;
 import org.eclipse.aether.impl.VersionResolver;
 import org.eclipse.aether.metadata.DefaultMetadata;
 import org.eclipse.aether.metadata.Metadata;
@@ -49,6 +48,7 @@
 import org.eclipse.aether.resolution.VersionResult;
 import org.eclipse.aether.spi.locator.Service;
 import org.eclipse.aether.spi.locator.ServiceLocator;
+import org.eclipse.aether.spi.synccontext.SyncContextFactory;
 import org.eclipse.aether.util.ConfigUtils;
 
 import javax.inject.Inject;

diff --git a/...solver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/...solver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
diff --git a/...ovider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/...ovider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -68,7 +68,9 @@ private MavenRepositorySystemUtils()
      * acquire a complete repository system, clients need to add some repository connectors for remote transfers.
      *
      * @return The new service locator, never {@code null}.
+     * @deprecated This method is deprecated along with {@link DefaultServiceLocator} (since Maven Resolver 1.7.0).
      */
+    @Deprecated
     public static DefaultServiceLocator newServiceLocator()
     {
         DefaultServiceLocator locator = new DefaultServiceLocator();

diff --git a/pom.xml b/pom.xml
@@ -67,7 +67,7 @@ under the License.
     <cipherVersion>1.8</cipherVersion>
     <modelloVersion>1.11</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>
-    <resolverVersion>1.6.2</resolverVersion>
+    <resolverVersion>1.7.0</resolverVersion>
     <slf4jVersion>1.7.30</slf4jVersion>
     <xmlunitVersion>2.6.4</xmlunitVersion>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -566,10 +566,11 @@ under the License.
               <exclude>src/test/remote-repo/**</exclude>
               <exclude>**/*.odg</exclude>
               <!--
-                ! Excluded the license files itself cause they do not have have a license of themselfs.
+                ! Excluded the license files itself cause they do not have have a license of themselves.
               -->
               <exclude>src/main/appended-resources/licenses/CDDL-1.0.txt</exclude>
               <exclude>src/main/appended-resources/licenses/EPL-1.0.txt</exclude>
+              <exclude>src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt</exclude>
             </excludes>
           </configuration>
         </plugin>