Repository: karaf Updated Branches: refs/heads/master a000b595a -> e4222843c
[KARAF-5250] Fix deployment of SNAPSHOTs - no metadata override after artifact upload Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e4222843 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e4222843 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e4222843 Branch: refs/heads/master Commit: e4222843c5fa420f54da3f3f1e84d74c78ad9579 Parents: a000b59 Author: Grzegorz Grzybek <[email protected]> Authored: Fri Jul 14 12:16:17 2017 +0200 Committer: Grzegorz Grzybek <[email protected]> Committed: Fri Jul 14 12:16:17 2017 +0200 ---------------------------------------------------------------------- tooling/karaf-maven-plugin/pom.xml | 39 +++++++++--------- .../org/apache/karaf/tooling/AssemblyMojo.java | 6 +-- .../org/apache/karaf/tooling/VerifyMojo.java | 6 +-- .../tooling/utils/ReactorMavenResolver.java | 6 +-- tooling/karaf-services-maven-plugin/pom.xml | 42 ++++++-------------- tooling/pom.xml | 1 + 6 files changed, 40 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e4222843/tooling/karaf-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 77d02c5..a3538e9 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -48,24 +48,14 @@ <artifactId>maven-plugin-api</artifactId> </dependency> <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-api</artifactId> - <version>1.11</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${maven.resolver.version}</version> </dependency> <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-util</artifactId> - <version>1.11</version> - </dependency> - <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-api</artifactId> - <version>0.9.0.M2</version> - </dependency> - <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-util</artifactId> - <version>0.9.0.M2</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + <version>${maven.resolver.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -74,10 +64,22 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-resolver-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-resolver-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -202,11 +204,6 @@ <groupId>org.apache.xbean</groupId> <artifactId>xbean-finder-shaded</artifactId> </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/karaf/blob/e4222843/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java index 3bc5b08..018cb7f 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java @@ -48,7 +48,7 @@ import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; -import org.apache.maven.repository.internal.MavenWorkspaceReader; +import org.eclipse.aether.repository.WorkspaceReader; /** * Creates a customized Karaf distribution by installing features and setting up @@ -261,8 +261,8 @@ public class AssemblyMojo extends MojoSupport { @Parameter protected Map<String, String> system; - @Component(role = MavenWorkspaceReader.class, hint = "reactor") - protected MavenWorkspaceReader reactor; + @Component(role = WorkspaceReader.class, hint = "reactor") + protected WorkspaceReader reactor; @Override public void execute() throws MojoExecutionException, MojoFailureException { http://git-wip-us.apache.org/repos/asf/karaf/blob/e4222843/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java index 1b592d7..d4595c2 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java @@ -90,7 +90,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.apache.maven.repository.internal.MavenWorkspaceReader; +import org.eclipse.aether.repository.WorkspaceReader; import org.ops4j.pax.url.mvn.MavenResolver; import org.ops4j.pax.url.mvn.MavenResolvers; import org.osgi.framework.Bundle; @@ -151,8 +151,8 @@ public class VerifyMojo extends MojoSupport { @Parameter(defaultValue = "${project}", readonly = true) protected MavenProject project; - @Component(role = MavenWorkspaceReader.class, hint = "reactor") - protected MavenWorkspaceReader reactor; + @Component(role = WorkspaceReader.class, hint = "reactor") + protected WorkspaceReader reactor; @Parameter(property = "skip", defaultValue = "${features.verify.skip}") protected boolean skip; http://git-wip-us.apache.org/repos/asf/karaf/blob/e4222843/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ReactorMavenResolver.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ReactorMavenResolver.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ReactorMavenResolver.java index 47f6f04..c704da1 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ReactorMavenResolver.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ReactorMavenResolver.java @@ -20,9 +20,9 @@ import java.io.File; import java.io.IOException; import java.net.MalformedURLException; -import org.apache.maven.repository.internal.MavenWorkspaceReader; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.repository.WorkspaceReader; import org.ops4j.pax.url.mvn.MavenResolver; import org.ops4j.pax.url.mvn.ServiceConstants; import org.ops4j.pax.url.mvn.internal.Parser; @@ -32,10 +32,10 @@ import org.ops4j.pax.url.mvn.internal.Parser; */ public class ReactorMavenResolver implements MavenResolver { - private final MavenWorkspaceReader reactor; + private final WorkspaceReader reactor; private final MavenResolver fallback; - public ReactorMavenResolver(MavenWorkspaceReader reactor, MavenResolver fallback) { + public ReactorMavenResolver(WorkspaceReader reactor, MavenResolver fallback) { this.reactor = reactor; this.fallback = fallback; } http://git-wip-us.apache.org/repos/asf/karaf/blob/e4222843/tooling/karaf-services-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml index 31a71c7..fc8129d 100644 --- a/tooling/karaf-services-maven-plugin/pom.xml +++ b/tooling/karaf-services-maven-plugin/pom.xml @@ -48,24 +48,14 @@ <version>${maven-plugin-annotations.version}</version> </dependency> <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-api</artifactId> - <version>1.11</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${maven.resolver.version}</version> </dependency> <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-util</artifactId> - <version>1.11</version> - </dependency> - <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-api</artifactId> - <version>0.9.0.M2</version> - </dependency> - <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-util</artifactId> - <version>0.9.0.M2</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + <version>${maven.resolver.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -74,10 +64,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-resolver-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -113,11 +105,6 @@ </dependency> <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-filtering</artifactId> - <version>3.1.1</version> - </dependency> - <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>3.0</version> @@ -136,11 +123,6 @@ <groupId>org.apache.xbean</groupId> <artifactId>xbean-finder-shaded</artifactId> </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/karaf/blob/e4222843/tooling/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/pom.xml b/tooling/pom.xml index 41dbb70..cbe3b4b 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -35,6 +35,7 @@ <properties> <maven.version>3.5.0</maven.version> + <maven.resolver.version>1.0.3</maven.resolver.version> </properties> <modules>
