PR#2: Enabled tests. Package ported to Maven 3. Fixed introduced type errors. - rpms/exec-maven-plugin

rpms / exec-maven-plugin

#2 Enabled tests. Package ported to Maven 3. Fixed introduced type errors.

Closed 5 years ago by mizdebsk. Opened 5 years ago by mkoncek.

rpms/ mkoncek/exec-maven-plugin mkoncek/master into master

Enabled tests, package ported to Maven 3

Marian Koncek • 5 years ago

a774030

exec-maven-plugin-1.6.0-Port-to-Maven-3.patch

file added

+56

		`@@ -0,0 +1,56 @@`
		`+ From caa0d0aba9430e9937f5efb505ab3c1c9a6ecb70 Mon Sep 17 00:00:00 2001`
		`+ From: Marian Koncek <mkoncek@redhat.com>`
		`+ Date: Tue, 18 Sep 2018 18:03:37 +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`
		`+`

exec-maven-plugin.spec

file modified

+25 -9

		`@@ -1,27 +1,31 @@`
		`Name: exec-maven-plugin`
		`Version: 1.6.0`
		`- Release: 4%{?dist}`
		`+ Release: 5%{?dist}`
		`Summary: Exec Maven Plugin`

		`License: ASL 2.0`
		`- URL: http://mojo.codehaus.org/exec-maven-plugin`
		`+ 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`
		`+`
		`BuildArch: noarch`

		`BuildRequires: maven-local`
		`+ BuildRequires: mvn(junit:junit)`
		`BuildRequires: mvn(org.apache.commons:commons-exec)`
		`- BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1)`
		`- BuildRequires: mvn(org.apache.maven:maven-artifact-manager)`
		`+ 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:2.2.1)`
		`+ BuildRequires: mvn(org.apache.maven:maven-model)`
		`BuildRequires: mvn(org.apache.maven:maven-plugin-api)`
		`- BuildRequires: mvn(org.apache.maven:maven-project)`
		`- BuildRequires: mvn(org.apache.maven:maven-toolchain)`
		`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}`
		`@@ -42,11 +46,19 @@`
		`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`
		`+`
		`%build`
		`- # tests are disabled, see: rhbz#1095077`
		`- %mvn_build -f`
		`+ %mvn_build -- -DmavenVersion=3`

		`%install`
		`%mvn_install`
		`@@ -59,6 +71,10 @@`
		`%doc LICENSE.txt`

		`%changelog`
		`+ * Thu Sep 20 2018 Marian Koncek <mkoncek@redhat.com> - 1.6.0-5`
		`+ - Port to Maven 3 to enable tests.`
		`+ - Resolves: rhbz#1095077`
		`+`
		`* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-4`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`

mkoncek commented 5 years ago

Also changed the URL.

mizdebsk commented on line 15 of exec-maven-plugin.spec 5 years ago

Please rename this patch - it is porting to Maven 3 and not fixing type errors.

mizdebsk commented on line 24 of exec-maven-plugin.spec 5 years ago

It's good to keep BuildRequires in sorted order.

mizdebsk commented on line 55 of exec-maven-plugin.spec 5 years ago

This statement is not correct. You didn't fix any type errors as current version in rawhide (1.6.0-4) does not have them. (Changelog describes changes since previous package release.)

Also please add "- Resolves: rhbz#1095077" line to changelog to indicate which bug was fixed.

mizdebsk commented on line 54 of exec-maven-plugin.spec 5 years ago

This is not current date.

mizdebsk commented on line 10 of exec-maven-plugin.spec 5 years ago

Please remove "/index.html" part to keep the URL shorter and more readable.

mizdebsk commented on line 10 of exec-maven-plugin.spec 5 years ago

And switch to https

rebased onto a774030

5 years ago