diff --git a/maven-release-ftbfs.patch b/maven-release-ftbfs.patch new file mode 100644 index 0000000..50ac412 --- /dev/null +++ b/maven-release-ftbfs.patch @@ -0,0 +1,42 @@ +--- maven-release-2.2.1/maven-release-manager/src/main/mdo/release-descriptor.mdo.orig 2013-12-24 02:51:03.017016426 -0200 ++++ maven-release-2.2.1/maven-release-manager/src/main/mdo/release-descriptor.mdo 2013-12-24 02:51:57.939013819 -0200 +@@ -523,7 +523,7 @@ + + versionsMap.put( DEVELOPMENT_KEY, developmentVersion ); + versionsMap.put( RELEASE_KEY, releaseVersion ); +- resolvedSnapshotDependencies.put( artifactName, versionsMap ); ++ resolvedSnapshotDependencies.put( artifactName, String.class.cast(versionsMap) ); + } + + /** +@@ -575,7 +575,7 @@ + assert !originalScmInfo.containsKey( projectId ); + } + +- originalScmInfo.put( projectId, scm ); ++ originalScmInfo.put( projectId, String.class.cast(scm) ); + } + + /** +@@ -613,8 +613,8 @@ + { + if ( ( resolvedSnapshotDependencies == null ) && ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) ) ) + { +- java.util.Map versionMap = ( java.util.Map ) resolvedSnapshotDependencies.get( artifactConflictId ); +- return ( String ) versionMap.get( DEVELOPMENT_KEY ); ++ java.util.Map versionMap = java.util.Map.class.cast(resolvedSnapshotDependencies.get( artifactConflictId )); ++ return String.class.cast(versionMap.get( DEVELOPMENT_KEY )); + } + return null; + } +@@ -627,8 +627,8 @@ + { + if ( ( resolvedSnapshotDependencies == null ) && ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) ) ) + { +- java.util.Map versionMap = ( java.util.Map ) resolvedSnapshotDependencies.get( artifactConflictId ); +- return ( String ) versionMap.get( RELEASE_KEY ); ++ java.util.Map versionMap = java.util.Map.class.cast(resolvedSnapshotDependencies.get( artifactConflictId )); ++ return String.class.cast(versionMap.get( RELEASE_KEY )); + } + return null; + } diff --git a/maven-release.spec b/maven-release.spec index bb3b333..07d0230 100644 --- a/maven-release.spec +++ b/maven-release.spec @@ -1,6 +1,6 @@ Name: maven-release Version: 2.2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Release a project updating the POM and tagging in the SCM License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-release-plugin/ @@ -9,6 +9,9 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/release/%{name}/% Patch1: 002-mavenrelease-fixbuild.patch Patch2: 003-fixing-migration-to-component-metadata.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1015123 +Patch3: %{name}-ftbfs.patch + BuildArch: noarch BuildRequires: java-devel @@ -59,6 +62,7 @@ This package contains the API documentation for %{name}. %patch1 -p1 %patch2 -p1 +%patch3 -p1 cat > README << EOT %{name}-%{version} @@ -94,6 +98,9 @@ EOT %doc LICENSE NOTICE %changelog +* Wed Jan 08 2014 pcpa - 2.2.1-10 +- fix rhbz#1015123 + * Mon Aug 12 2013 gil cattaneo 2.2.1-9 - fix rhbz#984875, rhbz#992200 - fix some rpmlint problems