Make compatible with Maven 3.2 (but now we require 3.2 :( )
org.sonatype.aether -> org.eclipse.aether Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/commit/01a7c47e Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/tree/01a7c47e Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/diff/01a7c47e Branch: refs/heads/master Commit: 01a7c47e9644fd01f2ac55ab3d58f9345ea88a78 Parents: 9d6d52a Author: Stian Soiland-Reyes <soiland-re...@cs.manchester.ac.uk> Authored: Tue Oct 28 12:50:02 2014 +0000 Committer: Stian Soiland-Reyes <soiland-re...@cs.manchester.ac.uk> Committed: Tue Oct 28 12:50:02 2014 +0000 ---------------------------------------------------------------------- pom.xml | 11 +++++++---- .../sf/taverna/t2/maven/plugins/MavenOsgiUtils.java | 6 +++--- .../t2/maven/plugins/TavernaPluginGenerateMojo.java | 2 +- .../maven/plugins/TavernaPluginPrepareBundlesMojo.java | 2 +- .../t2/maven/plugins/TavernaProfileGenerateMojo.java | 2 +- .../maven/plugins/TavernaPluginGenerateMojoTest.java | 13 ------------- 6 files changed, 13 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/01a7c47e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index aab045b..74d3ed5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,9 @@ <groupId>net.sf.taverna</groupId> <version>0.2.2011-02-17</version> </parent> + <prerequisites> + <maven>3.2.0</maven> + </prerequisites> <groupId>net.sf.taverna.t2.maven.plugins</groupId> <artifactId>taverna-maven-plugin</artifactId> <packaging>maven-plugin</packaging> @@ -13,7 +16,7 @@ <name>Maven Taverna Plugin</name> <description>A Maven plugin for packaging and deploying Taverna plugins</description> <properties> - <maven.version>3.0.5</maven.version> + <maven.version>3.2.3</maven.version> <mavenArchiverVersion>2.5</mavenArchiverVersion> </properties> <build> @@ -21,7 +24,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.2</version> + <version>3.3</version> <configuration> <!-- see http://jira.codehaus.org/browse/MNG-5346 --> <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> @@ -56,7 +59,7 @@ <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-annotations</artifactId> - <version>3.2</version> + <version>3.3</version> <scope>provided</scope> </dependency> <dependency> @@ -96,7 +99,7 @@ <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>1.2</version> + <version>3.2.0</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/01a7c47e/src/main/java/net/sf/taverna/t2/maven/plugins/MavenOsgiUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/net/sf/taverna/t2/maven/plugins/MavenOsgiUtils.java b/src/main/java/net/sf/taverna/t2/maven/plugins/MavenOsgiUtils.java index fe7e225..6901119 100644 --- a/src/main/java/net/sf/taverna/t2/maven/plugins/MavenOsgiUtils.java +++ b/src/main/java/net/sf/taverna/t2/maven/plugins/MavenOsgiUtils.java @@ -45,9 +45,9 @@ import org.apache.maven.project.DependencyResolutionException; import org.apache.maven.project.DependencyResolutionResult; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectDependenciesResolver; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.graph.DependencyNode; -import org.sonatype.aether.util.filter.ScopeDependencyFilter; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.util.filter.ScopeDependencyFilter; import uk.org.taverna.commons.profile.xml.jaxb.BundleInfo; import aQute.bnd.header.Attrs; http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/01a7c47e/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojo.java ---------------------------------------------------------------------- diff --git a/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojo.java b/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojo.java index 355210b..0ec94f4 100644 --- a/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojo.java +++ b/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojo.java @@ -42,7 +42,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectDependenciesResolver; import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter; import org.apache.maven.shared.osgi.Maven2OsgiConverter; -import org.sonatype.aether.RepositorySystemSession; +import org.eclipse.aether.RepositorySystemSession; import uk.org.taverna.commons.plugin.xml.jaxb.PluginInfo; import uk.org.taverna.commons.profile.xml.jaxb.BundleInfo; http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/01a7c47e/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginPrepareBundlesMojo.java ---------------------------------------------------------------------- diff --git a/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginPrepareBundlesMojo.java b/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginPrepareBundlesMojo.java index 7521017..497151f 100644 --- a/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginPrepareBundlesMojo.java +++ b/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaPluginPrepareBundlesMojo.java @@ -36,7 +36,7 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectDependenciesResolver; -import org.sonatype.aether.RepositorySystemSession; +import org.eclipse.aether.RepositorySystemSession; /** * Prepares the plugin OSGi bundles. http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/01a7c47e/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaProfileGenerateMojo.java ---------------------------------------------------------------------- diff --git a/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaProfileGenerateMojo.java b/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaProfileGenerateMojo.java index b255561..1a0e9a0 100644 --- a/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaProfileGenerateMojo.java +++ b/src/main/java/net/sf/taverna/t2/maven/plugins/TavernaProfileGenerateMojo.java @@ -44,7 +44,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectDependenciesResolver; import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter; import org.apache.maven.shared.osgi.Maven2OsgiConverter; -import org.sonatype.aether.RepositorySystemSession; +import org.eclipse.aether.RepositorySystemSession; import uk.org.taverna.commons.profile.xml.jaxb.ApplicationProfile; import uk.org.taverna.commons.profile.xml.jaxb.BundleInfo; http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/01a7c47e/src/test/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojoTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojoTest.java b/src/test/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojoTest.java index f5701bc..6f21fb1 100644 --- a/src/test/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojoTest.java +++ b/src/test/java/net/sf/taverna/t2/maven/plugins/TavernaPluginGenerateMojoTest.java @@ -20,22 +20,9 @@ ******************************************************************************/ package net.sf.taverna.t2.maven.plugins; -import java.io.File; -import java.util.Collections; - -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.DefaultArtifact; -import org.apache.maven.artifact.repository.DefaultArtifactRepository; -import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; -import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenExecutionResult; -import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.project.MavenProject; import org.junit.Ignore; import org.junit.Test; -import org.sonatype.aether.RepositorySystemSession; /** * Unit tests for TavernaPluginGenerateMojo.
