Attachment 847160 Details for Bug 1015123 – 0001-fix-rhbz-1015123.patch

[patch] 0001-fix-rhbz-1015123.patch

0001-fix-rhbz-1015123.patch (text/plain), 3.73 KB, created by Paulo Andrade on 2014-01-08 14:08:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Andrade

Created: 2014-01-08 14:08:45 UTC

Size: 3.73 KB

patch

obsolete

>From 840cff60d36839d20f3555cae19ed031021e81d7 Mon Sep 17 00:00:00 2001
>From: pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
>Date: Wed, 8 Jan 2014 12:03:46 -0200
>Subject: [PATCH] fix rhbz#1015123
>
>---
> maven-release-ftbfs.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
> maven-release.spec        |  9 ++++++++-
> 2 files changed, 50 insertions(+), 1 deletion(-)
> create mode 100644 maven-release-ftbfs.patch
>
>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 <paulo.cesar.pereira.de.andrade@gmail.com> - 2.2.1-10
>+- fix rhbz#1015123
>+
> * Mon Aug 12 2013 gil cattaneo <puntogil@libero.it> 2.2.1-9
> - fix rhbz#984875, rhbz#992200
> - fix some rpmlint problems
>-- 
>1.8.5.2
>

Actions: View | Diff

Attachments on bug 1015123: 839672 | 841063 | 847160