[maven-archiver] branch master updated: [MSHARED-796] use java.specification.version instead of java.version

[hb...@apache.org]

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

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git


The following commit(s) were added to refs/heads/master by this push:
     new dad1a30  [MSHARED-796] use java.specification.version instead of java.version
dad1a30 is described below

commit dad1a30a05de7e81ddb5fd0b28550b58d5d56e11
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon Jan 21 16:18:13 2019 +0100

    [MSHARED-796] use java.specification.version instead of java.version
    
    in Build-Jdk manifest entry. This will keep by default the important
    information for generated bytecode reproducibility: the major version of
    the JDK used. But this will remove the hard to reproduce part that does
    not influence generated bytecode: the patch level
---
 src/main/java/org/apache/maven/archiver/MavenArchiver.java     | 2 +-
 src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index f925a39..329b45e 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -508,7 +508,7 @@ public class MavenArchiver
     private void addCustomEntries( Manifest m, Map<String, String> entries, ManifestConfiguration config )
         throws ManifestException
     {
-        addManifestAttribute( m, entries, "Build-Jdk", System.getProperty( "java.version" ) );
+        addManifestAttribute( m, entries, "Build-Jdk", System.getProperty( "java.specification.version" ) );
 
         /*
          * TODO: rethink this, it wasn't working Artifact projectArtifact = project.getArtifact(); if (
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index f4a496b..7bc6a58 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -499,7 +499,8 @@ public class MavenArchiverTest
         assertEquals( "0.1.1", manifest.get( Attributes.Name.IMPLEMENTATION_VERSION ) );
         assertEquals( "Apache", manifest.get( Attributes.Name.IMPLEMENTATION_VENDOR ) );
 
-        assertEquals( System.getProperty( "java.version" ), manifest.get( new Attributes.Name( "Build-Jdk" ) ) );
+        assertEquals( System.getProperty( "java.specification.version" ),
+                      manifest.get( new Attributes.Name( "Build-Jdk" ) ) );
     }
 
     @Test
@@ -554,7 +555,8 @@ public class MavenArchiverTest
         assertEquals( "olivier", manifest.get( new Attributes.Name( "first-name" ) ) );
         assertEquals( "org.apache.maven.archiver", manifest.getValue( "Automatic-Module-Name" ) );
 
-        assertEquals( System.getProperty( "java.version" ), manifest.get( new Attributes.Name( "Build-Jdk" ) ) );
+        assertEquals( System.getProperty( "java.specification.version" ),
+                      manifest.get( new Attributes.Name( "Build-Jdk" ) ) );
 
         assertTrue( StringUtils.isEmpty( manifest.getValue( new Attributes.Name( "keyWithEmptyValue" ) ) ) );
         assertTrue( manifest.containsKey( new Attributes.Name( "keyWithEmptyValue" ) ) );