Port to Maven 3
This commit is contained in:
Mikolaj Izdebski
parent
eb60c3212f
commit
7c02b33a66
103
0001-Port-to-Maven-3.patch
Normal file
103
0001-Port-to-Maven-3.patch
Normal file
@ -0,0 +1,103 @@
|
||||
From 3f1374b851cf9e52c8e276248005f21464965a96 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 | 4 ++++
|
||||
.../remote/stub/MavenProjectBasicStub.java | 18 +++++++++---------
|
||||
3 files changed, 16 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index deea77c..2203d3b 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -68,7 +68,7 @@ under the License.
|
||||
</distributionManagement>
|
||||
|
||||
<properties>
|
||||
- <mavenVersion>2.2.1</mavenVersion>
|
||||
+ <mavenVersion>3.6.1</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..31d50a3 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;
|
||||
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;
|
||||
@@ -298,6 +299,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 +505,7 @@ public class RemoteResourcesMojoTest
|
||||
project.getBasedir().toString(),
|
||||
new Properties(),
|
||||
Calendar.getInstance().getTime() );
|
||||
+ session.setProjects( Collections.singletonList( project ) );
|
||||
|
||||
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
|
||||
|
||||
@ -8,21 +8,26 @@ 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(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(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.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)
|
||||
@ -46,9 +51,9 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
# Tests use Maven 2 APIs
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user