X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fpom.xml;h=d2e2f9e7a8d58ed6407bf6cd00304a4ce4a69b1b;hp=d9aa5a2b27a62111f204089c6e146449323cb069;hb=df200d2e8a26683b2b2fe526c667eec281277543;hpb=9cad35bcef917ed7e01f9363cfe8b7c79d36be81

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index d9aa5a2b..d2e2f9e7 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath />
 	</parent>
 
 	<groupId>org.onap.ccsdk.distribution</groupId>
 	<artifactId>distribution-odlsli</artifactId>
-	<version>0.3.0-SNAPSHOT</version>
+	<version>0.3.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-distribution :: odlsli</name>
@@ -25,14 +25,23 @@
 	<properties>
 		<image.name>onap/ccsdk-odlsli-image</image.name>
 		<ccsdk.project.version>${project.version}</ccsdk.project.version>
+		<ccsdk.features.version>${project.version}</ccsdk.features.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<opendaylight.root>opt/opendaylight</opendaylight.root>
 		<docker.push.phase>deploy</docker.push.phase>
 		<docker.verbose>true</docker.verbose>
+		<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>dependencies</artifactId>
+			<version>${project.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
 
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.core</groupId>
@@ -111,6 +120,13 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
+			<artifactId>netbox-client-installer</artifactId>
+			<version>${ccsdk.sli.adaptors.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
 			<artifactId>sql-resource-installer</artifactId>
@@ -167,6 +183,20 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.sli.plugins</groupId>
+			<artifactId>restconf-client-installer</artifactId>
+			<version>${ccsdk.sli.plugins.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.sli.plugins</groupId>
+			<artifactId>sshapi-call-node-installer</artifactId>
+			<version>${ccsdk.sli.plugins.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.plugins</groupId>
 			<artifactId>sliplugins-features-installer</artifactId>
@@ -174,9 +204,31 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.features</groupId>
+			<artifactId>features-installer</artifactId>
+			<version>${ccsdk.features.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.features</groupId>
+			<artifactId>blueprints-processor-installer</artifactId>
+			<version>${ccsdk.features.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
 	</dependencies>
 
 	<build>
+	<extensions>
+		<extension>
+			<!-- this extension is required by wagon in order to pass the proxy -->
+			<groupId>org.apache.maven.wagon</groupId>
+			<artifactId>wagon-http-lightweight</artifactId>
+			<version>2.2</version>
+		</extension>
+	</extensions>
 		<plugins>
 
 
@@ -197,7 +249,8 @@
 								    versionArray = project.properties['ccsdk.project.version'].split('\\.');
 								}
 
-								if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) {
+								if (project.properties['ccsdk.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";
@@ -271,6 +324,7 @@
 										<include>idmlight.db.mv.db</include>
 										<include>org.ops4j.pax.logging.cfg</include>
 										<include>install_ccsdk.yml</include>
+										<include>ansible-sources.list</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>