Bug 406212 - aether-demo does not compile because of renaming of packages Updated to io.tesla.maven:maven-aether-provider:3.1.0
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/276cf13d Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/276cf13d Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/276cf13d Branch: refs/heads/master Commit: 276cf13d2d697f10e3999bc328d47f3d936c26fe Parents: ccb79b2 Author: Benjamin Bentmann <bentm...@sonatype.com> Authored: Tue Apr 23 00:37:37 2013 +0200 Committer: Benjamin Bentmann <bentm...@sonatype.com> Committed: Tue Apr 23 00:37:37 2013 +0200 ---------------------------------------------------------------------- aether-demo-snippets/pom.xml | 24 +++----------------- .../manual/ManualRepositorySystemFactory.java | 7 +++--- .../eclipse/aether/examples/util/Booter.java | 8 +++---- 3 files changed, 11 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/276cf13d/aether-demo-snippets/pom.xml ---------------------------------------------------------------------- diff --git a/aether-demo-snippets/pom.xml b/aether-demo-snippets/pom.xml index f6aaff3..49e2699 100644 --- a/aether-demo-snippets/pom.xml +++ b/aether-demo-snippets/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (c) 2010, 2011 Sonatype, Inc. + ~ Copyright (c) 2010, 2013 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 @@ -29,7 +29,7 @@ <properties> <aetherVersion>0.9.0-SNAPSHOT</aetherVersion> - <mavenVersion>3.0.3</mavenVersion> + <mavenVersion>3.1.0</mavenVersion> <wagonVersion>1.0</wagonVersion> </properties> @@ -80,27 +80,9 @@ <version>${aetherVersion}</version> </dependency> <dependency> - <groupId>org.apache.maven</groupId> + <groupId>io.tesla.maven</groupId> <artifactId>maven-aether-provider</artifactId> <version>${mavenVersion}</version> - <exclusions> - <exclusion> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/276cf13d/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/manual/ManualRepositorySystemFactory.java ---------------------------------------------------------------------- diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/manual/ManualRepositorySystemFactory.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/manual/ManualRepositorySystemFactory.java index 6dfa2cd..8307ee0 100644 --- a/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/manual/ManualRepositorySystemFactory.java +++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/examples/manual/ManualRepositorySystemFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Sonatype, Inc. + * Copyright (c) 2010, 2013 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 @@ -10,11 +10,12 @@ *******************************************************************************/ package org.eclipse.aether.examples.manual; -import org.apache.maven.repository.internal.DefaultServiceLocator; +import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.connector.file.FileRepositoryConnectorFactory; import org.eclipse.aether.connector.wagon.WagonProvider; import org.eclipse.aether.connector.wagon.WagonRepositoryConnectorFactory; +import org.eclipse.aether.impl.DefaultServiceLocator; import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; /** @@ -30,7 +31,7 @@ public class ManualRepositorySystemFactory * Aether's components implement org.eclipse.aether.spi.locator.Service to ease manual wiring and using the * prepopulated DefaultServiceLocator, we only need to register the repository connector factories. */ - DefaultServiceLocator locator = new DefaultServiceLocator(); + DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator(); locator.addService( RepositoryConnectorFactory.class, FileRepositoryConnectorFactory.class ); locator.addService( RepositoryConnectorFactory.class, WagonRepositoryConnectorFactory.class ); locator.setServices( WagonProvider.class, new ManualWagonProvider() ); http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/276cf13d/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 c907903..2ec33f5 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,10 +10,9 @@ *******************************************************************************/ package org.eclipse.aether.examples.util; -import org.apache.maven.repository.internal.MavenRepositorySystemSession; +import org.apache.maven.repository.internal.MavenRepositorySystemUtils; 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; @@ -25,12 +24,13 @@ public class Booter public static RepositorySystem newRepositorySystem() { - return ManualRepositorySystemFactory.newRepositorySystem(); + return org.eclipse.aether.examples.manual.ManualRepositorySystemFactory.newRepositorySystem(); + // return org.eclipse.aether.examples.plexus.PlexusRepositorySystemFactory.newRepositorySystem(); } public static DefaultRepositorySystemSession newRepositorySystemSession( RepositorySystem system ) { - MavenRepositorySystemSession session = new MavenRepositorySystemSession(); + DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); LocalRepository localRepo = new LocalRepository( "target/local-repo" ); session.setLocalRepositoryManager( system.newLocalRepositoryManager( session, localRepo ) );
