[maven-source-plugin] branch MSOURCES-120 updated (f0439a6 -> c317ba2)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-source-plugin] branch MSOURCES-120 updated (f0439a6 -> c317ba2)

hboutemy
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a change to branch MSOURCES-120
in repository https://gitbox.apache.org/repos/asf/maven-source-plugin.git.


 discard f0439a6  remove Build-Jdk-Spec manifest entry
     new c317ba2  remove Build-Jdk-Spec manifest entry

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   (f0439a6)
            \
             N -- N -- N   refs/heads/MSOURCES-120 (c317ba2)

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:
 src/it/reproducible/verify.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Reply | Threaded
Open this post in threaded view
|

[maven-source-plugin] 01/01: remove Build-Jdk-Spec manifest entry

hboutemy
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MSOURCES-120
in repository https://gitbox.apache.org/repos/asf/maven-source-plugin.git

commit c317ba2f7902833210d0c8dd792799a8b404842a
Author: Hervé Boutemy <[hidden email]>
AuthorDate: Sun Sep 8 21:02:09 2019 +0200

    remove Build-Jdk-Spec manifest entry
---
 src/it/reproducible/verify.groovy                                       | 2 +-
 .../java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/it/reproducible/verify.groovy b/src/it/reproducible/verify.groovy
index 40a864c..d3b8a72 100644
--- a/src/it/reproducible/verify.groovy
+++ b/src/it/reproducible/verify.groovy
@@ -73,6 +73,6 @@ zipFile.close();
 String buf = r.toString()
 println buf
 
-String expectedSha1 = System.properties['os.name'].toLowerCase().contains( 'windows' ) ? 'b2c3895976027f203f2a08610fc28bbe7dbc7a9e' : 'acf461ff37ddc3c44c620770a73d9cf42f7ca429'
+String expectedSha1 = System.properties['os.name'].toLowerCase().contains( 'windows' ) ? '9f4d09263395074a66b16305b41fa9f6c41a11ef' : 'e684ad3e646ea1088946fed5f18c3b63d64ea6d4'
 
 assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = $expectedSha1" )
diff --git a/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java b/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
index c90edac..736b439 100644
--- a/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
@@ -423,6 +423,7 @@ public abstract class AbstractSourceJarMojo
         MavenArchiver archiver = new MavenArchiver();
         archiver.setArchiver( jarArchiver );
         archiver.setCreatedBy( "Maven Source Plugin", "org.apache.maven.plugins", "maven-source-plugin" );
+        archiver.setBuildJdkSpecDefaultEntry( false );
 
         if ( project.getBuild() != null )
         {