From 3ffc2b325ee3a1112afaa86d529ad6f439b4cde7 Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Fri, 24 Feb 2017 01:14:09 +0000 Subject: [PATCH] Update to fix hostname issue of demo POSTGRES VM Change-Id: I8396b749d1a0afc532701d7f54d522aa0a33940f Signed-off-by: Carsten Lund --- OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml | 8 ++--- dcae-demo-controller/pom.xml | 50 ++++++++------------------ pom.xml | 34 ------------------ version.properties | 11 ++++++ 4 files changed, 28 insertions(+), 75 deletions(-) create mode 100644 version.properties diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml index 4486c32..ceddb8e 100644 --- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml +++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml @@ -25,12 +25,8 @@ installation-steps: - step: shell command: | - case \\\\\$(hostname -a) in - *openecomp.org*) - sed -i /`hostname`/d /etc/hosts - cat /tmp/vm-*-hosts >> /etc/hosts - ;; - esac + sed -i /`hostname`/d /etc/hosts + cat /tmp/vm-*-hosts >> /etc/hosts apt-get update ; apt-get install -y maven openjdk-8-jdk unzip python-pip pip install pyyaml application-id: root diff --git a/dcae-demo-controller/pom.xml b/dcae-demo-controller/pom.xml index ef29696..c133166 100644 --- a/dcae-demo-controller/pom.xml +++ b/dcae-demo-controller/pom.xml @@ -12,45 +12,25 @@ 1.7 https://nexus.openecomp.org/content/repositories/releases/ https://nexus.openecomp.org/content/repositories/snapshots/ + https://nexus.openecomp.org + https://nexus.openecomp.org/content/repositories/snapshots/ + https://nexus.openecomp.org/content/repositories/snapshots/ - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - - - - Restlet - Restlet Repository - http://maven.restlet.com - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${openecomp.nexus.staging.profileId} + ${openecomp.nexus.proxy} + ${openecomp.nexus.staging.profileId} + + org.apache.maven.plugins @@ -236,4 +216,4 @@ jar - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 2a509ec..51c92b2 100644 --- a/pom.xml +++ b/pom.xml @@ -13,43 +13,9 @@ - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - - - - Restlet - Restlet Repository - http://maven.restlet.com - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - org.apache.maven.plugins diff --git a/version.properties b/version.properties new file mode 100644 index 0000000..c0f2742 --- /dev/null +++ b/version.properties @@ -0,0 +1,11 @@ +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support +major=1 +minor=0 +patch=0 +base_version=${major}.${minor}.${patch} +# Release must be completed with git revision # in Jenkins + +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT -- 2.16.6