From 9b7caa4b6f89d0c2e63e5fd71a2272f6b45e5636 Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 10:59:52 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 7 +- 0001-Port-to-Maven-3.patch | 146 ------------------------------------- gating.yaml | 8 -- 3 files changed, 6 insertions(+), 155 deletions(-) delete mode 100644 0001-Port-to-Maven-3.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 41ef725..97245d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ -SOURCES/maven-remote-resources-plugin-1.5-source-release.zip +maven-remote-resources-plugin-1.1.tar.bz2 +maven-remote-resources-plugin-1.2-source-release.zip +maven-remote-resources-plugin-1.2.1-source-release.zip +/maven-remote-resources-plugin-1.3-source-release.zip +/maven-remote-resources-plugin-1.4-source-release.zip +/maven-remote-resources-plugin-1.5-source-release.zip diff --git a/0001-Port-to-Maven-3.patch b/0001-Port-to-Maven-3.patch deleted file mode 100644 index aa55c42..0000000 --- a/0001-Port-to-Maven-3.patch +++ /dev/null @@ -1,146 +0,0 @@ -From ad9b30a420fbbd509b232ac5fbba317605970c2c 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 | 11 +++-------- - .../remote/RemoteResourcesMojoTest.java | 8 ++++++++ - .../resources/remote/stub/ArtifactStub.java | 6 ------ - .../remote/stub/MavenProjectBasicStub.java | 18 +++++++++--------- - 4 files changed, 20 insertions(+), 23 deletions(-) - -diff --git a/pom.xml b/pom.xml -index dc43173..6c3dbfe 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -68,7 +68,7 @@ under the License. - - - -- 2.2.1 -+ 3.6.2 - 7 - 3.1.1 - 3.3 -@@ -98,7 +98,7 @@ under the License. - - - org.apache.maven -- maven-project -+ maven-compat - ${mavenVersion} - - -@@ -119,11 +119,6 @@ under the License. - maven-archiver - 3.5.0 - -- -- org.apache.maven.shared -- maven-artifact-resolver -- 1.0 -- - - org.apache.maven.shared - maven-common-artifact-filters -@@ -174,7 +169,7 @@ under the License. - - org.apache.maven.plugin-testing - maven-plugin-testing-harness -- 1.3 -+ 3.3.0 - test - - -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 24c928f..3294d4b 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 -@@ -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.MavenProjectBuildStub; - import org.apache.maven.plugin.resources.remote.stub.MavenProjectResourcesStub; - import org.apache.maven.plugin.testing.AbstractMojoTestCase; -@@ -39,10 +40,12 @@ import java.net.URL; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.Calendar; -+import java.util.Collections; - import java.util.Properties; - import java.util.jar.JarOutputStream; - import java.util.zip.ZipEntry; - import org.codehaus.plexus.util.IOUtil; -+import org.eclipse.aether.DefaultRepositorySystemSession; - - - /** -@@ -301,6 +304,8 @@ public class RemoteResourcesMojoTest - setupDefaultProject( project ); - - ArtifactRepository repo = (ArtifactRepository) getVariableValueFromObject( mojo, "localRepository" ); -+ MavenSession session = (MavenSession) getVariableValueFromObject( mojo, "mavenSession" ); -+ session.getRequest().setLocalRepository( repo ); - String path = repo.pathOf( new DefaultArtifact( "test", - "test", - VersionRange.createFromVersion( "1.1" ), -@@ -505,6 +510,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() ) ); -diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java b/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java -index 5f59c9a..fc52d6f 100644 ---- a/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java -+++ b/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java -@@ -376,10 +376,4 @@ public class ArtifactStub - return 0; - } - -- @Override -- public ArtifactMetadata getMetadata( Class metadataClass ) -- { -- return null; -- } -- - } -diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java -index 0107561..6e9a8b0 100644 ---- a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java -+++ b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java -@@ -154,15 +154,15 @@ public class MavenProjectBasicStub - { - // the pom should be located in the isolated dummy root - super.setFile( new File( getBasedir(), "pom.xml" ) ); -- super.setDependencyArtifacts( new HashSet<>() ); -- super.setArtifacts( new HashSet<>() ); -- super.setPluginArtifacts( new HashSet<>() ); -- super.setReportArtifacts( new HashSet<>() ); -- super.setExtensionArtifacts( new HashSet<>() ); -- super.setRemoteArtifactRepositories( new LinkedList<>() ); -- super.setPluginArtifactRepositories( new LinkedList<>() ); -- super.setCollectedProjects( new LinkedList<>() ); -- super.setActiveProfiles( new LinkedList<>() ); -+ super.setDependencyArtifacts( new HashSet() ); -+ super.setArtifacts( new HashSet() ); -+ super.setPluginArtifacts( new HashSet() ); -+ super.setReportArtifacts( new HashSet() ); -+ super.setExtensionArtifacts( new HashSet() ); -+ super.setRemoteArtifactRepositories( new LinkedList() ); -+ super.setPluginArtifactRepositories( new LinkedList() ); -+ super.setCollectedProjects( new LinkedList() ); -+ super.setActiveProfiles( new LinkedList() ); - super.setOriginalModel( null ); - super.setExecutionProject( this ); - super.setArtifact( artifact ); --- -2.25.4 - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index d6b7694..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_contexts: - - osci_compose_gate -rules: - # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test - - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}