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:41:39 UTC
[maven-archiver] branch MSHARED-668-test updated (f22df20 ->
70949dc)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHARED-668-test
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git.
discard f22df20 Try it. Upgrade maven-surefire-plugin to 2.20.1
new 70949dc Try it. Upgrade maven-surefire-plugin to 2.20.1 Downgraded plexus-utils to 3.0.24 to check.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f22df20)
\
N -- N -- N refs/heads/MSHARED-668-test (70949dc)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].
[maven-archiver] 01/01: Try it. Upgrade maven-surefire-plugin to
2.20.1 Downgraded plexus-utils to 3.0.24 to check.
Posted by kh...@apache.org.
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 70949dce7d73977850ce6167a9c86edd67c560d8
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
Downgraded plexus-utils to 3.0.24 to check.
---
pom.xml | 18 +++++++++++++++++-
.../java/org/apache/maven/archiver/MavenArchiver.java | 6 ++++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1e3fcb7..58a2c96 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>
@@ -102,7 +118,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.1.0</version>
+ <version>3.0.24</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</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>.