From e59a187d491aebaf78452bd7022a345e50737ba9 Mon Sep 17 00:00:00 2001
From: "Claudio D. Gasparini" <claudio.gasparini@intl.att.com>
Date: Tue, 18 May 2021 17:32:08 +0200
Subject: [PATCH] Change repository variables

Issue-ID: OAM-209
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@intl.att.com>
Change-Id: I9e9da7ee03ff93789996034d51a48da572cd0ea8
---
 ves-nf-oam-adopter/ves-nf-oam-adopter-app/pom.xml    | 7 ++++---
 ves-nf-oam-adopter/ves-nf-oam-adopter-parent/pom.xml | 5 -----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-app/pom.xml b/ves-nf-oam-adopter/ves-nf-oam-adopter-app/pom.xml
index 7ac92c7..fa6460b 100644
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-app/pom.xml
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-app/pom.xml
@@ -40,9 +40,8 @@
         <!--Image properties-->
         <base.image>openjdk:11-jre-slim</base.image>
         <base.config>${project.basedir}/configuration/</base.config>
-        <image.name>ves-nf-oam-adopter</image.name>
+        <image.name>o-ran-sc/ves-nf-oam-adopter</image.name>
         <image.workdir>/o-ran-ves-adapter/</image.workdir>
-        <nexus.repository>nexus3.o-ran-sc.org:10003/o-ran-sc/</nexus.repository>
     </properties>
 
     <dependencies>
@@ -148,9 +147,11 @@
                         <extensions>true</extensions>
                         <configuration>
                             <verbose>true</verbose>
+                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
+                            <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
                             <images>
                                 <image>
-                                    <name>${nexus.repository}${image.name}</name>
+                                    <name>${image.name}:${project.version}</name>
                                     <build>
                                         <from>${base.image}</from>
                                         <tags>
diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-parent/pom.xml b/ves-nf-oam-adopter/ves-nf-oam-adopter-parent/pom.xml
index b663067..cb5c418 100644
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-parent/pom.xml
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-parent/pom.xml
@@ -89,11 +89,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>io.swagger.core.v3</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger-annotations.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-- 
2.16.6