Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNG-8035] Update to Resolver 2.0.0-alpha-7 #1394

Merged
merged 1 commit into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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";

Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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.
-->
Expand Down
Loading