You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/11/03 13:42:55 UTC

[maven-source-plugin] 01/01: MSOURCES-122 remove Maven descriptors for output independant from OS

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

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

commit 23e7c372350645d1d2118a284d309f16600350ab
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Nov 3 14:42:45 2019 +0100

    MSOURCES-122 remove Maven descriptors for output independant from OS
---
 src/it/reproducible/pom.xml       | 2 ++
 src/it/reproducible/verify.groovy | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/it/reproducible/pom.xml b/src/it/reproducible/pom.xml
index e080fd5..214ea5e 100644
--- a/src/it/reproducible/pom.xml
+++ b/src/it/reproducible/pom.xml
@@ -45,6 +45,8 @@
         <artifactId>maven-source-plugin</artifactId>
         <configuration>
           <archive>
+            <!-- remove Maven descriptor pom.xml and pom.properties since they vary given platform line ending -->
+            <addMavenDescriptor>false</addMavenDescriptor>
             <manifest>
               <!-- remove default entries since it contains "Created-By: Maven Source Plugin <current plugin version>"
                    which varies over time in this IT -->
diff --git a/src/it/reproducible/verify.groovy b/src/it/reproducible/verify.groovy
index a8261c2..b3d3f2a 100644
--- a/src/it/reproducible/verify.groovy
+++ b/src/it/reproducible/verify.groovy
@@ -72,6 +72,4 @@ zipFile.close();
 String buf = r.toString()
 println buf
 
-String expectedSha1 = System.properties['os.name'].toLowerCase().contains( 'windows' ) ? '3fd3c6db6774db82e78bffc645930a186266e209' : 'bc56380204897bf99dea7849853a7d52f470e7d6'
-
-assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = $expectedSha1" )
+assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = be23fd0f7fec1053ce263f3138dca4c5e3b8adf4" )