Repository: marmotta Updated Branches: refs/heads/develop 4384d61b1 -> eb2776486
MARMOTTA-668: Updated and fixed the refpack-plugin Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2079e4ec Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2079e4ec Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2079e4ec Branch: refs/heads/develop Commit: 2079e4ecb4b2ef4c49900a3f53ed54444c93d8c9 Parents: 4384d61 Author: Jakob Frank <ja...@apache.org> Authored: Fri Feb 16 18:49:06 2018 +0100 Committer: Jakob Frank <ja...@apache.org> Committed: Fri Feb 16 18:49:06 2018 +0100 ---------------------------------------------------------------------- build/plugins/pom.xml | 15 ++++++------ build/plugins/refpack-maven-plugin/pom.xml | 25 ++++---------------- .../maven/plugins/refpack/RefPackMojo.java | 24 +++++++++---------- build/plugins/repocheck-maven-plugin/pom.xml | 6 +++-- 4 files changed, 27 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/2079e4ec/build/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml index c8affc6..b680532 100644 --- a/build/plugins/pom.xml +++ b/build/plugins/pom.xml @@ -30,6 +30,10 @@ <name>Apache Marmotta: Maven Plugins</name> <description>Marmotta-specific maven plugins</description> + <properties> + <maven.version>3.1.1</maven.version> + </properties> + <build> <plugins> <plugin> @@ -125,7 +129,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.0.4</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -136,17 +140,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.0.4</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.2.1</version> + <version>${maven.version}</version> </dependency> <dependency> <!-- maven is using commons-logging --> http://git-wip-us.apache.org/repos/asf/marmotta/blob/2079e4ec/build/plugins/refpack-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml index 507737d..27ce68c 100644 --- a/build/plugins/refpack-maven-plugin/pom.xml +++ b/build/plugins/refpack-maven-plugin/pom.xml @@ -32,6 +32,10 @@ <name>Maven Refpack Plugin</name> <description>This Maven Plugin allows generating IzPack Refpack descriptions out of a collection of dependencies</description> + <prerequisites> + <maven>${maven.version}</maven> + </prerequisites> + <dependencies> <dependency> <groupId>org.apache.maven</groupId> @@ -41,27 +45,6 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> - <dependency> - <!-- required in all cases --> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-api</artifactId> - <version>1.13.1</version> - </dependency> - <dependency> - <!-- might be superfluous depending on your use case --> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-util</artifactId> - <version>1.13.1</version> - </dependency> - <dependency> - <groupId>com.jcabi</groupId> - <artifactId>jcabi-aether</artifactId> - <version>0.7.8</version> - </dependency> <!-- dependencies to annotations --> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/2079e4ec/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java ---------------------------------------------------------------------- diff --git a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java index 5fcf7f7..847e9c6 100644 --- a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java +++ b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java @@ -24,22 +24,22 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.*; import org.apache.maven.project.*; +import org.eclipse.aether.artifact.DefaultArtifact; import org.jdom2.Element; import org.jdom2.Text; import org.jdom2.output.Format; import org.jdom2.output.XMLOutputter; -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.DependencyCollectionException; -import org.sonatype.aether.graph.Dependency; -import org.sonatype.aether.graph.DependencyNode; -import org.sonatype.aether.repository.RemoteRepository; -import org.sonatype.aether.resolution.DependencyRequest; -import org.sonatype.aether.resolution.DependencyResolutionException; -import org.sonatype.aether.resolution.DependencyResult; -import org.sonatype.aether.util.artifact.DefaultArtifact; +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.DependencyCollectionException; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.DependencyRequest; +import org.eclipse.aether.resolution.DependencyResolutionException; +import org.eclipse.aether.resolution.DependencyResult; import java.io.File; import java.io.FileOutputStream; http://git-wip-us.apache.org/repos/asf/marmotta/blob/2079e4ec/build/plugins/repocheck-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml index 9658b67..b755ab7 100644 --- a/build/plugins/repocheck-maven-plugin/pom.xml +++ b/build/plugins/repocheck-maven-plugin/pom.xml @@ -31,7 +31,9 @@ <name>Repository Plugin</name> <description>Check which repository contains which dependencies </description> - + <prerequisites> + <maven>${maven.version}</maven> + </prerequisites> <dependencies> @@ -42,7 +44,7 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-core</artifactId> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId>
