maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject maven-aether git commit: changed org.eclipse to org.apache.maven (continued)
Date Mon, 16 May 2016 16:30:47 GMT
Repository: maven-aether
Updated Branches:
  refs/heads/demo eabeffbb0 -> f2792b968


changed org.eclipse to org.apache.maven (continued)

Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/f2792b96
Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/f2792b96
Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/f2792b96

Branch: refs/heads/demo
Commit: f2792b968388411046c7eb175026c555df320c2b
Parents: eabeffb
Author: Hervé Boutemy <hboutemy@apache.org>
Authored: Mon May 16 18:30:40 2016 +0200
Committer: Hervé Boutemy <hboutemy@apache.org>
Committed: Mon May 16 18:30:40 2016 +0200

----------------------------------------------------------------------
 .../apache/maven/aether/examples/maven/ResolveArtifactMojo.java  | 2 +-
 .../java/org/apache/maven/aether/examples/DeployArtifacts.java   | 4 ++--
 .../java/org/apache/maven/aether/examples/InstallArtifacts.java  | 3 ++-
 .../maven/aether/examples/ResolveTransitiveDependencies.java     | 3 ++-
 .../java/org/apache/maven/aether/examples/aether/AetherDemo.java | 4 ++--
 .../main/java/org/apache/maven/aether/examples/util/Booter.java  | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-aether/blob/f2792b96/aether-demo-maven-plugin/src/main/java/org/apache/maven/aether/examples/maven/ResolveArtifactMojo.java
----------------------------------------------------------------------
diff --git a/aether-demo-maven-plugin/src/main/java/org/apache/maven/aether/examples/maven/ResolveArtifactMojo.java
b/aether-demo-maven-plugin/src/main/java/org/apache/maven/aether/examples/maven/ResolveArtifactMojo.java
index eae0d53..d370866 100644
--- a/aether-demo-maven-plugin/src/main/java/org/apache/maven/aether/examples/maven/ResolveArtifactMojo.java
+++ b/aether-demo-maven-plugin/src/main/java/org/apache/maven/aether/examples/maven/ResolveArtifactMojo.java
@@ -68,7 +68,7 @@ public class ResolveArtifactMojo
     /**
      * The {@code <groupId>:<artifactId>[:<extension>[:<classifier>]]:<version>}
of the artifact to resolve.
      * 
-     * @parameter expression="${aether.artifactCoords}"
+     * @parameter property="aether.artifactCoords"
      */
     private String artifactCoords;
 

http://git-wip-us.apache.org/repos/asf/maven-aether/blob/f2792b96/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/DeployArtifacts.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/DeployArtifacts.java
b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/DeployArtifacts.java
index da6396d..b4c1d9a 100644
--- a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/DeployArtifacts.java
+++ b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/DeployArtifacts.java
@@ -46,14 +46,14 @@ public class DeployArtifacts
 
         RepositorySystemSession session = Booter.newRepositorySystemSession( system );
 
-        Artifact jarArtifact = new DefaultArtifact( "test", "org.eclipse.aether.examples",
"", "jar", "0.1-SNAPSHOT" );
+        Artifact jarArtifact = new DefaultArtifact( "test", "org.apache.maven.aether.examples",
"", "jar", "0.1-SNAPSHOT" );
         jarArtifact = jarArtifact.setFile( new File( "src/main/data/demo.jar" ) );
 
         Artifact pomArtifact = new SubArtifact( jarArtifact, "", "pom" );
         pomArtifact = pomArtifact.setFile( new File( "pom.xml" ) );
 
         RemoteRepository distRepo =
-            new RemoteRepository.Builder( "org.eclipse.aether.examples", "default",
+            new RemoteRepository.Builder( "org.apache.maven.aether.examples", "default",
                                   new File( "target/dist-repo" ).toURI().toString() ).build();
 
         DeployRequest deployRequest = new DeployRequest();

http://git-wip-us.apache.org/repos/asf/maven-aether/blob/f2792b96/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/InstallArtifacts.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/InstallArtifacts.java
b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/InstallArtifacts.java
index 7026f0a..711c639 100644
--- a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/InstallArtifacts.java
+++ b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/InstallArtifacts.java
@@ -45,7 +45,8 @@ public class InstallArtifacts
 
         RepositorySystemSession session = Booter.newRepositorySystemSession( system );
 
-        Artifact jarArtifact = new DefaultArtifact( "test", "org.eclipse.aether.examples",
"", "jar", "0.1-SNAPSHOT" );
+        Artifact jarArtifact =
+            new DefaultArtifact( "test", "org.apache.maven.aether.examples", "", "jar", "0.1-SNAPSHOT"
);
         jarArtifact = jarArtifact.setFile( new File( "src/main/data/demo.jar" ) );
 
         Artifact pomArtifact = new SubArtifact( jarArtifact, "", "pom" );

http://git-wip-us.apache.org/repos/asf/maven-aether/blob/f2792b96/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/ResolveTransitiveDependencies.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/ResolveTransitiveDependencies.java
b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/ResolveTransitiveDependencies.java
index aacf33c..eec52b7 100644
--- a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/ResolveTransitiveDependencies.java
+++ b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/ResolveTransitiveDependencies.java
@@ -65,7 +65,8 @@ public class ResolveTransitiveDependencies
 
         for ( ArtifactResult artifactResult : artifactResults )
         {
-            System.out.println( artifactResult.getArtifact() + " resolved to " + artifactResult.getArtifact().getFile()
);
+            System.out.println( artifactResult.getArtifact() + " resolved to "
+                + artifactResult.getArtifact().getFile() );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/maven-aether/blob/f2792b96/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/aether/AetherDemo.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/aether/AetherDemo.java
b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/aether/AetherDemo.java
index e0bfac7..e726964 100644
--- a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/aether/AetherDemo.java
+++ b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/aether/AetherDemo.java
@@ -39,7 +39,7 @@ public class AetherDemo
     public void resolve() 
         throws DependencyResolutionException
     {
-        Aether aether = new Aether( "http://localhost:8081/nexus/content/groups/public",
"/Users/jvanzyl/aether-repo" );
+        Aether aether = new Aether( "http://localhost:8081/nexus/content/groups/public",
"target/aether-repo" );
                 
         AetherResult result = aether.resolve( "com.mycompany.app", "super-app", "1.0" );
 
@@ -59,7 +59,7 @@ public class AetherDemo
     public void installAndDeploy() 
         throws InstallationException, DeploymentException
     {
-        Aether aether = new Aether( "http://localhost:8081/nexus/content/groups/public",
"/Users/jvanzyl/aether-repo" );
+        Aether aether = new Aether( "http://localhost:8081/nexus/content/groups/public",
"target/aether-repo" );
         
         Artifact artifact = new DefaultArtifact( "com.mycompany.super", "super-core", "jar",
"0.1-SNAPSHOT" );
         artifact = artifact.setFile( new File( "jar-from-whatever-process.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-aether/blob/f2792b96/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/util/Booter.java
----------------------------------------------------------------------
diff --git a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/util/Booter.java
b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/util/Booter.java
index e131646..2ee5686 100644
--- a/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/util/Booter.java
+++ b/aether-demo-snippets/src/main/java/org/apache/maven/aether/examples/util/Booter.java
@@ -67,7 +67,7 @@ public class Booter
 
     private static RemoteRepository newCentralRepository()
     {
-        return new RemoteRepository.Builder( "central", "default", "http://central.maven.org/maven2/"
).build();
+        return new RemoteRepository.Builder( "central", "default", "https://repo.maven.apache.org/maven2/"
).build();
     }
 
 }


Mime
View raw message