From ac1abc2b5b6f629726fad04045acda8ee33e047f Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 6 Sep 2017 11:43:41 -0700 Subject: Add git commit info in version-check output Change-Id: I82973ea3239cf21b0aa6a3a0b172667edd253b43 Issue-ID: INT-124 Signed-off-by: Gary Wu --- .../integration/versionmanifest/VersionCheckMojo.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'version-manifest/src/main/java/org/onap') diff --git a/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java b/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java index 5d4e9a8fa..325ca5811 100644 --- a/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java +++ b/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java @@ -17,6 +17,7 @@ package org.onap.integration.versionmanifest; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.net.MalformedURLException; import java.nio.charset.StandardCharsets; @@ -25,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Properties; import java.util.Set; import java.util.TreeSet; @@ -59,7 +61,17 @@ public class VersionCheckMojo extends AbstractMojo { public void execute() throws MojoExecutionException { final Log log = getLog(); - log.info("Checking version manifest " + manifest); + final Properties gitProps = new Properties(); + try (InputStream in = getClass().getResourceAsStream("/git.properties")) { + gitProps.load(in); + } catch (IOException e) { + log.error(e); + throw new MojoExecutionException(e.getMessage()); + } + + log.info("Manifest version: " + gitProps.getProperty("git.remote.origin.url") + " " + + gitProps.getProperty("git.commit.id") + " " + gitProps.getProperty("git.build.time")); + log.info(""); final List groupIdPrefixes = Arrays.asList("org.onap", "org.openecomp", "org.openo"); @@ -105,7 +117,7 @@ public class VersionCheckMojo extends AbstractMojo { String artifact = actualVersion.getKey(); String expectedVersion = expectedVersions.get(artifact); if (expectedVersion == null) { - if (artifact.startsWith("org.onap") || artifact.startsWith("org.openecomp")) { + if (groupIdPrefixes.stream().anyMatch(prefix -> artifact.startsWith(prefix))) { missingArtifacts.add(artifact); } } else if (!expectedVersion.equals(actualVersion)) { -- cgit 1.2.3-korg