asfgit closed pull request #187: [MNG-6496] Upgrade Maven Resolver to 1.3.1
URL: https://github.com/apache/maven/pull/187
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 13868a2e10..df50168b19 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -108,6 +108,15 @@ under the License.
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 748c7713bf..4f464ea8d9 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -67,9 +67,6 @@
import org.eclipse.aether.resolution.VersionResult;
import org.eclipse.aether.spi.locator.Service;
import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.spi.log.LoggerFactory;
-import org.eclipse.aether.spi.log.NullLoggerFactory;
import org.eclipse.aether.transfer.ArtifactNotFoundException;
/**
@@ -80,10 +77,6 @@
public class DefaultArtifactDescriptorReader
implements ArtifactDescriptorReader, Service
{
-
- @SuppressWarnings( "unused" )
- private Logger logger = NullLoggerFactory.LOGGER;
-
private RemoteRepositoryManager remoteRepositoryManager;
private VersionResolver versionResolver;
@@ -104,15 +97,13 @@ public DefaultArtifactDescriptorReader()
@Inject
DefaultArtifactDescriptorReader( RemoteRepositoryManager
remoteRepositoryManager, VersionResolver versionResolver,
VersionRangeResolver
versionRangeResolver, ArtifactResolver artifactResolver,
- ModelBuilder modelBuilder,
RepositoryEventDispatcher repositoryEventDispatcher,
- LoggerFactory loggerFactory )
+ ModelBuilder modelBuilder,
RepositoryEventDispatcher repositoryEventDispatcher )
{
setRemoteRepositoryManager( remoteRepositoryManager );
setVersionResolver( versionResolver );
setVersionRangeResolver( versionRangeResolver );
setArtifactResolver( artifactResolver );
setModelBuilder( modelBuilder );
- setLoggerFactory( loggerFactory );
setRepositoryEventDispatcher( repositoryEventDispatcher );
}
@@ -128,19 +119,6 @@ public void initService( ServiceLocator locator )
setModelBuilder( new DefaultModelBuilderFactory().newInstance() );
}
setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
- setLoggerFactory( locator.getService( LoggerFactory.class ) );
- }
-
- public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory
loggerFactory )
- {
- this.logger = NullLoggerFactory.getSafeLogger( loggerFactory,
getClass() );
- return this;
- }
-
- void setLogger( LoggerFactory loggerFactory )
- {
- // plexus support
- setLoggerFactory( loggerFactory );
}
public DefaultArtifactDescriptorReader setRemoteRepositoryManager(
RemoteRepositoryManager remoteRepositoryManager )
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 2f92e1609e..83c82a0385 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -42,9 +42,6 @@
import org.eclipse.aether.resolution.VersionRangeResult;
import org.eclipse.aether.spi.locator.Service;
import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.spi.log.LoggerFactory;
-import org.eclipse.aether.spi.log.NullLoggerFactory;
import org.eclipse.aether.util.version.GenericVersionScheme;
import org.eclipse.aether.version.InvalidVersionSpecificationException;
import org.eclipse.aether.version.Version;
@@ -75,9 +72,6 @@
private static final String MAVEN_METADATA_XML = "maven-metadata.xml";
- @SuppressWarnings( "unused" )
- private Logger logger = NullLoggerFactory.LOGGER;
-
private MetadataResolver metadataResolver;
private SyncContextFactory syncContextFactory;
@@ -91,34 +85,20 @@ public DefaultVersionRangeResolver()
@Inject
DefaultVersionRangeResolver( MetadataResolver metadataResolver,
SyncContextFactory syncContextFactory,
- RepositoryEventDispatcher
repositoryEventDispatcher, LoggerFactory loggerFactory )
+ RepositoryEventDispatcher
repositoryEventDispatcher )
{
setMetadataResolver( metadataResolver );
setSyncContextFactory( syncContextFactory );
- setLoggerFactory( loggerFactory );
setRepositoryEventDispatcher( repositoryEventDispatcher );
}
public void initService( ServiceLocator locator )
{
- setLoggerFactory( locator.getService( LoggerFactory.class ) );
setMetadataResolver( locator.getService( MetadataResolver.class ) );
setSyncContextFactory( locator.getService( SyncContextFactory.class )
);
setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
}
- public DefaultVersionRangeResolver setLoggerFactory( LoggerFactory
loggerFactory )
- {
- this.logger = NullLoggerFactory.getSafeLogger( loggerFactory,
getClass() );
- return this;
- }
-
- void setLogger( LoggerFactory loggerFactory )
- {
- // plexus support
- setLoggerFactory( loggerFactory );
- }
-
public DefaultVersionRangeResolver setMetadataResolver( MetadataResolver
metadataResolver )
{
this.metadataResolver = Objects.requireNonNull( metadataResolver,
"metadataResolver cannot be null" );
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index 1896005ed1..502aba186b 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -50,9 +50,6 @@
import org.eclipse.aether.resolution.VersionResult;
import org.eclipse.aether.spi.locator.Service;
import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.spi.log.LoggerFactory;
-import org.eclipse.aether.spi.log.NullLoggerFactory;
import org.eclipse.aether.util.ConfigUtils;
import javax.inject.Inject;
@@ -87,9 +84,6 @@
private static final String SNAPSHOT = "SNAPSHOT";
- @SuppressWarnings( "unused" )
- private Logger logger = NullLoggerFactory.LOGGER;
-
private MetadataResolver metadataResolver;
private SyncContextFactory syncContextFactory;
@@ -103,34 +97,20 @@ public DefaultVersionResolver()
@Inject
DefaultVersionResolver( MetadataResolver metadataResolver,
SyncContextFactory syncContextFactory,
- RepositoryEventDispatcher
repositoryEventDispatcher, LoggerFactory loggerFactory )
+ RepositoryEventDispatcher
repositoryEventDispatcher )
{
setMetadataResolver( metadataResolver );
setSyncContextFactory( syncContextFactory );
- setLoggerFactory( loggerFactory );
setRepositoryEventDispatcher( repositoryEventDispatcher );
}
public void initService( ServiceLocator locator )
{
- setLoggerFactory( locator.getService( LoggerFactory.class ) );
setMetadataResolver( locator.getService( MetadataResolver.class ) );
setSyncContextFactory( locator.getService( SyncContextFactory.class )
);
setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
}
- public DefaultVersionResolver setLoggerFactory( LoggerFactory
loggerFactory )
- {
- this.logger = NullLoggerFactory.getSafeLogger( loggerFactory,
getClass() );
- return this;
- }
-
- void setLogger( LoggerFactory loggerFactory )
- {
- // plexus support
- setLoggerFactory( loggerFactory );
- }
-
public DefaultVersionResolver setMetadataResolver( MetadataResolver
metadataResolver )
{
this.metadataResolver = Objects.requireNonNull( metadataResolver,
"metadataResolver cannot be null" );
diff --git a/pom.xml b/pom.xml
index 88856e90ce..9b8acb28a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.9.1</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <resolverVersion>1.3.0</resolverVersion>
+ <resolverVersion>1.3.1</resolverVersion>
<slf4jVersion>1.7.25</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
