(maven) branch master updated: [MNG-8035] Update to Resolver 2.0.0-alpha-7 (#1394)

[cs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 2452a6488a [MNG-8035] Update to Resolver 2.0.0-alpha-7 (#1394)
2452a6488a is described below

commit 2452a6488a1c4e798bbe3efab4b6c6e2c2e494ee
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Mon Jan 29 16:27:43 2024 +0100

    [MNG-8035] Update to Resolver 2.0.0-alpha-7 (#1394)
    
    Update to Resolver 2.0.0-alpha-7, sort out TODO.
    
    This is also one simple change "sneaked in" for RAT, to ignore local `.mvn` that is unrelated to all this, but does not make any harm. In turn, it allows dev local checkout to have various stuff set without
    decorating those with headers or fighing RAT plugin.
    
    ---
    
    https://issues.apache.org/jira/browse/MNG-8035
---
 .../maven/repository/internal/scopes/MavenDependencyScopes.java     | 6 +++---
 pom.xml                                                             | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenDependencyScopes.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenDependencyScopes.java
index 86b03eae1d..2d074a4e07 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenDependencyScopes.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenDependencyScopes.java
@@ -18,6 +18,8 @@
  */
 package org.apache.maven.repository.internal.scopes;
 
+import org.eclipse.aether.util.artifact.DependencyScopes;
+
 /**
  * The dependency scopes used for Java dependencies in Maven. This class defines labels only, that are doing pass-thru
  * over Resolver.
@@ -28,10 +30,8 @@ public final class MavenDependencyScopes {
 
     /**
      * Important: keep this label in sync with Resolver.
-     *
-     * TODO: once Resolver 2.0.0-alpha-7 is out, use org.eclipse.aether.util.artifact.DependencyScopes#SYSTEM
      */
-    public static final String SYSTEM = "system";
+    public static final String SYSTEM = DependencyScopes.SYSTEM;
 
     public static final String COMPILE_ONLY = "compile-only";
 
diff --git a/pom.xml b/pom.xml
index c4687b691d..3bb7b84b9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@ under the License.
     <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
     <plexusTestingVersion>1.0.0</plexusTestingVersion>
     <plexusXmlVersion>4.0.1</plexusXmlVersion>
-    <resolverVersion>2.0.0-alpha-6</resolverVersion>
+    <resolverVersion>2.0.0-alpha-7</resolverVersion>
     <securityDispatcherVersion>2.0</securityDispatcherVersion>
     <sisuVersion>0.9.0.M2</sisuVersion>
     <slf4jVersion>2.0.11</slf4jVersion>
@@ -754,6 +754,7 @@ under the License.
                 <exclude>src/test/remote-repo/**</exclude>
                 <exclude>**/*.odg</exclude>
                 <exclude>.asf.yaml</exclude>
+                <exclude>.mvn/**</exclude>
                 <!--
                   ! Excluded the license files itself cause they do not have have a license of themselves.
                 -->