Compare commits
No commits in common. "c8-stream-201902" and "c8-beta-stream-201801" have entirely different histories.
c8-stream-
...
c8-beta-st
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/maven-remote-resources-plugin-1.6.0-source-release.zip
|
||||
SOURCES/maven-remote-resources-plugin-1.5-source-release.zip
|
||||
|
||||
@ -1 +1 @@
|
||||
39107bf7856a4d01b3e73d866ba63ab49ab547af SOURCES/maven-remote-resources-plugin-1.6.0-source-release.zip
|
||||
30f372c2597896b8bde9f49a09fef71bb653c8c7 SOURCES/maven-remote-resources-plugin-1.5-source-release.zip
|
||||
|
||||
@ -1,118 +0,0 @@
|
||||
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 | 6 +++---
|
||||
.../remote/RemoteResourcesMojoTest.java | 8 ++++++++
|
||||
.../remote/stub/MavenProjectBasicStub.java | 18 +++++++++---------
|
||||
3 files changed, 20 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index deea77c..eafa229 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -68,7 +68,7 @@ under the License.
|
||||
</distributionManagement>
|
||||
|
||||
<properties>
|
||||
- <mavenVersion>2.2.1</mavenVersion>
|
||||
+ <mavenVersion>3.6.2</mavenVersion>
|
||||
<mavenFilteringVersion>3.1.1</mavenFilteringVersion>
|
||||
<sitePluginVersion>3.3</sitePluginVersion>
|
||||
</properties>
|
||||
@@ -97,7 +97,7 @@ under the License.
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
- <artifactId>maven-project</artifactId>
|
||||
+ <artifactId>maven-compat</artifactId>
|
||||
<version>${mavenVersion}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -168,7 +168,7 @@ under the License.
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.plugin-testing</groupId>
|
||||
<artifactId>maven-plugin-testing-harness</artifactId>
|
||||
- <version>1.3</version>
|
||||
+ <version>3.3.0</version>
|
||||
<scope>test</scope>
|
||||
</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 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;
|
||||
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;
|
||||
+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;
|
||||
|
||||
|
||||
/**
|
||||
@@ -298,6 +301,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" ),
|
||||
@@ -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() ) );
|
||||
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 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
|
||||
@@ -144,15 +144,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<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() );
|
||||
+ 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.21.0
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Name: maven-remote-resources-plugin
|
||||
Version: 1.6.0
|
||||
Version: 1.5
|
||||
Release: 2%{?dist}
|
||||
Summary: Maven Remote Resources Plugin
|
||||
License: ASL 2.0
|
||||
@ -8,26 +8,20 @@ BuildArch: noarch
|
||||
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch0: 0001-Port-to-Maven-3.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
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:maven-artifact:2.2.1)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-model:2.2.1)
|
||||
BuildRequires: mvn(org.apache.maven:maven-monitor)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven:maven-project)
|
||||
BuildRequires: mvn(org.apache.maven:maven-settings:2.2.1)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
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-artifact)
|
||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-model)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven:maven-settings)
|
||||
BuildRequires: mvn(org.apache.velocity:velocity)
|
||||
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)
|
||||
@ -51,10 +45,10 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
# Tests use Maven 2 APIs
|
||||
%mvn_build -f
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
@ -66,15 +60,6 @@ API documentation for %{name}.
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.0-2
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* 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
|
||||
|
||||
* 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