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 2017/05/26 21:16:02 UTC
[26/48] maven-resolver git commit: Refactored example code slightly
in preparation to showcase issue #422413
Refactored example code slightly in preparation to showcase issue #422413
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/6d339b4c
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/6d339b4c
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/6d339b4c
Branch: refs/heads/demos
Commit: 6d339b4cfcfecca5da3c2ca7d004c1c925956e56
Parents: 8ae4036
Author: Benjamin Bentmann <be...@sonatype.com>
Authored: Sun Nov 24 18:35:06 2013 +0100
Committer: Benjamin Bentmann <be...@sonatype.com>
Committed: Sun Nov 24 18:35:06 2013 +0100
----------------------------------------------------------------------
.../aether/examples/FindAvailableVersions.java | 5 +----
.../eclipse/aether/examples/FindNewestVersion.java | 5 +----
.../aether/examples/GetDependencyHierarchy.java | 12 +++++-------
.../eclipse/aether/examples/GetDependencyTree.java | 5 +----
.../aether/examples/GetDirectDependencies.java | 5 +----
.../org/eclipse/aether/examples/ResolveArtifact.java | 5 +----
.../examples/ResolveTransitiveDependencies.java | 5 +----
.../java/org/eclipse/aether/examples/util/Booter.java | 14 ++++++++++++--
8 files changed, 23 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6d339b4c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindAvailableVersions.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindAvailableVersions.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindAvailableVersions.java
index be309b0..8f556c2 100644
--- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindAvailableVersions.java
+++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindAvailableVersions.java
@@ -17,7 +17,6 @@ import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.examples.util.Booter;
-import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.VersionRangeRequest;
import org.eclipse.aether.resolution.VersionRangeResult;
import org.eclipse.aether.version.Version;
@@ -40,11 +39,9 @@ public class FindAvailableVersions
Artifact artifact = new DefaultArtifact( "org.eclipse.aether:aether-util:[0,)" );
- RemoteRepository repo = Booter.newCentralRepository();
-
VersionRangeRequest rangeRequest = new VersionRangeRequest();
rangeRequest.setArtifact( artifact );
- rangeRequest.addRepository( repo );
+ rangeRequest.setRepositories( Booter.newRepositories( system, session ) );
VersionRangeResult rangeResult = system.resolveVersionRange( session, rangeRequest );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6d339b4c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindNewestVersion.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindNewestVersion.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindNewestVersion.java
index e039232..48665fd 100644
--- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindNewestVersion.java
+++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/FindNewestVersion.java
@@ -15,7 +15,6 @@ import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.examples.util.Booter;
-import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.VersionRangeRequest;
import org.eclipse.aether.resolution.VersionRangeResult;
import org.eclipse.aether.version.Version;
@@ -38,11 +37,9 @@ public class FindNewestVersion
Artifact artifact = new DefaultArtifact( "org.eclipse.aether:aether-util:[0,)" );
- RemoteRepository repo = Booter.newCentralRepository();
-
VersionRangeRequest rangeRequest = new VersionRangeRequest();
rangeRequest.setArtifact( artifact );
- rangeRequest.addRepository( repo );
+ rangeRequest.setRepositories( Booter.newRepositories( system, session ) );
VersionRangeResult rangeResult = system.resolveVersionRange( session, rangeRequest );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6d339b4c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyHierarchy.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyHierarchy.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyHierarchy.java
index 2991714..015c922 100644
--- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyHierarchy.java
+++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyHierarchy.java
@@ -18,7 +18,6 @@ import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.collection.CollectResult;
import org.eclipse.aether.examples.util.Booter;
import org.eclipse.aether.examples.util.ConsoleDependencyGraphDumper;
-import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
import org.eclipse.aether.resolution.ArtifactDescriptorResult;
import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
@@ -45,17 +44,16 @@ public class GetDependencyHierarchy
Artifact artifact = new DefaultArtifact( "org.apache.maven:maven-aether-provider:3.1.0" );
- RemoteRepository repo = Booter.newCentralRepository();
-
- ArtifactDescriptorResult descriptorResult =
- system.readArtifactDescriptor( session,
- new ArtifactDescriptorRequest().setArtifact( artifact ).addRepository( repo ) );
+ ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest();
+ descriptorRequest.setArtifact( artifact );
+ descriptorRequest.setRepositories( Booter.newRepositories( system, session ) );
+ ArtifactDescriptorResult descriptorResult = system.readArtifactDescriptor( session, descriptorRequest );
CollectRequest collectRequest = new CollectRequest();
collectRequest.setRootArtifact( descriptorResult.getArtifact() );
collectRequest.setDependencies( descriptorResult.getDependencies() );
collectRequest.setManagedDependencies( descriptorResult.getManagedDependencies() );
- collectRequest.addRepository( repo );
+ collectRequest.setRepositories( descriptorRequest.getRepositories() );
CollectResult collectResult = system.collectDependencies( session, collectRequest );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6d339b4c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyTree.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyTree.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyTree.java
index 0265895..7a1bf9e 100644
--- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyTree.java
+++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDependencyTree.java
@@ -19,7 +19,6 @@ import org.eclipse.aether.collection.CollectResult;
import org.eclipse.aether.examples.util.Booter;
import org.eclipse.aether.examples.util.ConsoleDependencyGraphDumper;
import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.repository.RemoteRepository;
/**
* Collects the transitive dependencies of an artifact.
@@ -39,11 +38,9 @@ public class GetDependencyTree
Artifact artifact = new DefaultArtifact( "org.apache.maven:maven-aether-provider:3.1.0" );
- RemoteRepository repo = Booter.newCentralRepository();
-
CollectRequest collectRequest = new CollectRequest();
collectRequest.setRoot( new Dependency( artifact, "" ) );
- collectRequest.addRepository( repo );
+ collectRequest.setRepositories( Booter.newRepositories( system, session ) );
CollectResult collectResult = system.collectDependencies( session, collectRequest );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6d339b4c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDirectDependencies.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDirectDependencies.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDirectDependencies.java
index bb70025..6378a4d 100644
--- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDirectDependencies.java
+++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/GetDirectDependencies.java
@@ -16,7 +16,6 @@ import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.examples.util.Booter;
import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
import org.eclipse.aether.resolution.ArtifactDescriptorResult;
@@ -38,11 +37,9 @@ public class GetDirectDependencies
Artifact artifact = new DefaultArtifact( "org.eclipse.aether:aether-impl:0.9.0.M3" );
- RemoteRepository repo = Booter.newCentralRepository();
-
ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest();
descriptorRequest.setArtifact( artifact );
- descriptorRequest.addRepository( repo );
+ descriptorRequest.setRepositories( Booter.newRepositories( system, session ) );
ArtifactDescriptorResult descriptorResult = system.readArtifactDescriptor( session, descriptorRequest );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6d339b4c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveArtifact.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveArtifact.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveArtifact.java
index 655678d..beccdd0 100644
--- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveArtifact.java
+++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveArtifact.java
@@ -15,7 +15,6 @@ import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.examples.util.Booter;
-import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResult;
@@ -37,11 +36,9 @@ public class ResolveArtifact
Artifact artifact = new DefaultArtifact( "org.eclipse.aether:aether-util:0.9.0.M3" );
- RemoteRepository repo = Booter.newCentralRepository();
-
ArtifactRequest artifactRequest = new ArtifactRequest();
artifactRequest.setArtifact( artifact );
- artifactRequest.addRepository( repo );
+ artifactRequest.setRepositories( Booter.newRepositories( system, session ) );
ArtifactResult artifactResult = system.resolveArtifact( session, artifactRequest );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6d339b4c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveTransitiveDependencies.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveTransitiveDependencies.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveTransitiveDependencies.java
index fbf9489..1596f5e 100644
--- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveTransitiveDependencies.java
+++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/ResolveTransitiveDependencies.java
@@ -20,7 +20,6 @@ import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.examples.util.Booter;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.resolution.DependencyRequest;
import org.eclipse.aether.util.artifact.JavaScopes;
@@ -44,13 +43,11 @@ public class ResolveTransitiveDependencies
Artifact artifact = new DefaultArtifact( "org.eclipse.aether:aether-impl:0.9.0.M3" );
- RemoteRepository repo = Booter.newCentralRepository();
-
DependencyFilter classpathFlter = DependencyFilterUtils.classpathFilter( JavaScopes.COMPILE );
CollectRequest collectRequest = new CollectRequest();
collectRequest.setRoot( new Dependency( artifact, JavaScopes.COMPILE ) );
- collectRequest.addRepository( repo );
+ collectRequest.setRepositories( Booter.newRepositories( system, session ) );
DependencyRequest dependencyRequest = new DependencyRequest( collectRequest, classpathFlter );
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6d339b4c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/util/Booter.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/util/Booter.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/util/Booter.java
index 5911ed6..7ea82d5 100644
--- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/util/Booter.java
+++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/util/Booter.java
@@ -10,9 +10,14 @@
*******************************************************************************/
package org.eclipse.aether.examples.util;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.RemoteRepository;
@@ -45,9 +50,14 @@ public class Booter
return session;
}
- public static RemoteRepository newCentralRepository()
+ public static List<RemoteRepository> newRepositories( RepositorySystem system, RepositorySystemSession session )
+ {
+ return new ArrayList<RemoteRepository>( Arrays.asList( newCentralRepository() ) );
+ }
+
+ private static RemoteRepository newCentralRepository()
{
- return new RemoteRepository.Builder( "central", "default", "http://repo1.maven.org/maven2/" ).build();
+ return new RemoteRepository.Builder( "central", "default", "http://central.maven.org/maven2/" ).build();
}
}