[MSHARED-588] User supplied Class-Path entry does not go first

Author: michael-o

src/main/java/org/apache/maven/archiver/MavenArchiver.java

@@ -47,6 +47,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.jar.Attributes;
 
 /**
  * @author <a href="[email protected]">Emmanuel Venisse</a>
@@ -127,7 +128,7 @@ public Manifest getManifest( MavenSession session, MavenProject project, MavenAr
                 String key = entry.getKey();
                 String value = entry.getValue();
                 Manifest.Attribute attr = manifest.getMainSection().getAttribute( key );
-                if ( key.equals( "ClassPath" ) && attr != null )
+                if ( key.equals( Attributes.Name.CLASS_PATH.toString() ) && attr != null )
                 {
                     // Merge the user-supplied Class-Path value with the programmatically
                     // created Class-Path. Note that the user-supplied value goes first

src/test/java/org/apache/maven/archiver/MavenArchiverTest.java

@@ -230,9 +230,9 @@ public boolean isAddClasspath()
 
             Manifest manifest = archiver.getManifest( session, project, archiveConfiguration );
             String classPath = manifest.getMainAttributes().getValue( "Class-Path" );
-            assertTrue( "User specified Class-Path entry was not added to manifest", classPath.contains( "help/" ) );
-            assertTrue( "Class-Path generated by addClasspath was not added to manifest",
-                        classPath.contains( tempFile.getName() ) );
+            assertTrue( "User specified Class-Path entry was not prepended to manifest", classPath.startsWith( "help/" ) );
+            assertTrue( "Class-Path generated by addClasspath was not appended to manifest",
+                        classPath.endsWith( tempFile.getName() ) );
         }
         finally
         {