diff --git a/.gitignore b/.gitignore index 06373ac..7a68a46 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /exec-maven-plugin-1.4.0-source-release.zip /exec-maven-plugin-1.5.0-source-release.zip /exec-maven-plugin-1.6.0-source-release.zip +/exec-maven-plugin-3.0.0-source-release.zip diff --git a/exec-maven-plugin-1.6.0-Port-to-Maven-3.patch b/exec-maven-plugin-1.6.0-Port-to-Maven-3.patch deleted file mode 100644 index 4732574..0000000 --- a/exec-maven-plugin-1.6.0-Port-to-Maven-3.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 53f761ccbe3411dbbe430d3af93ad4502d09fe10 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 20 Sep 2018 15:28:48 +0200 -Subject: [PATCH] Port to Maven 3 - ---- - src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java | 4 ++-- - src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java | 2 +- - src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java -index 4746aa2..f9a93ad 100644 ---- a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java -+++ b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java -@@ -704,9 +704,9 @@ public class ExecJavaMojo - // resolve all dependencies transitively to obtain a comprehensive list of assemblies - ArtifactResolutionResult result = - artifactResolver.resolveTransitively( dependencyArtifacts, executablePomArtifact, -- Collections.emptyMap(), this.localRepository, -+ (java.util.Map) Collections.emptyMap(), this.localRepository, - this.remoteRepositories, metadataSource, null, -- Collections.emptyList() ); -+ (java.util.List) Collections.emptyList() ); - executableDependencies = result.getArtifacts(); - } - catch ( Exception ex ) -diff --git a/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java b/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java -index 0e5afbb..4894bb3 100644 ---- a/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java -+++ b/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java -@@ -277,7 +277,7 @@ public class ExecJavaMojoTest - private void setUpProject( File pomFile, AbstractMojo mojo ) - throws Exception - { -- MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ); -+ MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.class ); - - ArtifactRepositoryLayout localRepositoryLayout = - (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); -diff --git a/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java b/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java -index 2821954..29c274c 100644 ---- a/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java -+++ b/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java -@@ -233,7 +233,7 @@ public class ExecMojoTest - private void setUpProject( File pomFile, ExecMojo mojo ) - throws Exception - { -- MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ); -+ MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.class ); - - ArtifactRepositoryLayout localRepositoryLayout = - (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); --- -2.17.1 - diff --git a/exec-maven-plugin.spec b/exec-maven-plugin.spec index 38dc71b..8350879 100644 --- a/exec-maven-plugin.spec +++ b/exec-maven-plugin.spec @@ -1,18 +1,16 @@ Name: exec-maven-plugin -Version: 1.6.0 -Release: 11%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Exec Maven Plugin License: ASL 2.0 -URL: http://www.mojohaus.org/exec-maven-plugin/ -Source0: http://repo1.maven.org/maven2/org/codehaus/mojo/exec-maven-plugin/%{version}/exec-maven-plugin-%{version}-source-release.zip - -Patch1: exec-maven-plugin-1.6.0-Port-to-Maven-3.patch +URL: https://www.mojohaus.org/exec-maven-plugin/ +Source0: https://repo1.maven.org/maven2/org/codehaus/mojo/exec-maven-plugin/%{version}/exec-maven-plugin-%{version}-source-release.zip BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(junit:junit) +BuildRequires: maven-artifact-transfer BuildRequires: mvn(org.apache.commons:commons-exec) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-compat) @@ -21,11 +19,9 @@ BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) BuildRequires: mvn(org.codehaus.mojo:mojo-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) Obsoletes: maven-plugin-exec < %{version}-%{release} @@ -46,19 +42,17 @@ API documentation for %{name}. sed -i 's/\r$//' LICENSE.txt find . -name *.jar -delete -%pom_remove_dep :maven-project -%pom_remove_dep :maven-toolchain -%pom_remove_dep :maven-artifact-manager - -%pom_add_dep org.apache.maven:maven-compat -%pom_add_dep junit:junit::test - %pom_remove_plugin :animal-sniffer-maven-plugin -%patch1 -p1 +#Drop test part. sonatype-aerther not available +%pom_remove_dep :mockito-core +%pom_remove_dep :maven-plugin-testing-harness +%pom_remove_dep :plexus-interpolation + +rm -rf src/test/ %build -%mvn_build -- -DmavenVersion=3 +%mvn_build %install %mvn_install @@ -71,6 +65,9 @@ find . -name *.jar -delete %doc LICENSE.txt %changelog +* Wed May 26 2021 Nicolas De Amicis - 3.0.0-1 +- Update to upstream version 3.0.0 + * Tue Jan 26 2021 Fedora Release Engineering - 1.6.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 0e300df..407219e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (exec-maven-plugin-1.6.0-source-release.zip) = 0effd46b26816a1f6c20db6bea6f072cfdbbf6d5e6c3cda59f78cb7264804efb648a50a8170dd56c1e7f99fda6fae732a8009419efabe7591c9f738dcbab6ca6 +SHA512 (exec-maven-plugin-3.0.0-source-release.zip) = 324bdbf9919490ae3641cd44a41973d0bf1e2e04e3112c024b72218e1575535eedd69bbf6697f6d43ebad0740b985dd4f1579ce7ecbab5261ed1796b67ad8a04