diff --git a/pom.xml b/pom.xml index 09f2533..6084b53 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,6 @@ 0.2.0 3.2.3 1.2.17 - 2.0.9 2.0.7 5.0.0 4.3.1 @@ -932,16 +931,6 @@ ${felix.plugin.version} - org.apache.maven - maven-plugin-api - ${maven.version} - - - org.apache.maven - maven-project - ${maven.version} - - org.apache.xerces xercesImpl ${xerces.version} @@ -2088,10 +2077,10 @@ - 3.0.2 + 3.1.0 - 1.6.0 + 1.7.0 diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 079a13e..ef13aa8 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -40,51 +40,27 @@ org.apache.maven - maven-plugin-api - 3.0.3 - - - org.sonatype.aether - aether-api - 1.11 - - - org.sonatype.aether - aether-util - 1.11 - - - org.apache.maven - maven-artifact - 3.0.3 - - - org.apache.maven maven-core - 3.0.3 + 3.1.0 org.apache.maven maven-compat - 3.0.3 + 3.1.0 + + org.apache.maven.shared + maven-filtering + 1.1 + org.slf4j slf4j-jdk14 - - org.apache.maven.shared - maven-filtering - 1.0-beta-4 - - - org.codehaus.plexus - plexus-utils - 1.5.10 - + org.apache.felix maven-bundle-plugin @@ -211,7 +187,7 @@ maven-plugin-plugin - 2.9 + 3.2 diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/DependencyHelper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/DependencyHelper.java index 32f9560..923b47d 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/DependencyHelper.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/DependencyHelper.java @@ -18,65 +18,66 @@ */ package org.apache.karaf.tooling.features; +import org.apache.maven.RepositoryUtils; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.project.MavenProject; +import org.eclipse.aether.DefaultRepositoryCache; +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.collection.CollectRequest; +import org.eclipse.aether.collection.CollectResult; +import org.eclipse.aether.collection.DependencyCollectionContext; +import org.eclipse.aether.collection.DependencyCollectionException; +import org.eclipse.aether.collection.DependencyGraphTransformer; +import org.eclipse.aether.collection.DependencySelector; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; +import org.eclipse.aether.util.graph.selector.AndDependencySelector; +import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector; +import org.eclipse.aether.util.graph.selector.OptionalDependencySelector; +import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer; +import org.eclipse.aether.util.graph.transformer.ConflictMarker; +import org.eclipse.aether.util.graph.transformer.JavaDependencyContextRefiner; + import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.maven.RepositoryUtils; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; -import org.sonatype.aether.RepositorySystem; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.collection.CollectRequest; -import org.sonatype.aether.collection.CollectResult; -import org.sonatype.aether.collection.DependencyCollectionContext; -import org.sonatype.aether.collection.DependencyCollectionException; -import org.sonatype.aether.collection.DependencyGraphTransformer; -import org.sonatype.aether.collection.DependencySelector; -import org.sonatype.aether.graph.Dependency; -import org.sonatype.aether.graph.DependencyNode; -import org.sonatype.aether.repository.RemoteRepository; -import org.sonatype.aether.util.DefaultRepositorySystemSession; -import org.sonatype.aether.util.graph.selector.AndDependencySelector; -import org.sonatype.aether.util.graph.selector.ExclusionDependencySelector; -import org.sonatype.aether.util.graph.selector.OptionalDependencySelector; -import org.sonatype.aether.util.graph.transformer.ChainedDependencyGraphTransformer; -import org.sonatype.aether.util.graph.transformer.ConflictMarker; -import org.sonatype.aether.util.graph.transformer.JavaDependencyContextRefiner; -import org.sonatype.aether.util.graph.transformer.JavaEffectiveScopeCalculator; - import static org.apache.karaf.deployer.kar.KarArtifactInstaller.FEATURE_CLASSIFIER; public class DependencyHelper { /** - * The entry point to Aether, i.e. the component doing all the work. - * - * @component - * @required - * @readonly - */ - private final RepositorySystem repoSystem; - - /** - * The current repository/network configuration of Maven. - * - * @parameter default-value="${repositorySystemSession}" - * @required - * @readonly - */ - private final RepositorySystemSession repoSession; - - /** - * The project's remote repositories to use for the resolution of project dependencies. - * - * @parameter default-value="${project.remoteProjectRepositories}" - * @readonly - */ - private final List projectRepos; + * The entry point to Aether, i.e. the component doing all the work. + * + * @component + * @required + * @readonly + */ + private final RepositorySystem repoSystem; + + /** + * The current repository/network configuration of Maven. + * + * @parameter default-value="${repositorySystemSession}" + * @required + * @readonly + */ + private final RepositorySystemSession repoSession; + + /** + * The project's remote repositories to use for the resolution of project dependencies. + * + * @parameter default-value="${project.remoteProjectRepositories}" + * @readonly + */ + private final List projectRepos; //dependencies we are interested in protected Map localDependencies; @@ -117,9 +118,10 @@ public class DependencyHelper { new ScopeDependencySelector1(), new ExclusionDependencySelector())); DependencyGraphTransformer transformer = new ChainedDependencyGraphTransformer(new ConflictMarker(), - new JavaEffectiveScopeCalculator(), + //new JavaEffectiveScopeCalculator(), new JavaDependencyContextRefiner()); session.setDependencyGraphTransformer(transformer); + session.setCache(new DefaultRepositoryCache()); CollectResult result = repoSystem.collectDependencies(session, collectRequest); return result.getRoot(); } catch (DependencyCollectionException e) { @@ -248,7 +250,7 @@ public class DependencyHelper { } private Accept accept(DependencyNode dependency, Accept previous) { - String scope = dependency.getPremanagedScope(); + String scope = DependencyManagerUtils.getPremanagedScope(dependency); if (scope == null || "runtime".equalsIgnoreCase(scope) || "compile".equalsIgnoreCase(scope)) { return previous; } diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java index e18fb6b..36bab41 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java @@ -17,20 +17,6 @@ */ package org.apache.karaf.tooling.features; -import java.io.*; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.jar.JarInputStream; -import java.util.jar.Manifest; - -import javax.xml.bind.JAXBException; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.stream.XMLStreamException; - import org.apache.karaf.features.internal.model.Bundle; import org.apache.karaf.features.internal.model.Dependency; import org.apache.karaf.features.internal.model.Feature; @@ -53,14 +39,37 @@ import org.apache.maven.shared.filtering.MavenResourcesFiltering; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; -import org.sonatype.aether.RepositorySystem; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.repository.RemoteRepository; -import org.sonatype.aether.resolution.ArtifactRequest; -import org.sonatype.aether.resolution.ArtifactResult; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.ArtifactRequest; +import org.eclipse.aether.resolution.ArtifactResult; import org.xml.sax.SAXException; +import javax.xml.bind.JAXBException; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.stream.XMLStreamException; +import java.io.BufferedInputStream; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.jar.JarInputStream; +import java.util.jar.Manifest; + import static org.apache.karaf.deployer.kar.KarArtifactInstaller.FEATURE_CLASSIFIER; /** @@ -421,7 +430,7 @@ public class GenerateDescriptorMojo extends AbstractLogEnabled implements Mojo { ArtifactResult result; try { result = repoSystem.resolveArtifact(repoSession, request); - } catch (org.sonatype.aether.resolution.ArtifactResolutionException e) { + } catch (org.eclipse.aether.resolution.ArtifactResolutionException e) { getLog().warn("could not resolve " + artifact, e); return null; } diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java index aea680e..db04b68 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java @@ -18,8 +18,31 @@ */ package org.apache.karaf.tooling.features; -import static java.lang.String.format; +import org.apache.felix.utils.properties.Properties; +import org.apache.karaf.features.BundleInfo; +import org.apache.karaf.features.Dependency; +import org.apache.karaf.features.FeaturesService; +import org.apache.karaf.features.Repository; +import org.apache.karaf.features.internal.model.Bundle; +import org.apache.karaf.features.internal.model.Feature; +import org.apache.karaf.features.internal.model.Features; +import org.apache.karaf.features.internal.model.JaxbUtil; +import org.apache.karaf.kar.internal.Kar; +import org.apache.karaf.tooling.utils.MojoSupport; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +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 javax.xml.bind.JAXBException; +import javax.xml.stream.XMLStreamException; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -39,31 +62,8 @@ import java.util.ListIterator; import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBException; -import javax.xml.stream.XMLStreamException; +import static java.lang.String.format; -import org.apache.felix.utils.properties.Properties; -import org.apache.karaf.features.BundleInfo; -import org.apache.karaf.features.Dependency; -import org.apache.karaf.features.FeaturesService; -import org.apache.karaf.features.Repository; -import org.apache.karaf.features.internal.model.Bundle; -import org.apache.karaf.features.internal.model.Feature; -import org.apache.karaf.features.internal.model.Features; -import org.apache.karaf.features.internal.model.JaxbUtil; -import org.apache.karaf.kar.internal.Kar; -import org.apache.karaf.tooling.utils.MojoSupport; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.sonatype.aether.RepositorySystem; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.repository.RemoteRepository; -import org.sonatype.aether.resolution.ArtifactRequest; -import org.sonatype.aether.resolution.ArtifactResolutionException; -import org.sonatype.aether.resolution.ArtifactResult; -import org.sonatype.aether.util.artifact.DefaultArtifact; /** * Installs kar dependencies into a server-under-construction in target/assembly diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java index 46b3783..afd2bd5 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java @@ -18,14 +18,6 @@ */ package org.apache.karaf.tooling.features; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; -import java.util.Date; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; @@ -34,7 +26,15 @@ import org.apache.maven.artifact.repository.metadata.Snapshot; import org.apache.maven.artifact.repository.metadata.SnapshotVersion; import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.DefaultArtifact; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.util.Date; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Util method for Maven manipulation (URL convert, metadata generation, etc). @@ -158,7 +158,7 @@ public class MavenUtil { * @param artifact the Aether org.sonatype.aether.artifact.Artifact. * @return the corresponding PAX URL mvn format (mvn:////) */ - static String artifactToMvn(org.sonatype.aether.artifact.Artifact artifact) { + static String artifactToMvn(org.eclipse.aether.artifact.Artifact artifact) { String bundleName; if (artifact.getExtension().equals("jar") && isEmpty(artifact.getClassifier())) { bundleName = String.format("mvn:%s/%s/%s", artifact.getGroupId(), artifact.getArtifactId(), artifact.getBaseVersion()); @@ -175,12 +175,11 @@ public class MavenUtil { private static boolean isEmpty(String classifier) { return classifier == null || classifier.length() == 0; } - + static Artifact mvnToArtifact(String name) { name = mvnToAether(name); DefaultArtifact artifact = new DefaultArtifact(name); - Artifact mavenArtifact = RepositoryUtils.toArtifact(artifact); - return mavenArtifact; + return RepositoryUtils.toArtifact(artifact); } /** @@ -216,13 +215,12 @@ public class MavenUtil { Writer writer = new FileWriter(target); metadataWriter.write(writer, metadata); } - + static String getFileName(Artifact artifact) { - String name = artifact.getArtifactId() + "-" + artifact.getBaseVersion() - + (artifact.getClassifier() != null ? "-" + artifact.getClassifier() : "") + "." + artifact.getType(); - return name; + return artifact.getArtifactId() + "-" + artifact.getBaseVersion() + + (artifact.getClassifier() != null ? "-" + artifact.getClassifier() : "") + "." + artifact.getType(); } - + static String getDir(Artifact artifact) { return artifact.getGroupId().replace('.', '/') + "/" + artifact.getArtifactId() + "/" + artifact.getBaseVersion() + "/"; } diff --git a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java index 61b4347..ae5cfb6 100644 --- a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java +++ b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java @@ -20,8 +20,8 @@ package org.apache.karaf.tooling.features; +import org.eclipse.aether.artifact.DefaultArtifact; import org.junit.Test; -import org.sonatype.aether.util.artifact.DefaultArtifact; import static org.apache.karaf.tooling.features.MavenUtil.aetherToMvn; import static org.apache.karaf.tooling.features.MavenUtil.artifactToMvn;