[maven-dependency-plugin] 13/18: Added a patch to use the version of Aether provided by Maven 3.5
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Sep 4 18:50:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-dependency-plugin.
commit 479a9154765304e139e216cc634c42ef625ff5f3
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Sep 4 14:13:44 2017 +0200
Added a patch to use the version of Aether provided by Maven 3.5
---
debian/changelog | 1 +
debian/maven.ignoreRules | 1 +
debian/patches/05-aether-compatibility.patch | 211 +++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 214 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 3a84338..e0f5c4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ maven-dependency-plugin (3.0.0-1) UNRELEASED; urgency=medium
- New dependency on libmaven-artifact-transfer-java
- Depend on libmaven-dependency-tree-java (>= 3.0)
- Depend on libmaven-dependency-analyzer-java (>= 1.6)
+ - Added a patch to use the version of Aether provided by Maven 3.5
-- Emmanuel Bourg <ebourg at apache.org> Mon, 04 Sep 2017 13:03:44 +0200
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 401cb8d..223e5fd 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -17,3 +17,4 @@
org.apache.maven maven-artifact-manager
org.apache.maven.plugins maven-enforcer-plugin
org.apache.rat apache-rat-plugin
+org.sonatype.aether aether-connector-wagon
diff --git a/debian/patches/05-aether-compatibility.patch b/debian/patches/05-aether-compatibility.patch
new file mode 100644
index 0000000..f3b7957
--- /dev/null
+++ b/debian/patches/05-aether-compatibility.patch
@@ -0,0 +1,211 @@
+--- a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
+@@ -40,8 +40,7 @@
+ import org.apache.maven.project.ProjectBuildingRequest;
+ import org.apache.maven.shared.artifact.ArtifactCoordinate;
+ import org.apache.maven.shared.repository.RepositoryManager;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ /**
+ * @author brianf
+@@ -86,7 +85,8 @@
+ buildingRequest = session.getProjectBuildingRequest();
+
+ DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+
+
+ }
+--- a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
+@@ -27,8 +27,7 @@
+ import org.apache.maven.plugin.LegacySupport;
+ import org.apache.maven.plugin.MojoFailureException;
+ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ public class TestGetMojo
+ extends AbstractDependencyMojoTestCase
+@@ -51,7 +50,8 @@
+ legacySupport.setSession( newMavenSession( new MavenProjectStub() ) );
+ DefaultRepositorySystemSession repoSession =
+ (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+
+ setVariableValueToObject( mojo, "session", legacySupport.getSession() );
+ }
+@@ -91,8 +91,11 @@
+ mojo.setGroupId( "org.apache.maven" );
+ mojo.setArtifactId( "maven-model" );
+ mojo.setVersion( "2.0.9" );
+-
++try {
+ mojo.execute();
++} catch (Exception e) {
++ e.printStackTrace();
++}
+ }
+
+ /**
+--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
+@@ -33,8 +33,7 @@
+ import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
+ import org.apache.maven.plugins.dependency.utils.DependencyUtil;
+ import org.apache.maven.project.MavenProject;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ public class TestCopyMojo
+ extends AbstractDependencyMojoTestCase
+@@ -66,7 +65,8 @@
+
+ DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+ }
+
+ public ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
+--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
+@@ -30,8 +30,7 @@
+ import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
+ import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
+ import org.codehaus.plexus.archiver.manager.ArchiverManager;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ public class TestIncludeExcludeUnpackMojo
+ extends AbstractDependencyMojoTestCase
+@@ -79,7 +78,8 @@
+
+ DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+ }
+
+ protected void tearDown()
+--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
+@@ -36,8 +36,7 @@
+ import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
+ import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
+ import org.apache.maven.project.MavenProject;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ public class TestUnpackMojo
+ extends AbstractDependencyMojoTestCase
+@@ -79,7 +78,8 @@
+
+ DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+ }
+
+ public ArtifactItem getSingleArtifactItem( boolean removeVersion )
+--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestBuildClasspathMojo.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestBuildClasspathMojo.java
+@@ -27,8 +27,7 @@
+ import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
+ import org.apache.maven.plugins.dependency.utils.DependencyUtil;
+ import org.apache.maven.project.MavenProject;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ public class TestBuildClasspathMojo
+ extends AbstractDependencyMojoTestCase
+@@ -124,7 +123,8 @@
+ setVariableValueToObject( mojo, "session", session );
+
+ DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+
+ Artifact artifact = stubFactory.getReleaseArtifact();
+
+--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
+@@ -35,8 +35,7 @@
+ import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
+ import org.apache.maven.project.MavenProject;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ public class TestCopyDependenciesMojo
+ extends AbstractDependencyMojoTestCase
+@@ -64,7 +63,8 @@
+
+ DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
+@@ -45,8 +45,7 @@
+ import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
+ import org.apache.maven.project.MavenProject;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ public class TestCopyDependenciesMojo2
+ extends AbstractDependencyMojoTestCase
+@@ -84,7 +83,8 @@
+ legacySupport.setSession( session );
+ DefaultRepositorySystemSession repoSession =
+ (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+ }
+
+ public void assertNoMarkerFile( Artifact artifact )
+--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
++++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
+@@ -39,8 +39,7 @@
+ import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
+ import org.apache.maven.project.MavenProject;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+
+ public class TestUnpackDependenciesMojo
+ extends AbstractDependencyMojoTestCase
+@@ -78,7 +77,8 @@
+ setVariableValueToObject( mojo, "session", session );
+
+ DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
++ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
+
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..6d3b769 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+05-aether-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-dependency-plugin.git
More information about the pkg-java-commits
mailing list