Compare commits
No commits in common. "c9-beta-stream-202201" and "c8-stream-201902" have entirely different histories.
c9-beta-st
...
c8-stream-
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
SOURCES/maven-remote-resources-plugin-1.6.0-source-release.zip
|
||||
@ -0,0 +1 @@
|
||||
39107bf7856a4d01b3e73d866ba63ab49ab547af SOURCES/maven-remote-resources-plugin-1.6.0-source-release.zip
|
||||
@ -1,17 +1,16 @@
|
||||
From ad9b30a420fbbd509b232ac5fbba317605970c2c Mon Sep 17 00:00:00 2001
|
||||
From 311be5bb7f5c2253ec6233ae48073ecc15d3971a Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Fri, 31 May 2019 11:09:13 +0200
|
||||
Subject: [PATCH] Port to Maven 3
|
||||
|
||||
---
|
||||
pom.xml | 11 +++--------
|
||||
pom.xml | 6 +++---
|
||||
.../remote/RemoteResourcesMojoTest.java | 8 ++++++++
|
||||
.../resources/remote/stub/ArtifactStub.java | 6 ------
|
||||
.../remote/stub/MavenProjectBasicStub.java | 18 +++++++++---------
|
||||
4 files changed, 20 insertions(+), 23 deletions(-)
|
||||
3 files changed, 20 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index dc43173..6c3dbfe 100644
|
||||
index deea77c..eafa229 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -68,7 +68,7 @@ under the License.
|
||||
@ -20,10 +19,10 @@ index dc43173..6c3dbfe 100644
|
||||
<properties>
|
||||
- <mavenVersion>2.2.1</mavenVersion>
|
||||
+ <mavenVersion>3.6.2</mavenVersion>
|
||||
<javaVersion>7</javaVersion>
|
||||
<mavenFilteringVersion>3.1.1</mavenFilteringVersion>
|
||||
<sitePluginVersion>3.3</sitePluginVersion>
|
||||
@@ -98,7 +98,7 @@ under the License.
|
||||
</properties>
|
||||
@@ -97,7 +97,7 @@ under the License.
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
@ -32,19 +31,7 @@ index dc43173..6c3dbfe 100644
|
||||
<version>${mavenVersion}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -119,11 +119,6 @@ under the License.
|
||||
<artifactId>maven-archiver</artifactId>
|
||||
<version>3.5.0</version>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.apache.maven.shared</groupId>
|
||||
- <artifactId>maven-artifact-resolver</artifactId>
|
||||
- <version>1.0</version>
|
||||
- </dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.shared</groupId>
|
||||
<artifactId>maven-common-artifact-filters</artifactId>
|
||||
@@ -174,7 +169,7 @@ under the License.
|
||||
@@ -168,7 +168,7 @@ under the License.
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.plugin-testing</groupId>
|
||||
<artifactId>maven-plugin-testing-harness</artifactId>
|
||||
@ -54,7 +41,7 @@ index dc43173..6c3dbfe 100644
|
||||
</dependency>
|
||||
<dependency>
|
||||
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
|
||||
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
|
||||
@@ -25,6 +25,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
@ -62,10 +49,10 @@ index 24c928f..3294d4b 100644
|
||||
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 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;
|
||||
@ -78,7 +65,7 @@ index 24c928f..3294d4b 100644
|
||||
|
||||
|
||||
/**
|
||||
@@ -301,6 +304,8 @@ public class RemoteResourcesMojoTest
|
||||
@@ -298,6 +301,8 @@ public class RemoteResourcesMojoTest
|
||||
setupDefaultProject( project );
|
||||
|
||||
ArtifactRepository repo = (ArtifactRepository) getVariableValueFromObject( mojo, "localRepository" );
|
||||
@ -87,7 +74,7 @@ index 24c928f..3294d4b 100644
|
||||
String path = repo.pathOf( new DefaultArtifact( "test",
|
||||
"test",
|
||||
VersionRange.createFromVersion( "1.1" ),
|
||||
@@ -505,6 +510,9 @@ public class RemoteResourcesMojoTest
|
||||
@@ -502,6 +507,9 @@ public class RemoteResourcesMojoTest
|
||||
project.getBasedir().toString(),
|
||||
new Properties(),
|
||||
Calendar.getInstance().getTime() );
|
||||
@ -97,38 +84,23 @@ index 24c928f..3294d4b 100644
|
||||
|
||||
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
|
||||
index a8a1fad..d0d1fb9 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
|
||||
@@ -144,15 +144,15 @@ public class MavenProjectBasicStub
|
||||
{
|
||||
// the pom should be located in the isolated dummy root
|
||||
// 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<Object>() );
|
||||
- super.setArtifacts( new HashSet<Object>() );
|
||||
- super.setPluginArtifacts( new HashSet<Object>() );
|
||||
- super.setReportArtifacts( new HashSet<Object>() );
|
||||
- super.setExtensionArtifacts( new HashSet<Object>() );
|
||||
- super.setRemoteArtifactRepositories( new LinkedList<Object>() );
|
||||
- super.setPluginArtifactRepositories( new LinkedList<Object>() );
|
||||
- super.setCollectedProjects( new LinkedList<Object>() );
|
||||
- super.setActiveProfiles( new LinkedList<Object>() );
|
||||
+ super.setDependencyArtifacts( new HashSet() );
|
||||
+ super.setArtifacts( new HashSet() );
|
||||
+ super.setPluginArtifacts( new HashSet() );
|
||||
@ -142,5 +114,5 @@ index 0107561..6e9a8b0 100644
|
||||
super.setExecutionProject( this );
|
||||
super.setArtifact( artifact );
|
||||
--
|
||||
2.25.4
|
||||
2.21.0
|
||||
|
||||
|
||||
Binary file not shown.
@ -1,21 +1,15 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
Name: maven-remote-resources-plugin
|
||||
Version: 1.7.0
|
||||
Release: 10%{?dist}
|
||||
Version: 1.6.0
|
||||
Release: 2%{?dist}
|
||||
Summary: Maven Remote Resources Plugin
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch0: 0001-Port-to-Maven-3.patch
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
@ -23,11 +17,11 @@ BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-artifact-resolver)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-filtering)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-verifier)
|
||||
BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
|
||||
BuildRequires: mvn(org.apache.maven:maven-archiver)
|
||||
BuildRequires: mvn(org.apache.maven:maven-artifact)
|
||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
@ -39,7 +33,7 @@ BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-resources)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
Process resources packaged in JARs that have been deployed to
|
||||
@ -72,61 +66,15 @@ API documentation for %{name}.
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.7.0-9
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jul 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-6
|
||||
- Enable tests
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-5
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.7.0-2
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-1
|
||||
- Update to version 1.7.0.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 1.7.0-1
|
||||
- Update to upstream version 1.7.0
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.0-2
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 31 2019 Marian Koncek <mkoncek@redhat.com> - 1.6.0-1
|
||||
- Update to upstream version 1.6.0
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-3
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user