mirror of
https://github.com/apache/maven.git
synced 2025-02-12 21:15:39 +00:00
137cbd8a97
Conflicts: maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java pom.xml src/site/site.xml