Pankraz76 commented on code in PR #2380:
URL: https://github.com/apache/maven/pull/2380#discussion_r2105923657
##########
impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java:
##########
@@ -24,15 +24,14 @@
import java.util.Collections;
import java.util.stream.Collectors;
-import org.eclipse.aether.artifact.ArtifactProperties;
+import org.apache.maven.api.DependencyScope;
+import org.apache.maven.impl.resolver.artifact.MavenArtifactProperties;
import org.eclipse.aether.impl.scope.BuildScopeMatrixSource;
import org.eclipse.aether.impl.scope.BuildScopeSource;
import org.eclipse.aether.impl.scope.CommonBuilds;
import org.eclipse.aether.impl.scope.InternalScopeManager;
import org.eclipse.aether.impl.scope.ScopeManagerConfiguration;
import org.eclipse.aether.internal.impl.scope.ScopeManagerDump;
-import org.eclipse.aether.scope.DependencyScope;
-import org.eclipse.aether.scope.ResolutionScope;
Review Comment:
might redo
##########
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:
```suggestion
ArrayList<ResolutionScope> result = new ArrayList<>();
```
might use import again.
##########
src/site/markdown/maven-configuration.md:
##########
@@ -53,6 +53,7 @@ To modify this file, edit the template and regenerate.
| `maven.logger.showThreadId` | `Boolean` | If you would like to output the
current thread id, then set to true. Defaults to false. | `false` | 4.0.0 |
User properties |
| `maven.logger.showThreadName` | `Boolean` | Set to true if you want to
output the current thread name. Defaults to true. | `true` | 4.0.0 | User
properties |
| `maven.logger.warnLevelString` | `String` | The string value output for the
warn level. Defaults to WARN. | `WARN` | 4.0.0 | User properties |
+| `maven.maven3Personality` | `Boolean` | User property for controlling "maven
personality". If set to {@code true} Maven will behave as previous major
version, Maven 3. | `false` | 4.0.0 | User properties |
Review Comment:
```suggestion
| `maven.maven3Personality` | `Boolean` | User property for controlling
"maven personality". If activated Maven will behave as previous major version,
Maven 3. | `false` | 4.0.0 | User properties |
```
this is just an idea as true/false is kind of technical detail and quite
known.
Might give business case more attention, rather then some data type used.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
