Skip to content

Commit

Permalink
[MJAR-259] - Archiving to jar is very slow
Browse files Browse the repository at this point in the history
 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
  • Loading branch information
khmarbaise committed May 8, 2019
1 parent 78dbb29 commit 8164b8a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 25 deletions.
24 changes: 18 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions src/it/MJAR-228/verify.bsh
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
14 changes: 1 addition & 13 deletions src/it/manifest-content/verify.bsh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.codehaus.plexus.util.*;

boolean result = true;


try
{
File target = new File( basedir, "target" );
Expand All @@ -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" );
Expand Down Expand Up @@ -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" );
Expand Down

0 comments on commit 8164b8a

Please sign in to comment.