You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/01/19 09:04:32 UTC
git commit: use MavenMetadata.read(File) API instead of duplicating
code
Updated Branches:
refs/heads/master 9a1d22fa4 -> 1408254fb
use MavenMetadata.read(File) API instead of duplicating code
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1408254f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1408254f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1408254f
Branch: refs/heads/master
Commit: 1408254fb863a2417cd9f463f27a3e89947f3bd2
Parents: 9a1d22f
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat Jan 19 09:04:29 2013 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Jan 19 09:04:29 2013 +0100
----------------------------------------------------------------------
.../internal/DefaultVersionRangeResolver.java | 2 +-
.../internal/DefaultVersionResolver.java | 31 +--------------
.../maven/repository/internal/MavenMetadata.java | 2 +-
3 files changed, 3 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/1408254f/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index d2c8774..87c69fb 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -246,7 +246,7 @@ public class DefaultVersionRangeResolver
{
syncContext.acquire( null, Collections.singleton( metadata ) );
- versioning = DefaultVersionResolver.readMavenRepositoryMetadataVersioning( metadata.getFile() );
+ versioning = MavenMetadata.read( metadata.getFile() ).getVersioning();
}
catch ( Exception e )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/1408254f/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index a9146d7..759d90e 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -20,9 +20,7 @@ package org.apache.maven.repository.internal;
*/
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -32,12 +30,9 @@ import java.util.Map;
import org.apache.maven.artifact.repository.metadata.Snapshot;
import org.apache.maven.artifact.repository.metadata.SnapshotVersion;
import org.apache.maven.artifact.repository.metadata.Versioning;
-import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.sonatype.aether.RepositoryCache;
import org.sonatype.aether.RepositoryEvent.EventType;
import org.sonatype.aether.RepositorySystemSession;
@@ -324,7 +319,7 @@ public class DefaultVersionResolver
{
syncContext.acquire( null, Collections.singleton( metadata ) );
- versioning = readMavenRepositoryMetadataVersioning( metadata.getFile() );
+ versioning = MavenMetadata.read( metadata.getFile() ).getVersioning();
/*
* NOTE: Users occasionally misuse the id "local" for remote repos which screws up the metadata
@@ -363,30 +358,6 @@ public class DefaultVersionResolver
return ( versioning != null ) ? versioning : new Versioning();
}
- static Versioning readMavenRepositoryMetadataVersioning( File metadataFile )
- throws IOException, XmlPullParserException
- {
- if ( metadataFile == null ||! metadataFile.exists() )
- {
- return null;
- }
-
- InputStream is = null;
- try
- {
- is = new FileInputStream( metadataFile );
-
- MetadataXpp3Reader reader = new MetadataXpp3Reader();
- org.apache.maven.artifact.repository.metadata.Metadata m = reader.read( is, false );
-
- return m.getVersioning();
- }
- finally
- {
- IOUtil.close( is );
- }
- }
-
private void invalidMetadata( RepositorySystemSession session, RequestTrace trace, Metadata metadata,
ArtifactRepository repository, Exception exception )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/1408254f/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
index 1fdfad7..78be415 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
@@ -84,7 +84,7 @@ abstract class MavenMetadata
protected abstract void merge( Metadata recessive );
- private Metadata read( File metadataFile )
+ static Metadata read( File metadataFile )
throws RepositoryException
{
if ( metadataFile.length() <= 0 )