X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=sdnc-a1-controller%2Foam%2Finstallation%2Fsdnc%2Fpom.xml;h=9e6b65a860dbd6ee98d1ed97f51937200f7a92d3;hb=0da7354bf7548829a7152dfa0276710dbbe00b7b;hp=352fe172e4dbbc894c1312bbd5087e387a385808;hpb=8274ad7787adec74b7639465827fa44b99ba64c9;p=nonrtric.git

diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
index 352fe172..9e6b65a8 100644
--- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml
+++ b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+   Modifications Copyright (C) 2019 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
 <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>
@@ -26,7 +45,7 @@
 
     <properties>
         <image.name>onap/sdnc-aaf-image</image.name>
-        <standalone.image.name>nonrtric-a1-controller</standalone.image.name>
+        <standalone.image.name>o-ran-sc/nonrtric-a1-controller</standalone.image.name>
         <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>
@@ -42,13 +61,6 @@
     </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>
@@ -56,20 +68,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>
@@ -77,7 +75,6 @@
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>
-
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>oofpcipoc-installer</artifactId>
@@ -85,7 +82,6 @@
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>
-
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>sdnr-northbound-features-installer</artifactId>
@@ -137,15 +133,13 @@
                      <configuration>
                       <images>
                        <image>
-                        <name>${standalone.image.name}</name>
+                        <name>${standalone.image.name}:${project.version}</name>
                         <build>
                          <cleanup>try</cleanup>
                          <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                          <dockerFile>standalone.Dockerfile</dockerFile>
                          <tags>
-                             <tag>${project.docker.latestminortag.version}</tag>
-                             <tag>${project.docker.latestfulltag.version}</tag>
-                             <tag>${project.docker.latesttagtimestamp.version}</tag>
+                             <tag>${project.version}</tag>
                          </tags>
                         </build>
                        </image>
@@ -163,15 +157,13 @@
                        <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
                        <images>
                         <image>
-                         <name>${standalone.image.name}</name>
+                         <name>${standalone.image.name}:${project.version}</name>
                          <build>
                           <cleanup>try</cleanup>
                           <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                           <dockerFile>standalone.Dockerfile</dockerFile>
                           <tags>
-                             <tag>${project.docker.latestminortag.version}</tag>
-                             <tag>${project.docker.latestfulltag.version}</tag>
-                             <tag>${project.docker.latesttagtimestamp.version}</tag>
+                             <tag>${project.version}</tag>
                           </tags>
                          </build>
                         </image>