This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-6492
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ee24381374b9c2d04dd1049b4f9813a7e062f377
Author: Sylwester Lachiewicz <slachiew...@gmail.com>
AuthorDate: Mon Jul 9 22:23:06 2018 +0200
[MNG-6496] Upgrade Maven Resolver to 1.3.1
Fixes #187
---
maven-resolver-provider/pom.xml | 9 ++++++++
.../internal/DefaultArtifactDescriptorReader.java | 24 +---------------------
.../internal/DefaultVersionRangeResolver.java | 22 +-------------------
.../internal/DefaultVersionResolver.java | 22 +-------------------
pom.xml | 2 +-
5 files changed, 13 insertions(+), 66 deletions(-)
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 13868a2..df50168 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 748c771..4f464ea 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.VersionResolutionException;
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 @@ import org.eclipse.aether.transfer.ArtifactNotFoundException;
public class DefaultArtifactDescriptorReader
implements ArtifactDescriptorReader, Service
{
-
- @SuppressWarnings( "unused" )
- private Logger logger = NullLoggerFactory.LOGGER;
-
private RemoteRepositoryManager remoteRepositoryManager;
private VersionResolver versionResolver;
@@ -104,15 +97,13 @@ public class 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 class DefaultArtifactDescriptorReader
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 2f92e16..83c82a0 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.VersionRangeResolutionException;
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 @@ public class DefaultVersionRangeResolver
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 class 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 1896005..502aba1 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.VersionResolutionException;
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 @@ public class DefaultVersionResolver
private static final String SNAPSHOT = "SNAPSHOT";
- @SuppressWarnings( "unused" )
- private Logger logger = NullLoggerFactory.LOGGER;
-
private MetadataResolver metadataResolver;
private SyncContextFactory syncContextFactory;
@@ -103,34 +97,20 @@ public class 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 88856e9..9b8acb2 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>
