Author: rfscholte
Date: Fri Oct 26 22:14:17 2012
New Revision: 1402701
URL: http://svn.apache.org/viewvc?rev=1402701&view=rev
Log:
[MNG-5365] Replace Aether's deprecated ConfigurationProperties with ConfigUtils
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java?rev=1402701&r1=1402700&r2=1402701&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
(original)
+++
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
Fri Oct 26 22:14:17 2012
@@ -36,15 +36,11 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.ConfigurationProperties;
import org.sonatype.aether.RepositoryCache;
-import org.sonatype.aether.RequestTrace;
import org.sonatype.aether.RepositoryEvent.EventType;
import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.RequestTrace;
import org.sonatype.aether.SyncContext;
-import org.sonatype.aether.util.DefaultRequestTrace;
-import org.sonatype.aether.util.listener.DefaultRepositoryEvent;
-import org.sonatype.aether.util.metadata.DefaultMetadata;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.impl.MetadataResolver;
import org.sonatype.aether.impl.RepositoryEventDispatcher;
@@ -66,6 +62,10 @@ import org.sonatype.aether.spi.locator.S
import org.sonatype.aether.spi.locator.ServiceLocator;
import org.sonatype.aether.spi.log.Logger;
import org.sonatype.aether.spi.log.NullLogger;
+import org.sonatype.aether.util.ConfigUtils;
+import org.sonatype.aether.util.DefaultRequestTrace;
+import org.sonatype.aether.util.listener.DefaultRepositoryEvent;
+import org.sonatype.aether.util.metadata.DefaultMetadata;
/**
* @author Benjamin Bentmann
@@ -153,7 +153,8 @@ public class DefaultVersionResolver
Key cacheKey = null;
RepositoryCache cache = session.getCache();
- if ( cache != null && !ConfigurationProperties.get( session,
"aether.versionResolver.noCache", false ) )
+
+ if ( cache != null && !ConfigUtils.getBoolean( session, false,
"aether.versionResolver.noCache" ) )
{
cacheKey = new Key( session, request );
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java?rev=1402701&r1=1402700&r2=1402701&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
(original)
+++
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
Fri Oct 26 22:14:17 2012
@@ -24,12 +24,12 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.sonatype.aether.ConfigurationProperties;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.impl.MetadataGenerator;
import org.sonatype.aether.installation.InstallRequest;
import org.sonatype.aether.metadata.Metadata;
+import org.sonatype.aether.util.ConfigUtils;
/**
* @author Benjamin Bentmann
@@ -44,7 +44,7 @@ class LocalSnapshotMetadataGenerator
public LocalSnapshotMetadataGenerator( RepositorySystemSession session,
InstallRequest request )
{
- legacyFormat = ConfigurationProperties.get(
session.getConfigProperties(), "maven.metadata.legacy", false );
+ legacyFormat = ConfigUtils.getBoolean( session.getConfigProperties(),
false, "maven.metadata.legacy" );
snapshots = new LinkedHashMap<Object, LocalSnapshotMetadata>();
}
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java?rev=1402701&r1=1402700&r2=1402701&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
(original)
+++
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
Fri Oct 26 22:14:17 2012
@@ -24,12 +24,12 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.sonatype.aether.ConfigurationProperties;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.deployment.DeployRequest;
import org.sonatype.aether.impl.MetadataGenerator;
import org.sonatype.aether.metadata.Metadata;
+import org.sonatype.aether.util.ConfigUtils;
/**
* @author Benjamin Bentmann
@@ -44,7 +44,7 @@ class RemoteSnapshotMetadataGenerator
public RemoteSnapshotMetadataGenerator( RepositorySystemSession session,
DeployRequest request )
{
- legacyFormat = ConfigurationProperties.get(
session.getConfigProperties(), "maven.metadata.legacy", false );
+ legacyFormat = ConfigUtils.getBoolean( session.getConfigProperties(),
false, "maven.metadata.legacy" );
snapshots = new LinkedHashMap<Object, RemoteSnapshotMetadata>();
