You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/12/27 12:13:56 UTC
[maven-archiver] 01/01: Try it. Upgrade maven-surefire-plugin to
2.20.1
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 f22df20c3cdefc29242416bdb624dd34c6aaeeba
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Dec 27 13:13:37 2017 +0100
Try it.
Upgrade maven-surefire-plugin to 2.20.1
---
pom.xml | 16 ++++++++++++++++
.../java/org/apache/maven/archiver/MavenArchiver.java | 6 ++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1e3fcb7..3ad1db8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,22 @@
</site>
</distributionManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.20.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.20.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index 66d9353..a014b08 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -25,6 +25,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,7 +37,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;
@@ -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
"commits@maven.apache.org" <co...@maven.apache.org>.