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/01/29 02:52:36 UTC
[maven-archiver] branch master updated: [MSHARED-797] Move current
Build-Jdk manifest entry to Build-Jdk-Spec
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 12a5885 [MSHARED-797] Move current Build-Jdk manifest entry to Build-Jdk-Spec
12a5885 is described below
commit 12a58858dec02d398dda9616a69c2cc27b9ca14c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 28 23:21:52 2019 +0100
[MSHARED-797] Move current Build-Jdk manifest entry to Build-Jdk-Spec
---
src/main/java/org/apache/maven/archiver/MavenArchiver.java | 2 +-
src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 4 ++--
2 files changed, 3 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 329b45e..ce4d36e 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.specification.version" ) );
+ addManifestAttribute( m, entries, "Build-Jdk-Spec", 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 7bc6a58..99c5214 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -500,7 +500,7 @@ public class MavenArchiverTest
assertEquals( "Apache", manifest.get( Attributes.Name.IMPLEMENTATION_VENDOR ) );
assertEquals( System.getProperty( "java.specification.version" ),
- manifest.get( new Attributes.Name( "Build-Jdk" ) ) );
+ manifest.get( new Attributes.Name( "Build-Jdk-Spec" ) ) );
}
@Test
@@ -556,7 +556,7 @@ public class MavenArchiverTest
assertEquals( "org.apache.maven.archiver", manifest.getValue( "Automatic-Module-Name" ) );
assertEquals( System.getProperty( "java.specification.version" ),
- manifest.get( new Attributes.Name( "Build-Jdk" ) ) );
+ manifest.get( new Attributes.Name( "Build-Jdk-Spec" ) ) );
assertTrue( StringUtils.isEmpty( manifest.getValue( new Attributes.Name( "keyWithEmptyValue" ) ) ) );
assertTrue( manifest.containsKey( new Attributes.Name( "keyWithEmptyValue" ) ) );