From 3168c3d7509bceff43648d4eb40c163dcbc6b3ad Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Wed, 9 May 2018 10:49:30 -0400 Subject: Update POM files for vLB manual scaling - Change version number of HC artifacts to 1.2.0 - Create a deploy script template in POM file - Change HC version number in install scripts Change-Id: If437d5c719a8a5edfa54dc48abfbc34253c5728d Issue-ID: INT-447 Signed-off-by: Marco Platania --- vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml | 105 +++++++++++++++++++--- 1 file changed, 95 insertions(+), 10 deletions(-) (limited to 'vnfs/vLBMS/apis/vlb-vnf-onap-distribution') diff --git a/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml b/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml index 90f5770b..1e2d1c03 100644 --- a/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml +++ b/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml @@ -2,18 +2,23 @@ - demo-aggregator - 1.2.0-SNAPSHOT - org.onap.demo.vnf - ../../../../pom.xml + io.fd.honeycomb.common + minimal-distribution-parent + 1.17.07 4.0.0 org.onap.demo.vnf.vlb vlb-vnf-onap-distribution - 1.2.0-SNAPSHOT + 1.2.0 + http://nexus.fd.io/content + +#!/bin/sh - +%s + + -Xms128m -Xmx128m io.fd.honeycomb.infra.distro.Main 1.17.07 @@ -35,15 +40,49 @@ + org.apache.maven.plugins maven-compiler-plugin - - - org.codehaus.gmaven - groovy-maven-plugin + 3.3 + + + javac-with-errorprone + true + true + 1.8 + 1.8 + + + + org.codehaus.plexus + plexus-compiler-javac-errorprone + 2.5 + + + + com.google.errorprone + error_prone_core + 2.0.9 + + org.apache.maven.plugins maven-jar-plugin + + + + ${main.class} + true + lib/ + false + true + + + config/ cert/ modules/ yang-mapping/ + + + org.apache.maven.plugins @@ -75,6 +114,53 @@ + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + package + + execute + + + + import java.nio.file.Paths + + log.info "Generating shell exec script" + def scriptTemplate = properties.getOrDefault("start.script.template", "") + def args = properties.getOrDefault("exec.parameters", "") + log.debug "Additional shell exec script properties: ${args}" + def javaArgs = "${args} -jar \$(dirname \$0)/${project.artifactId}-${project.version}.jar" + def scriptParent = Paths.get(project.build.outputDirectory, "honeycomb-minimal-resources") + scriptParent.toFile().mkdirs() + def scriptContent = "java " + javaArgs + log.info "Generating shell exec script as ${scriptContent}" + def scriptPath = Paths.get(scriptParent.toString(), "honeycomb") + log.info "Writing shell exec script to ${scriptPath}" + scriptPath.toFile().text = String.format(scriptTemplate, scriptContent) + scriptPath.toFile().setExecutable(true) + + scriptPath = Paths.get(scriptParent.toString(), "honeycomb-start") + log.info "Writing shell exec script to ${scriptPath}" + scriptPath.toFile().text = "\$(dirname \$0)/honeycomb &" + scriptPath.toFile().setExecutable(true) + + def debug_args = properties.getOrDefault("debug.parameters", "") + def debugScriptContent = "java" + " ${debug_args} " + javaArgs + log.info "Generating shell debug script as ${debugScriptContent}" + scriptPath = Paths.get(scriptParent.toString(), "honeycomb-debug") + log.info "Writing shell debug script to ${scriptPath}" + scriptPath.toFile().text = String.format(scriptTemplate, debugScriptContent) + scriptPath.toFile().setExecutable(true) + + + + + maven-assembly-plugin @@ -152,6 +238,5 @@ minimal-distribution ${honeycomb.min.distro.version} - -- cgit 1.2.3-korg