Updates to POM to fix deploy issues.

Also started on YAML configuration changes for LF.

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

4 files changed, 80 insertions, 96 deletions

diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
index c4530d4..3a7e138 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
@@ -41,20 +41,12 @@ installation-steps:
     ln -s /opt/app/groovy-2.4.6 /opt/app/groovy/246
   application-id: root
 
-#- step: maven-artifact
-#  group-id: org.openecomp.dcae.controller
-#  artifact-id: dcae-controller-core-utils
-#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
-#  type: zip
-#  assembly-id: runtime
-#  application-id: dcae
-  
-- step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
-  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
-  password: ${dcae.env('open-ecomp-demo.maven.password')}
-  type: zip
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
   artifact-id: dcae-controller-core-utils
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
   application-id: dcae
 
 - step: shell
@@ -78,13 +70,13 @@ installation-steps:
   application-id: dcae
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.apod/dcae-cdap-small-hadoop_${dcae.env('open-ecomp-demo.versions.apod')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod/deb-snapshots/dcae-cdap-small-hadoop_${dcae.env('open-ecomp-demo.versions.apod')}.deb
   user-name: ${dcae.env('open-ecomp-demo.maven.user')}
   password: ${dcae.env('open-ecomp-demo.maven.password')}
   type: deb
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.apod/dcae-analytics-tca_${dcae.env('open-ecomp-demo.versions.apod')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod.analytics/deb-snapshots/dcae-analytics-tca_${dcae.env('open-ecomp-demo.versions.apod')}.deb
   user-name: ${dcae.env('open-ecomp-demo.maven.user')}
   password: ${dcae.env('open-ecomp-demo.maven.password')}
   type: deb
diff --git a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
index 6727287..91978af 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
@@ -40,20 +40,12 @@ installation-steps:
     ln -s /opt/app/groovy-2.4.6 /opt/app/groovy/246
   application-id: root
 
-#- step: maven-artifact
-#  group-id: org.openecomp.dcae.controller
-#  artifact-id: dcae-controller-core-utils
-#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
-#  type: zip
-#  assembly-id: runtime
-#  application-id: dcae
-  
-- step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
-  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
-  password: ${dcae.env('open-ecomp-demo.maven.password')}
-  type: zip
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
   artifact-id: dcae-controller-core-utils
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
   application-id: dcae
 
 - step: shell
diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
index f9b3fe9..5e38393 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
@@ -51,20 +51,12 @@ installation-steps:
     echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf
     echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head  
 
-#- step: maven-artifact
-#  group-id: org.openecomp.dcae.controller
-#  artifact-id: dcae-controller-core-utils
-#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
-#  type: zip
-#  assembly-id: runtime
-#  application-id: dcae
-  
-- step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
-  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
-  password: ${dcae.env('open-ecomp-demo.maven.password')}
-  type: zip
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
   artifact-id: dcae-controller-core-utils
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
   application-id: dcae
 
 - step: shell
diff --git a/dcae-demo-controller/pom.xml b/dcae-demo-controller/pom.xml
index ba45ffa..ef29696 100644
--- a/dcae-demo-controller/pom.xml
+++ b/dcae-demo-controller/pom.xml
@@ -6,7 +6,15 @@
 	<version>0.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.target>1.7</maven.compiler.target>
+		<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>
+	</properties>
+
+
 	<pluginRepositories>
 		<!-- Black Duck plugin dependencies -->
 		<pluginRepository>
@@ -21,9 +29,9 @@
 			<url>http://maven.restlet.com</url>
 		</pluginRepository>
 	</pluginRepositories>
-<build>
+	<build>
 		<plugins>
-		<!-- blackduck maven plugin -->
+			<!-- blackduck maven plugin -->
 			<plugin>
 				<groupId>com.blackducksoftware.integration</groupId>
 				<artifactId>hub-maven-plugin</artifactId>
@@ -43,20 +51,20 @@
 					</execution>
 				</executions>
 			</plugin>
-       <!-- site maven plugin -->
-       <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-site-plugin</artifactId>
-           <version>3.6</version>
-           <dependencies>
-             <dependency>
-               <groupId>org.apache.maven.wagon</groupId>
-               <artifactId>wagon-webdav-jackrabbit</artifactId>
-               <version>2.10</version>
-             </dependency>
-           </dependencies>
-       </plugin>
-    
+			<!-- site maven plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.6</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-webdav-jackrabbit</artifactId>
+						<version>2.10</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>2.6</version>
@@ -137,44 +145,44 @@
 	</build>
 
 
-	
-		<distributionManagement>
-			<repository>
-				<id>osecomp-nexus-releases</id>
-				<name>OSECOMP Release Repository</name>
-				<url>${openecomp.nexus.releases}</url>
-			</repository>
-			<snapshotRepository>
-				<id>osecomp-nexus-snapshots</id>
-				<name>OSECOMP Snapshot Repository</name>
-				<url>${openecomp.nexus.snapshots}</url>
-			</snapshotRepository>
-			<site>
-				<id>dcae-javadoc</id>
-				<url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
-			</site>
-		</distributionManagement>
-	
-   <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-                    <docletArtifact>
-                        <groupId>org.umlgraph</groupId>
-                        <artifactId>umlgraph</artifactId>
-                        <version>5.6</version>
-                    </docletArtifact>
-                    <additionalparam>-views</additionalparam>
-                    <useStandardDocletOptions>true</useStandardDocletOptions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
+
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<name>OpenECOMP Release Repository</name>
+			<url>${openecomp.nexus.releases}</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<name>OpenECOMP Snapshot Repository</name>
+			<url>${openecomp.nexus.snapshots}</url>
+		</snapshotRepository>
+		<site>
+			<id>dcae-javadoc</id>
+			<url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
+		</site>
+	</distributionManagement>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+					<docletArtifact>
+						<groupId>org.umlgraph</groupId>
+						<artifactId>umlgraph</artifactId>
+						<version>5.6</version>
+					</docletArtifact>
+					<additionalparam>-views</additionalparam>
+					<useStandardDocletOptions>true</useStandardDocletOptions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 
 
 	<dependencies>