X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=sdnc-a1-controller%2Foam%2Finstallation%2Fsdnc%2Fpom.xml;h=8525571b9dbb6cde10c857770b0b63d1495a533c;hb=81bdaffd323c941da910c258487b7efb78615d6d;hp=2ede17ed0cc76ffa2ab9baacc658332fc120931a;hpb=a79bf9c0271fd1981aa8a6b31360f75f070bec09;p=nonrtric.git

diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
index 2ede17ed..8525571b 100644
--- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml
+++ b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
@@ -20,14 +20,6 @@
 -->
 <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">
 
-	<repositories>
-    		<repository>
-      			<id>onap-releases</id>
-          		<name>onap-releases</name>
-          		<url>https://nexus.onap.org/content/repositories/releases/</url>
-    		</repository>
-  	</repositories>
-
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
@@ -44,30 +36,19 @@
     <description>Creates SDN Controller Docker container</description>
 
     <properties>
-        <image.name>onap/sdnc-aaf-image</image.name>
         <standalone.image.name>o-ran-sc/nonrtric-a1-controller</standalone.image.name>
+	<standalone.image.version>1.7.4-SNAPSHOT</standalone.image.version>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
         <sdnc.northbound.version>1.7.3-SNAPSHOT</sdnc.northbound.version>
         <ccsdk.docker.version>0.6.3</ccsdk.docker.version>
-        <ccsdk.features.version>0.6.3</ccsdk.features.version>
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
         <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass>
         <sdnc.secureport>8443</sdnc.secureport>
-        <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>
 
     <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>nonrt-ric-api-installer</artifactId>
@@ -75,20 +56,6 @@
             <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>
@@ -96,35 +63,11 @@
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>oofpcipoc-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>sdnr-northbound-features-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
-            <type>zip</type>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
 
-
             <plugin>
                 <groupId>org.codehaus.groovy.maven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
@@ -156,13 +99,13 @@
                      <configuration>
                       <images>
                        <image>
-                        <name>${standalone.image.name}:${project.version}</name>
+                        <name>${standalone.image.name}:${standalone.image.version}</name>
                         <build>
                          <cleanup>try</cleanup>
                          <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                          <dockerFile>standalone.Dockerfile</dockerFile>
                          <tags>
-                             <tag>${project.version}</tag>
+                             <tag>${standalone.image.version}</tag>
                          </tags>
                         </build>
                        </image>
@@ -180,13 +123,13 @@
                        <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
                        <images>
                         <image>
-                         <name>${standalone.image.name}:${project.version}</name>
+                         <name>${standalone.image.name}:${standalone.image.version}</name>
                          <build>
                           <cleanup>try</cleanup>
                           <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                           <dockerFile>standalone.Dockerfile</dockerFile>
                           <tags>
-                             <tag>${project.version}</tag>
+                             <tag>${standalone.image.version}</tag>
                           </tags>
                          </build>
                         </image>