From daa13df054d24719ff78f96abe434c4480d98c93 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Oct 2019 14:35:30 +0200 Subject: [PATCH] Port to Maven 3.6.2 --- 0001-Port-to-Maven-3.patch | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/0001-Port-to-Maven-3.patch b/0001-Port-to-Maven-3.patch index 53247ee..25906e8 100644 --- a/0001-Port-to-Maven-3.patch +++ b/0001-Port-to-Maven-3.patch @@ -1,16 +1,16 @@ -From 3f1374b851cf9e52c8e276248005f21464965a96 Mon Sep 17 00:00:00 2001 +From 311be5bb7f5c2253ec6233ae48073ecc15d3971a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2019 11:09:13 +0200 Subject: [PATCH] Port to Maven 3 --- pom.xml | 6 +++--- - .../remote/RemoteResourcesMojoTest.java | 4 ++++ + .../remote/RemoteResourcesMojoTest.java | 8 ++++++++ .../remote/stub/MavenProjectBasicStub.java | 18 +++++++++--------- - 3 files changed, 16 insertions(+), 12 deletions(-) + 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml -index deea77c..2203d3b 100644 +index deea77c..eafa229 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ under the License. @@ -18,7 +18,7 @@ index deea77c..2203d3b 100644 - 2.2.1 -+ 3.6.1 ++ 3.6.2 3.1.1 3.3 @@ -41,10 +41,18 @@ index deea77c..2203d3b 100644 diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java -index 8637767..31d50a3 100644 +index 8637767..f2db4b9 100644 --- a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java +++ b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java -@@ -38,6 +38,7 @@ import java.net.URL; +@@ -25,6 +25,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository; + import org.apache.maven.artifact.versioning.VersionRange; + import org.apache.maven.execution.MavenSession; + import org.apache.maven.execution.ReactorManager; ++import org.apache.maven.plugin.LegacySupport; + import org.apache.maven.plugin.resources.remote.stub.MavenProjectResourcesStub; + import org.apache.maven.plugin.testing.AbstractMojoTestCase; + import org.apache.maven.project.MavenProject; +@@ -38,10 +39,12 @@ import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -52,7 +60,12 @@ index 8637767..31d50a3 100644 import java.util.Properties; import java.util.jar.JarOutputStream; import java.util.zip.ZipEntry; -@@ -298,6 +299,8 @@ public class RemoteResourcesMojoTest + import org.codehaus.plexus.util.IOUtil; ++import org.eclipse.aether.DefaultRepositorySystemSession; + + + /** +@@ -298,6 +301,8 @@ public class RemoteResourcesMojoTest setupDefaultProject( project ); ArtifactRepository repo = (ArtifactRepository) getVariableValueFromObject( mojo, "localRepository" ); @@ -61,11 +74,13 @@ index 8637767..31d50a3 100644 String path = repo.pathOf( new DefaultArtifact( "test", "test", VersionRange.createFromVersion( "1.1" ), -@@ -502,6 +505,7 @@ public class RemoteResourcesMojoTest +@@ -502,6 +507,9 @@ public class RemoteResourcesMojoTest project.getBasedir().toString(), new Properties(), Calendar.getInstance().getTime() ); + session.setProjects( Collections.singletonList( project ) ); ++ setVariableValueToObject( session, "repositorySession", new DefaultRepositorySystemSession() ); ++ lookup( LegacySupport.class ).setSession( session ); setVariableValueToObject( mojo, "project", project ); setVariableValueToObject( mojo, "outputDirectory", new File( project.getBuild().getOutputDirectory() ) );