X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fpom.xml;h=9e2003ef8c11f32846287cc8f97664c9d9fd5dc4;hb=a4b2c8dd11b431fc69439e16ef2616a2e2483db7;hp=960d43187c67672d70a96a5c777422db07fe19e3;hpb=1abc42f6a8e299079ea11a1388a7a91b23d54850;p=sdnc%2Foam.git

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 960d4318..9e2003ef 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -1,50 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.openecomp.sdnc.oam</groupId>
-		<artifactId>installation</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>odlparent-lite</artifactId>
+		<version>1.2.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.sdnc.oam</groupId>
+	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-sdnc</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 
-	<name>Installation - sdnc</name>
+	<name>sdnc-oam :: installation :: ${project.artifactId}</name>
 	<description>Creates SDN Controller Docker container</description>
 
 	<properties>
-		<image.name>openecomp/sdnc-image</image.name>
+		<image.name>onap/sdnc-image</image.name>
 		<sdnc.project.version>${project.version}</sdnc.project.version>
-		<sdnc.core.version>${project.version}</sdnc.core.version>
-		<sdnc.adaptors.version>${project.version}</sdnc.adaptors.version>
-		<sdnc.northbound.version>${project.version}</sdnc.northbound.version>
-		<sdnc.plugins.version>${project.version}</sdnc.plugins.version>
-		<sdnc.opendaylight.version>0.5.1-Boron-SR1</sdnc.opendaylight.version>
-		<sdnc.mysql-connector-java.version>5.1.39</sdnc.mysql-connector-java.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+		<sdnc.northbound.version>1.5.0-SNAPSHOT</sdnc.northbound.version>
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+		<docker.push.phase>deploy</docker.push.phase>
+		<docker.verbose>true</docker.verbose>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 	</properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.opendaylight.integration</groupId>
-				<artifactId>distribution-karaf</artifactId>
-				<version>${sdnc.opendaylight.version}</version>
-				<type>tar.gz</type>
-			</dependency>
-			<dependency>
-				<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
-				<version>${sdnc.mysql-connector-java.version}</version>
-				<type>jar</type>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>org.onap.sdnc.northbound</groupId>
+			<artifactId>generic-resource-api-installer</artifactId>
+			<version>${sdnc.northbound.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdnc.northbound</groupId>
+			<artifactId>vnfapi-installer</artifactId>
+			<version>${sdnc.northbound.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdnc.northbound</groupId>
+			<artifactId>vnftools-installer</artifactId>
+			<version>${sdnc.northbound.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdnc.northbound</groupId>
+			<artifactId>sdnc-northbound-features-installer</artifactId>
+			<version>${sdnc.northbound.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+	</dependencies>
 
 	<build>
 		<plugins>
@@ -60,23 +73,7 @@
 							<goal>execute</goal>
 						</goals>
 						<configuration>
-							<source>
-								println project.properties['sdnc.project.version'];
-								def versionArray;
-								if ( project.properties['sdnc.project.version'] != null ) {
-									versionArray =
-									project.properties['sdnc.project.version'].split('\\.');
-								}
-
-								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
-									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-								} else {
-									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-								}
-
-								println 'New Tag for docker:' +
-								project.properties['project.docker.latesttag.version'];
-							</source>
+                            <source>${basedir}/../TagVersion.groovy</source>
 						</configuration>
 					</execution>
 				</executions>
@@ -85,7 +82,7 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.16.5</version>
+				<version>0.28.0</version>
 				<inherited>false</inherited>
 				<configuration>
 					<images>
@@ -94,11 +91,11 @@
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-								<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+								<dockerFile>Dockerfile</dockerFile>
 								<tags>
-									<tag>${project.version}</tag>
-									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-									<tag>${project.docker.latesttag.version}</tag>
+                                    <tag>${project.docker.latestminortag.version}</tag>
+                                    <tag>${project.docker.latestfulltag.version}</tag>
+                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
 								</tags>
 							</build>
 						</image>
@@ -115,7 +112,7 @@
 
 					<execution>
 						<id>push-images</id>
-						<phase>deploy</phase>
+						<phase>${docker.push.phase}</phase>
 						<goals>
 							<goal>build</goal>
 							<goal>push</goal>
@@ -125,67 +122,6 @@
 			</plugin>
 
 
-			<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-dependency-plugin</artifactId>
-			<version>3.0.0</version>
-			<executions>
-				<execution>
-					<id>get-odl-distribution</id>
-					<phase>validate</phase>
-					<goals>
-						<goal>copy</goal>
-					</goals>
-					<configuration>
-						<artifactItems>
-							<artifactItem>
-								<groupId>org.opendaylight.integration</groupId>
-								<artifactId>distribution-karaf</artifactId>
-								<version>${sdnc.opendaylight.version}</version>
-								<type>tar.gz</type>
-
-								<overWrite>true</overWrite>
-								<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-							</artifactItem>
-						</artifactItems>
-						<overWriteReleases>false</overWriteReleases>
-						<overWriteSnapshots>true</overWriteSnapshots>
-						<overWriteIfNewer>true</overWriteIfNewer>
-					</configuration>
-				</execution>
-			</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>get-mysql-connector-jar</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>mysql</groupId>
-									<artifactId>mysql-connector-java</artifactId>
-									<version>${sdnc.mysql-connector-java.version}</version>
-									<type>jar</type>
-
-									<overWrite>true</overWrite>
-									<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -218,7 +154,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/bin</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/scripts</directory>
@@ -244,6 +180,8 @@
 									<directory>src/main/resources</directory>
 									<includes>
 										<include>idmlight.db.mv.db</include>
+										<include>AAF_RootCA.cer</include>
+										<include>truststoreONAPall.jks</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>
@@ -257,7 +195,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/resources</directory>
@@ -276,7 +214,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../src/main/properties</directory>
@@ -295,7 +233,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/stores</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../src/main/stores</directory>
@@ -310,32 +248,46 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<artifactId>exec-maven-plugin</artifactId>
-				<groupId>org.codehaus.mojo</groupId>
-				<version>1.5.0</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.0.2</version>
 				<executions>
-
 					<execution>
-						<id>Get features</id>
+						<id>unpack sdnc features</id>
 						<phase>generate-sources</phase>
 						<goals>
-							<goal>exec</goal>
+							<goal>unpack-dependencies</goal>
 						</goals>
 						<configuration>
-							<executable>/bin/bash</executable>
-							<environmentVariables>
-								<SDNC_CORE_VERSION>${sdnc.core.version}</SDNC_CORE_VERSION>
-								<SDNC_ADAPTORS_VERSION>${sdnc.adaptors.version}</SDNC_ADAPTORS_VERSION>
-								<SDNC_NORTHBOUND_VERSION>${sdnc.northbound.version}</SDNC_NORTHBOUND_VERSION>
-								<SDNC_PLUGINS_VERSION>${sdnc.plugins.version}</SDNC_PLUGINS_VERSION>
-								<SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION>
-							</environmentVariables>
-							<arguments>
-								<argument>${basedir}/src/main/scripts/installZips.sh</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
-							</arguments>
+							<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+							<excludeTransitive>true</excludeTransitive>
+						</configuration>
+					</execution>
+					<execution>
+						<id>unpack dgs</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc</outputDirectory>
+							<artifactItems>
+								<artifactItem>
+									<groupId>${project.groupId}</groupId>
+									<artifactId>platform-logic-installer</artifactId>
+									<version>${project.version}</version>
+									<type>zip</type>
+								</artifactItem>
+							</artifactItems>
 						</configuration>
 					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>exec-maven-plugin</artifactId>
+				<groupId>org.codehaus.mojo</groupId>
+				<version>1.5.0</version>
+				<executions>
 
 					<execution>
 						<id>change shell permissions</id>
@@ -346,7 +298,7 @@
 						<configuration>
 							<executable>/usr/bin/find</executable>
 							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
 								<argument>-name</argument>
 								<argument>*.sh</argument>
 								<argument>-exec</argument>
@@ -365,6 +317,6 @@
 
 	</build>
 	<organization>
-		<name>openECOMP</name>
+		<name>ONAP</name>
 	</organization>
 </project>