Update to fix hostname issue of demo POSTGRES VM

Change-Id: I8396b749d1a0afc532701d7f54d522aa0a33940f
Signed-off-by: Carsten Lund <lund@research.att.com>

diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
index 4486c32..ceddb8e 100644 (file)
--- 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 (file)
--- a/dcae-demo-controller/pom.xml
+++ b/dcae-demo-controller/pom.xml
@@ -12,45 +12,25 @@
                <maven.compiler.source>1.7</maven.compiler.source>
                <openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
                <openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+               <openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+               <openecomp.nexus.staging.serverId>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.staging.serverId>
+               <openecomp.nexus.staging.profileId>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.staging.profileId>
        </properties>
 
 
-       <pluginRepositories>
-               <!-- Black Duck plugin dependencies -->
-               <pluginRepository>
-                       <id>JCenter</id>
-                       <name>JCenter Repository</name>
-                       <url>http://jcenter.bintray.com</url>
-               </pluginRepository>
-
-               <pluginRepository>
-                       <id>Restlet</id>
-                       <name>Restlet Repository</name>
-                       <url>http://maven.restlet.com</url>
-               </pluginRepository>
-       </pluginRepositories>
        <build>
                <plugins>
-                       <!-- blackduck maven plugin -->
-                       <plugin>
-                               <groupId>com.blackducksoftware.integration</groupId>
-                               <artifactId>hub-maven-plugin</artifactId>
-                               <version>1.4.0</version>
-                               <inherited>false</inherited>
-                               <configuration>
-                                       <hubProjectName>${project.name}</hubProjectName>
-                                       <outputDirectory>${project.basedir}</outputDirectory>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>create-bdio-file</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>createHubOutput</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>${openecomp.nexus.staging.profileId}</serverId>
+                    <nexusUrl>${openecomp.nexus.proxy}</nexusUrl>
+                    <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId>
+                </configuration>
+            </plugin>
                        <!-- site maven plugin -->
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -236,4 +216,4 @@
                        <type>jar</type>
                </dependency>
        </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/pom.xml b/pom.xml
index 2a509ec..51c92b2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,43 +13,9 @@
 
   
                
-       <pluginRepositories>
-               <!-- Black Duck plugin dependencies -->
-               <pluginRepository>
-                       <id>JCenter</id>
-                       <name>JCenter Repository</name>
-                       <url>http://jcenter.bintray.com</url>
-               </pluginRepository>
-
-               <pluginRepository>
-                       <id>Restlet</id>
-                       <name>Restlet Repository</name>
-                       <url>http://maven.restlet.com</url>
-               </pluginRepository>
-       </pluginRepositories>
 <build>
                                <plugins>
                                
-               <!-- blackduck maven plugin -->
-                       <plugin>
-                               <groupId>com.blackducksoftware.integration</groupId>
-                               <artifactId>hub-maven-plugin</artifactId>
-                               <version>1.4.0</version>
-                               <inherited>false</inherited>
-                               <configuration>
-                                       <hubProjectName>${project.name}</hubProjectName>
-                                       <outputDirectory>${project.basedir}</outputDirectory>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>create-bdio-file</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>createHubOutput</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin> 
        <!-- site maven plugin -->
        <plugin>
            <groupId>org.apache.maven.plugins</groupId>

diff --git a/version.properties b/version.properties
new file mode 100644 (file)
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