diff --git a/.gitignore b/.gitignore index aa3d291..97245d6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ maven-remote-resources-plugin-1.2-source-release.zip maven-remote-resources-plugin-1.2.1-source-release.zip /maven-remote-resources-plugin-1.3-source-release.zip /maven-remote-resources-plugin-1.4-source-release.zip +/maven-remote-resources-plugin-1.5-source-release.zip diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index 2560422..81fd571 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,6 +1,6 @@ Name: maven-remote-resources-plugin -Version: 1.4 -Release: 13%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Maven Remote Resources Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/ @@ -9,30 +9,24 @@ BuildArch: noarch Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: maven-local -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1) BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-model) +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) +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-plugin-testing-harness) -BuildRequires: mvn(org.apache.maven.shared:maven-verifier) -BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) BuildRequires: mvn(org.apache.velocity:velocity) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-resources) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.codehaus.plexus:plexus-velocity) %description @@ -52,15 +46,6 @@ API documentation for %{name}. %prep %setup -q -#Class org.apache.maven.shared.artifact.filter.collection.TransitivityFilter which ProcessRemoteResourcesMojo.java imports -#is renamed as org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter in -#the version 1.3 of maven-shared-common-artifact-filters package. -sed -i "s/TransitivityFilter/Project&/" `find -name ProcessRemoteResourcesMojo.java` - -# fix 613582 -# we now use plexus-velocity which has the correct descriptor with a hint. -rm -f src/main/resources/META-INF/plexus/components.xml - %build # Tests use Maven 2 APIs %mvn_build -f @@ -75,6 +60,9 @@ rm -f src/main/resources/META-INF/plexus/components.xml %doc LICENSE NOTICE %changelog +* Tue Sep 12 2017 Mikolaj Izdebski - 1.5-1 +- Update to upstream version 1.5 + * Wed Jul 26 2017 Fedora Release Engineering - 1.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 39ca71b..a688f68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41931941e90d94e6698346a95f6c76c3 maven-remote-resources-plugin-1.4-source-release.zip +SHA512 (maven-remote-resources-plugin-1.5-source-release.zip) = 91906ffeb101147210cff36f5cafceb8e1cd8ac2ef90d5ddc8be894528af4b9510773abf2bf53cd9da2dfa62746de8fe05bb3e1ef15855fb94288d1d83dc4216