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 2019/05/08 19:48:33 UTC
[maven-jar-plugin] branch MJAR-259 updated (694d17c -> 8164b8a)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MJAR-259
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git.
discard 694d17c Removed entry based on deprecation of IMPLEMENTATION_VENDOR_ID and removing of Created-By entry.
discard 6412a60 WIP - MJAR-262 - Upgrade several dependencies.
discard 134a2ce [MJAR-262] - Upgrade maven-archiver to 3.4.0
new 8164b8a [MJAR-259] - Archiving to jar is very slow o Upgraded maven-archiver to 3.4.0 o Upgraded plexus-archiver to 4.1.0 o Upgraded plexus-utils to 3.2.0 o Added maven-shared-utils 3.2.1 to override the one which is used by file-management. o Fixed IT's which relied on "Created-By" in MANIFEST.MF Removed deprecated IMPLEMENTATION_VENDOR_ID in MANIFEST
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 (694d17c)
\
N -- N -- N refs/heads/MJAR-259 (8164b8a)
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:
[maven-jar-plugin] 01/01: [MJAR-259] - Archiving to jar is very
slow o Upgraded maven-archiver to 3.4.0 o Upgraded plexus-archiver to 4.1.0
o Upgraded plexus-utils to 3.2.0 o Added maven-shared-utils 3.2.1 to
override the one which is used by file-management. o Fixed IT's which
relied on "Created-By" in MANIFEST.MF Removed deprecated
IMPLEMENTATION_VENDOR_ID in MANIFEST
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MJAR-259
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
commit 8164b8a7372501f5f81a00b5d011a19410107b46
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed May 8 21:44:49 2019 +0200
[MJAR-259] - Archiving to jar is very slow
o Upgraded maven-archiver to 3.4.0
o Upgraded plexus-archiver to 4.1.0
o Upgraded plexus-utils to 3.2.0
o Added maven-shared-utils 3.2.1 to override
the one which is used by file-management.
o Fixed IT's which relied on "Created-By" in MANIFEST.MF
Removed deprecated IMPLEMENTATION_VENDOR_ID in MANIFEST
---
pom.xml | 24 ++++++++++++++++++------
src/it/MJAR-228/verify.bsh | 6 ------
src/it/manifest-content/verify.bsh | 14 +-------------
3 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 461636f..fa285d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,8 +75,8 @@
</distributionManagement>
<properties>
- <mavenArchiverVersion>3.3.0</mavenArchiverVersion>
<mavenFileManagementVersion>3.0.0</mavenFileManagementVersion>
+ <mavenArchiverVersion>3.4.0</mavenArchiverVersion>
<mavenVersion>3.0</mavenVersion>
<javaVersion>7</javaVersion>
</properties>
@@ -118,16 +118,28 @@
! so we define it here explicit to make sure we get the
! correct version for plexus-archiver and plexus-utils.
-->
+ <!--
+ ! maven-shared-utils is pulled by file-management
+ ! Need to use a more recent version otherwise
+ ! the build will fail. This needed to be kept
+ ! here until a new version of file-management
+ ! has been made.
+ -->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>3.7.0</version>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.1.0</version>
+ <artifactId>plexus-archiver</artifactId>
+ <version>4.1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.2.0</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/src/it/MJAR-228/verify.bsh b/src/it/MJAR-228/verify.bsh
index 09eb0a2..f0aaa2c 100644
--- a/src/it/MJAR-228/verify.bsh
+++ b/src/it/MJAR-228/verify.bsh
@@ -45,12 +45,6 @@ try
Attributes manifest = jar.getManifest().getMainAttributes();
- if ( !manifest.getValue( new Attributes.Name( "Created-By" ) ).startsWith( "Apache Maven" ) )
- {
- System.err.println( "Created-By not equals Apache Maven" );
- return false;
- }
-
if ( !"myproject.HelloWorld".equals( manifest.get( Attributes.Name.MAIN_CLASS ) ) )
{
System.err.println( Attributes.Name.MAIN_CLASS.toString() + " not equals myproject.HelloWorld" );
diff --git a/src/it/manifest-content/verify.bsh b/src/it/manifest-content/verify.bsh
index 122bfa5..dfd1842 100644
--- a/src/it/manifest-content/verify.bsh
+++ b/src/it/manifest-content/verify.bsh
@@ -25,6 +25,7 @@ import org.codehaus.plexus.util.*;
boolean result = true;
+
try
{
File target = new File( basedir, "target" );
@@ -45,13 +46,6 @@ try
Attributes manifest = jar.getManifest().getMainAttributes();
- if ( !manifest.getValue( new Attributes.Name( "Created-By" ) ).startsWith( "Apache Maven" ) )
- {
- System.err.println( "Created-By not equals Apache Maven" );
- return false;
- }
-
-
if ( !"manifest-content-it".equals( manifest.get( Attributes.Name.SPECIFICATION_TITLE ) ) )
{
System.err.println( Attributes.Name.SPECIFICATION_TITLE.toString() + " not equals manifest-content-it" );
@@ -84,12 +78,6 @@ try
return false;
}
- if ( !"org.apache.maven.plugins".equals( manifest.get( Attributes.Name.IMPLEMENTATION_VENDOR_ID ) ) )
- {
- System.err.println( Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString() + " not equals org.apache.maven.plugins" );
- return false;
- }
-
if ( !"jar plugin it".equals( manifest.get( Attributes.Name.IMPLEMENTATION_VENDOR ) ) )
{
System.err.println( Attributes.Name.IMPLEMENTATION_VENDOR.toString() + " not equals jar plugin it" );