Attachment 839672 Details for Bug 1015123 – maven-release-ftbfs.patch

[patch] maven-release-ftbfs.patch

maven-release-ftbfs.patch (text/plain), 2.88 KB, created by Paulo Andrade on 2013-12-20 16:19:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Andrade

Created: 2013-12-20 16:19:26 UTC

Size: 2.88 KB

patch

obsolete

>--- maven-release-2.2.1/maven-release-manager/src/main/mdo/release-descriptor.mdo.orig	2013-12-20 14:09:09.153293176 -0200
>+++ maven-release-2.2.1/maven-release-manager/src/main/mdo/release-descriptor.mdo	2013-12-20 14:09:25.800294359 -0200
>@@ -523,7 +523,7 @@
> 
>         versionsMap.put( DEVELOPMENT_KEY, developmentVersion );
>         versionsMap.put( RELEASE_KEY, releaseVersion );
>-        resolvedSnapshotDependencies.put( artifactName, versionsMap );
>+        resolvedSnapshotDependencies.put( artifactName, versionsMap.toString() );
>     }
> 
>     /**
>@@ -575,7 +575,7 @@
>             assert !originalScmInfo.containsKey( projectId );
>         }
> 
>-        originalScmInfo.put( projectId, scm );
>+        originalScmInfo.put( projectId, scm.toString() );
>     }
> 
>     /**
>@@ -613,8 +613,18 @@
>     {
>         if ( ( resolvedSnapshotDependencies == null ) && ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) ) )
>         {
>-            java.util.Map versionMap = ( java.util.Map ) resolvedSnapshotDependencies.get( artifactConflictId );
>-            return ( String ) versionMap.get( DEVELOPMENT_KEY );
>+            String str = resolvedSnapshotDependencies.get( artifactConflictId );
>+            java.util.Properties props = new java.util.Properties();
>+            try {
>+                props.load(new java.io.StringReader(str.substring(1, str.length() - 1).replace(", ", "\n")));
>+            } catch(java.io.IOException e){
>+                e.printStackTrace();
>+            }
>+             java.util.Map<Object, String> versionMap = new java.util.HashMap<Object, String>();
>+            for (java.util.Map.Entry<Object, Object> e : props.entrySet()) {
>+                    versionMap.put((String)e.getKey(), (String)e.getValue());
>+            }
>+            return versionMap.get( DEVELOPMENT_KEY );
>         }
>         return null;
>     }
>@@ -627,8 +637,18 @@
>     {
>         if ( ( resolvedSnapshotDependencies == null ) && ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) ) )
>         {
>-            java.util.Map versionMap = ( java.util.Map ) resolvedSnapshotDependencies.get( artifactConflictId );
>-            return ( String ) versionMap.get( RELEASE_KEY );
>+            String str = resolvedSnapshotDependencies.get( artifactConflictId );
>+            java.util.Properties props = new java.util.Properties();
>+            try {
>+                props.load(new java.io.StringReader(str.substring(1, str.length() - 1).replace(", ", "\n")));
>+            } catch(java.io.IOException e){
>+                e.printStackTrace();
>+            }
>+            java.util.Map<Object, String> versionMap = new java.util.HashMap<Object, String>();
>+            for (java.util.Map.Entry<Object, Object> e : props.entrySet()) {
>+                    versionMap.put((String)e.getKey(), (String)e.getValue());
>+            }
>+            return versionMap.get( RELEASE_KEY );
>         }
>         return null;
>     }

Actions: View | Diff

Attachments on bug 1015123: 839672 | 841063 | 847160