From 4ccabfb4a41f5b2e81dc6e3a44b0cdc7cb375cda Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 1 Sep 2017 13:14:36 -0700 Subject: Change to read manifest from classpath Change-Id: Iba9f66cae0b018efdfd7c0827d3287866eb0b092 Issue-ID: INT-124 Signed-off-by: Gary Wu --- .gitignore | 1 + version-manifest/pom.xml | 5 +- .../integration/versioncheck/VersionCheckMojo.java | 121 --------------------- .../versionmanifest/VersionCheckMojo.java | 120 ++++++++++++++++++++ 4 files changed, 124 insertions(+), 123 deletions(-) delete mode 100644 version-manifest/src/main/java/org/onap/integration/versioncheck/VersionCheckMojo.java create mode 100644 version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java diff --git a/.gitignore b/.gitignore index 75d41254c..f3b07b8d9 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ env.properties *.log .vagrant *~ +.checkstyle diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml index 11318e612..38b90c9c3 100644 --- a/version-manifest/pom.xml +++ b/version-manifest/pom.xml @@ -3,12 +3,13 @@ 4.0.0 org.onap.oparent - version + oparent 0.1.0 org.onap.integration version-manifest maven-plugin + 0.1.0-SNAPSHOT ONAP Version Manifest and Maven Plugin https://www.onap.org @@ -51,7 +52,7 @@ maven-plugin-plugin 3.2 - version-check + version-manifest true diff --git a/version-manifest/src/main/java/org/onap/integration/versioncheck/VersionCheckMojo.java b/version-manifest/src/main/java/org/onap/integration/versioncheck/VersionCheckMojo.java deleted file mode 100644 index ffd106cf5..000000000 --- a/version-manifest/src/main/java/org/onap/integration/versioncheck/VersionCheckMojo.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright 2017 Huawei Technologies, Ltd. and others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.onap.integration.versioncheck; - -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVRecord; -import org.apache.maven.model.Dependency; -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.logging.Log; -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; -import org.apache.maven.project.MavenProject; - -@Mojo(name = "version-check", defaultPhase = LifecyclePhase.PROCESS_SOURCES) -public class VersionCheckMojo extends AbstractMojo { - - /** - * The Maven Project. - * - * @since 1.0-alpha-1 - */ - @Parameter(defaultValue = "${project}", required = true, readonly = true) - protected MavenProject project; - - /** - * Location of the file. - */ - @Parameter(property = "manifestUri", required = true) - private URI manifestUri; - - public void execute() throws MojoExecutionException { - final Log log = getLog(); - - log.info("Checking version manifest " + manifestUri); - - Map expectedVersions = new HashMap<>(); - - try (InputStreamReader in = new InputStreamReader(manifestUri.toURL().openStream(), - StandardCharsets.ISO_8859_1)) { - Iterable records = CSVFormat.DEFAULT.withFirstRecordAsHeader().parse(in); - for (CSVRecord record : records) { - String groupId = record.get("groupId"); - String artifactId = record.get("artifactId"); - String version = record.get("version"); - log.debug("Expected version: " + groupId + ":" + artifactId + ":" + version); - expectedVersions.put(groupId + ":" + artifactId, version); - } - } catch (MalformedURLException e) { - log.error(e); - throw new MojoExecutionException(e.getMessage()); - } catch (IOException e) { - log.error(e); - throw new MojoExecutionException(e.getMessage()); - } - - Map actualVersions = new HashMap<>(); - MavenProject parent = project.getParent(); - if (parent != null) { - log.debug("Parent: " + parent); - actualVersions.put(parent.getGroupId() + ":" + parent.getArtifactId(), parent.getVersion()); - } else { - log.debug("No parent"); - } - - for (Dependency dep : project.getDependencies()) { - log.debug("Dependency: " + dep.toString()); - actualVersions.put(dep.getGroupId() + ":" + dep.getArtifactId(), dep.getVersion()); - } - - Set mismatches = new TreeSet<>(); - for (Entry expected : expectedVersions.entrySet()) { - String artifact = expected.getKey(); - String expectedVersion = expectedVersions.get(artifact); - String actualVersion = actualVersions.get(artifact); - if (actualVersion != null && !actualVersion.equals(expectedVersion)) { - mismatches.add(artifact); - } - } - - if (mismatches.isEmpty()) { - log.debug("No version mismatches found"); - } else { - log.warn("The following dependencies should be updated to match the version manifest:"); - for (String artifact : mismatches) { - String expectedVersion = expectedVersions.get(artifact); - String actualVersion = actualVersions.get(artifact); - if (actualVersion != null && !actualVersion.equals(expectedVersion)) { - log.warn(" " + artifact + " " + actualVersion + " -> " + expectedVersion); - } - } - } - - } -} 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 new file mode 100644 index 000000000..b26c1cdac --- /dev/null +++ b/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java @@ -0,0 +1,120 @@ +/* + * Copyright 2017 Huawei Technologies, Ltd. and others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.integration.versionmanifest; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeSet; + +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVRecord; +import org.apache.maven.model.Dependency; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.project.MavenProject; + +@Mojo(name = "version-check", defaultPhase = LifecyclePhase.PROCESS_SOURCES) +public class VersionCheckMojo extends AbstractMojo { + + /** + * The Maven Project. + * + * @since 1.0-alpha-1 + */ + @Parameter(defaultValue = "${project}", required = true, readonly = true) + protected MavenProject project; + + /** + * Location of the file. + */ + @Parameter(property = "manifest", required = true, defaultValue = "/java-manifest.csv") + private String manifest; + + public void execute() throws MojoExecutionException { + final Log log = getLog(); + + log.info("Checking version manifest " + manifest); + + Map expectedVersions = new HashMap<>(); + + try (InputStreamReader in = new InputStreamReader(getClass().getResourceAsStream(manifest), + StandardCharsets.ISO_8859_1)) { + Iterable records = CSVFormat.DEFAULT.withFirstRecordAsHeader().parse(in); + for (CSVRecord record : records) { + String groupId = record.get("groupId"); + String artifactId = record.get("artifactId"); + String version = record.get("version"); + log.debug("Expected version: " + groupId + ":" + artifactId + ":" + version); + expectedVersions.put(groupId + ":" + artifactId, version); + } + } catch (MalformedURLException e) { + log.error(e); + throw new MojoExecutionException(e.getMessage()); + } catch (IOException e) { + log.error(e); + throw new MojoExecutionException(e.getMessage()); + } + + Map actualVersions = new HashMap<>(); + MavenProject parent = project.getParent(); + if (parent != null) { + log.debug("Parent: " + parent); + actualVersions.put(parent.getGroupId() + ":" + parent.getArtifactId(), parent.getVersion()); + } else { + log.debug("No parent"); + } + + for (Dependency dep : project.getDependencies()) { + log.debug("Dependency: " + dep.toString()); + actualVersions.put(dep.getGroupId() + ":" + dep.getArtifactId(), dep.getVersion()); + } + + Set mismatches = new TreeSet<>(); + for (Entry expected : expectedVersions.entrySet()) { + String artifact = expected.getKey(); + String expectedVersion = expectedVersions.get(artifact); + String actualVersion = actualVersions.get(artifact); + if (actualVersion != null && !actualVersion.equals(expectedVersion)) { + mismatches.add(artifact); + } + } + + if (mismatches.isEmpty()) { + log.debug("No version mismatches found"); + } else { + log.warn("The following dependencies should be updated to match the version manifest:"); + for (String artifact : mismatches) { + String expectedVersion = expectedVersions.get(artifact); + String actualVersion = actualVersions.get(artifact); + if (actualVersion != null && !actualVersion.equals(expectedVersion)) { + log.warn(" " + artifact + " " + actualVersion + " -> " + expectedVersion); + } + } + } + + } +} -- cgit 1.2.3-korg