cstamas commented on code in PR #2380:
URL: https://github.com/apache/maven/pull/2380#discussion_r2105929185
##########
impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java:
##########
@@ -89,33 +84,37 @@ public BuildScopeSource getBuildScopeSource() {
}
@Override
- public Collection<DependencyScope>
buildDependencyScopes(InternalScopeManager internalScopeManager) {
- ArrayList<DependencyScope> result = new ArrayList<>();
- result.add(internalScopeManager.createDependencyScope(DS_COMPILE,
true, all()));
+ public Collection<org.eclipse.aether.scope.DependencyScope>
buildDependencyScopes(
+ InternalScopeManager internalScopeManager) {
+ ArrayList<org.eclipse.aether.scope.DependencyScope> result = new
ArrayList<>();
+
result.add(internalScopeManager.createDependencyScope(DependencyScope.COMPILE.id(),
true, all()));
result.add(internalScopeManager.createDependencyScope(
- DS_RUNTIME, true,
byBuildPath(CommonBuilds.BUILD_PATH_RUNTIME)));
+ DependencyScope.RUNTIME.id(), true,
byBuildPath(CommonBuilds.BUILD_PATH_RUNTIME)));
result.add(internalScopeManager.createDependencyScope(
- DS_PROVIDED,
+ DependencyScope.PROVIDED.id(),
false,
union(
byBuildPath(CommonBuilds.BUILD_PATH_COMPILE),
select(CommonBuilds.PROJECT_PATH_TEST,
CommonBuilds.BUILD_PATH_RUNTIME))));
result.add(internalScopeManager.createDependencyScope(
- DS_TEST, false,
byProjectPath(CommonBuilds.PROJECT_PATH_TEST)));
+ DependencyScope.TEST.id(), false,
byProjectPath(CommonBuilds.PROJECT_PATH_TEST)));
result.add(internalScopeManager.createSystemDependencyScope(
- DS_SYSTEM, false, all(), ArtifactProperties.LOCAL_PATH));
+ DependencyScope.SYSTEM.id(), false, all(),
MavenArtifactProperties.LOCAL_PATH));
return result;
}
@Override
- public Collection<ResolutionScope>
buildResolutionScopes(InternalScopeManager internalScopeManager) {
- Collection<DependencyScope> allDependencyScopes =
internalScopeManager.getDependencyScopeUniverse();
- Collection<DependencyScope> nonTransitiveDependencyScopes =
+ public Collection<org.eclipse.aether.scope.ResolutionScope>
buildResolutionScopes(
+ InternalScopeManager internalScopeManager) {
+ Collection<org.eclipse.aether.scope.DependencyScope>
allDependencyScopes =
+ internalScopeManager.getDependencyScopeUniverse();
+ Collection<org.eclipse.aether.scope.DependencyScope>
nonTransitiveDependencyScopes =
allDependencyScopes.stream().filter(s ->
!s.isTransitive()).collect(Collectors.toSet());
- DependencyScope system =
-
internalScopeManager.getDependencyScope(DS_SYSTEM).orElse(null);
+ org.eclipse.aether.scope.DependencyScope system = internalScopeManager
+ .getDependencyScope(DependencyScope.SYSTEM.id())
+ .orElse(null);
- ArrayList<ResolutionScope> result = new ArrayList<>();
+ ArrayList<org.eclipse.aether.scope.ResolutionScope> result = new
ArrayList<>();
Review Comment:
and what should I do with already imported
`org.apache.maven.api.DependencyScope`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@maven.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
