Updated imports to account for API refactoring
Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/9322458c Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/9322458c Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/9322458c Branch: refs/heads/demo Commit: 9322458c196e5a90a5de2a6a979133ecf096afd6 Parents: 5fda1c9 Author: Benjamin Bentmann <bentm...@sonatype.com> Authored: Sun Jan 8 18:34:27 2012 +0100 Committer: Benjamin Bentmann <bentm...@sonatype.com> Committed: Sun Jan 8 18:34:27 2012 +0100 ---------------------------------------------------------------------- .../eclipse/aether/examples/maven/ResolveArtifactMojo.java | 4 ++-- .../java/org/eclipse/aether/examples/DeployArtifacts.java | 8 ++++---- .../org/eclipse/aether/examples/FindAvailableVersions.java | 5 ++--- .../java/org/eclipse/aether/examples/FindNewestVersion.java | 5 ++--- .../java/org/eclipse/aether/examples/GetDependencyTree.java | 5 ++--- .../org/eclipse/aether/examples/GetDirectDependencies.java | 5 ++--- .../java/org/eclipse/aether/examples/InstallArtifacts.java | 5 ++--- .../java/org/eclipse/aether/examples/ResolveArtifact.java | 5 ++--- .../aether/examples/ResolveTransitiveDependencies.java | 5 ++--- .../main/java/org/eclipse/aether/examples/aether/Aether.java | 7 +++---- .../java/org/eclipse/aether/examples/aether/AetherDemo.java | 4 ++-- .../main/java/org/eclipse/aether/examples/util/Booter.java | 5 ++--- 12 files changed, 27 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/aether-demo-maven-plugin/src/main/java/org/eclipse/aether/examples/maven/ResolveArtifactMojo.java ---------------------------------------------------------------------- diff --git a/aether-demo-maven-plugin/src/main/java/org/eclipse/aether/examples/maven/ResolveArtifactMojo.java b/aether-demo-maven-plugin/src/main/java/org/eclipse/aether/examples/maven/ResolveArtifactMojo.java index 4dc0d47..bd6d2c8 100644 --- a/aether-demo-maven-plugin/src/main/java/org/eclipse/aether/examples/maven/ResolveArtifactMojo.java +++ b/aether-demo-maven-plugin/src/main/java/org/eclipse/aether/examples/maven/ResolveArtifactMojo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,11 +18,11 @@ import org.apache.maven.plugin.MojoFailureException; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.resolution.ArtifactRequest; import org.eclipse.aether.resolution.ArtifactResolutionException; import org.eclipse.aether.resolution.ArtifactResult; -import org.eclipse.aether.util.artifact.DefaultArtifact; /** * @goal resolve-artifact http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/DeployArtifacts.java ---------------------------------------------------------------------- diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/DeployArtifacts.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/DeployArtifacts.java index c905415..5fdefd2 100644 --- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/DeployArtifacts.java +++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/DeployArtifacts.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,13 +15,12 @@ import java.io.File; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.deployment.DeployRequest; import org.eclipse.aether.examples.util.Booter; import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.util.artifact.DefaultArtifact; import org.eclipse.aether.util.artifact.SubArtifact; - /** * Deploys a JAR and its POM to a remote repository. */ @@ -45,7 +44,8 @@ public class DeployArtifacts pomArtifact = pomArtifact.setFile( new File( "pom.xml" ) ); RemoteRepository distRepo = - new RemoteRepository( "org.eclipse.aether.examples", "default", new File( "target/dist-repo" ).toURI().toString() ); + new RemoteRepository( "org.eclipse.aether.examples", "default", + new File( "target/dist-repo" ).toURI().toString() ); DeployRequest deployRequest = new DeployRequest(); deployRequest.addArtifact( jarArtifact ).addArtifact( pomArtifact ); http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/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 b3d5219..772445a 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,14 +15,13 @@ import java.util.List; import org.eclipse.aether.RepositorySystem; 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.util.artifact.DefaultArtifact; import org.eclipse.aether.version.Version; - /** * Determines all available versions of an artifact. */ http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/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 4bf8eb5..fa7b38f 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,14 +13,13 @@ package org.eclipse.aether.examples; import org.eclipse.aether.RepositorySystem; 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.util.artifact.DefaultArtifact; import org.eclipse.aether.version.Version; - /** * Determines the newest version of an artifact. */ http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/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 8694f5e..8c88348 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,14 +13,13 @@ package org.eclipse.aether.examples; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; 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.graph.Dependency; import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.util.artifact.DefaultArtifact; - /** * Collects the transitive dependencies of an artifact. http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/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 af6a349..3fafb7e 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,13 +13,12 @@ package org.eclipse.aether.examples; import org.eclipse.aether.RepositorySystem; 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.graph.Dependency; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.resolution.ArtifactDescriptorRequest; import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.util.artifact.DefaultArtifact; - /** * Determines the direct dependencies of an artifact as declared in its artifact descriptor (POM). http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/InstallArtifacts.java ---------------------------------------------------------------------- diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/InstallArtifacts.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/InstallArtifacts.java index 5871b2a..f5ba32a 100644 --- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/InstallArtifacts.java +++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/InstallArtifacts.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,12 +15,11 @@ import java.io.File; import org.eclipse.aether.RepositorySystem; 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.installation.InstallRequest; -import org.eclipse.aether.util.artifact.DefaultArtifact; import org.eclipse.aether.util.artifact.SubArtifact; - /** * Installs a JAR and its POM to the local repository. */ http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/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 8b05cfc..bcc8aa1 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,12 +13,11 @@ package org.eclipse.aether.examples; import org.eclipse.aether.RepositorySystem; 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; -import org.eclipse.aether.util.artifact.DefaultArtifact; - /** * Resolves a single artifact. http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/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 a178221..9cf7cc8 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.collection.CollectRequest; import org.eclipse.aether.examples.util.Booter; import org.eclipse.aether.graph.Dependency; @@ -22,11 +23,9 @@ 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.DefaultArtifact; import org.eclipse.aether.util.artifact.JavaScopes; import org.eclipse.aether.util.filter.DependencyFilterUtils; - /** * Resolves the transitive (compile) dependencies of an artifact. */ http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/Aether.java ---------------------------------------------------------------------- diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/Aether.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/Aether.java index 9262699..fd647bf 100644 --- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/Aether.java +++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/Aether.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,11 @@ package org.eclipse.aether.examples.aether; import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.collection.CollectRequest; import org.eclipse.aether.deployment.DeployRequest; import org.eclipse.aether.deployment.DeploymentException; @@ -30,11 +32,8 @@ import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.resolution.DependencyRequest; import org.eclipse.aether.resolution.DependencyResolutionException; -import org.eclipse.aether.util.DefaultRepositorySystemSession; -import org.eclipse.aether.util.artifact.DefaultArtifact; import org.eclipse.aether.util.graph.PreorderNodeListGenerator; - public class Aether { private String remoteRepository; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/AetherDemo.java ---------------------------------------------------------------------- diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/AetherDemo.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/AetherDemo.java index c5d39bc..62ba6ce 100644 --- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/AetherDemo.java +++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/aether/AetherDemo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,11 +14,11 @@ import java.io.File; import java.util.List; import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.deployment.DeploymentException; import org.eclipse.aether.graph.DependencyNode; import org.eclipse.aether.installation.InstallationException; import org.eclipse.aether.resolution.DependencyResolutionException; -import org.eclipse.aether.util.artifact.DefaultArtifact; import org.eclipse.aether.util.artifact.SubArtifact; @SuppressWarnings( "unused" ) http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9322458c/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 d362a9b..412bfab 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2012 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,12 +11,11 @@ package org.eclipse.aether.examples.util; import org.apache.maven.repository.internal.MavenRepositorySystemSession; +import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.examples.manual.ManualRepositorySystemFactory; import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.util.DefaultRepositorySystemSession; - /** * A helper to boot the repository system and a repository system session.
