[maven-archiver] branch master updated: [MSHARED-588] User supplied Class-Path entry does not go first

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git


The following commit(s) were added to refs/heads/master by this push:
     new c16bda7  [MSHARED-588] User supplied Class-Path entry does not go first
c16bda7 is described below

commit c16bda702f8e0d65ef95a9d7bfab00a776b2b7d8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Dec 25 19:58:16 2018 +0100

    [MSHARED-588] User supplied Class-Path entry does not go first
---
 src/main/java/org/apache/maven/archiver/MavenArchiver.java     | 3 ++-
 src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index f762d39..f925a39 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -47,6 +47,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.jar.Attributes;
 
 /**
  * @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
@@ -127,7 +128,7 @@ public class MavenArchiver
                 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
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 38a9b4f..f4a496b 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -230,9 +230,9 @@ public class MavenArchiverTest
 
             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
         {