This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MSHARED-668-test in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
commit e9a55e5e61df26e9325ee0a270bcd057078c4ea8 Author: Karl Heinz Marbaise <[email protected]> AuthorDate: Wed Dec 27 10:28:56 2017 +0100 Try it. --- .../org/apache/maven/archiver/MavenArchiver.java | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java index 66d9353..bf94346 100644 --- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java +++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java @@ -1,5 +1,14 @@ package org.apache.maven.archiver; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -25,6 +34,7 @@ import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.OverConstrainedVersionException; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; +import org.apache.maven.shared.utils.StringUtils; import org.codehaus.plexus.archiver.jar.JarArchiver; import org.codehaus.plexus.archiver.jar.Manifest; import org.codehaus.plexus.archiver.jar.ManifestException; @@ -36,16 +46,6 @@ import org.codehaus.plexus.interpolation.PrefixedPropertiesValueSource; import org.codehaus.plexus.interpolation.RecursionInterceptor; import org.codehaus.plexus.interpolation.StringSearchInterpolator; import org.codehaus.plexus.interpolation.ValueSource; -import org.apache.maven.shared.utils.StringUtils; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; /** * @author <a href="[email protected]">Emmanuel Venisse</a> @@ -121,7 +121,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( "Class-Path" ) && attr != null ) { // Merge the user-supplied Class-Path value with the programmatically // created Class-Path. Note that the user-supplied value goes first @@ -355,6 +355,8 @@ public class MavenArchiver { // Class-Path is special and should be added to manifest even if // it is specified in the manifestEntries section + System.out.println( "Class-Path:" ); + System.out.println( classpath.toString() ); addManifestAttribute( m, "Class-Path", classpath.toString() ); } } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
