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 2021/05/09 15:39:00 UTC
[maven-artifact-plugin] branch master updated: [MARTIFACT-18] add
reference OS and java version to .buildinfo.compare
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-artifact-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new c742514 [MARTIFACT-18] add reference OS and java version to .buildinfo.compare
c742514 is described below
commit c742514ec1c22afaae908edbf198c635395c7c60
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun May 9 17:38:57 2021 +0200
[MARTIFACT-18] add reference OS and java version to .buildinfo.compare
---
.../maven/plugins/artifact/buildinfo/BuildinfoMojo.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
index 349c18a..3ed06e3 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
@@ -36,6 +36,7 @@ import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
+import org.apache.maven.shared.utils.PropertyUtils;
import org.apache.maven.shared.utils.StringUtils;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
@@ -405,6 +406,17 @@ public class BuildinfoMojo
p.println( "ko=" + ko );
p.println( "okFiles=\"" + StringUtils.join( okFilenames.iterator(), " " ) + '"' );
p.println( "koFiles=\"" + StringUtils.join( koFilenames.iterator(), " " ) + '"' );
+ Properties ref = PropertyUtils.loadOptionalProperties( referenceBuildinfo );
+ String v = ref.getProperty( "java.version" );
+ if ( v != null )
+ {
+ p.println( "reference_java_version=" + v );
+ }
+ v = ref.getProperty( "os.name" );
+ if ( v != null )
+ {
+ p.println( "reference_os_name=" + v );
+ }
for ( String diffoscope : diffoscopes )
{
p.print( "# " );