From: Claudio D. Gasparini <claudio.gasparini@intl.att.com>
Date: Wed, 19 May 2021 08:24:21 +0000 (+0200)
Subject: Revert "Change repository variables"
X-Git-Tag: 1.0.0~20
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=4d49a3cf9f6099caeab200ccbe5fd3aff8c3d156;p=oam%2Fnf-oam-adopter.git

Revert "Change repository variables"

Test fix for issues with docker build on jenkins side.

Issue-ID: OAM-209
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@intl.att.com>
Change-Id: I53214657fcbc0299709ea43aaaaf06b553d8abcf
---

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 fa6460b..7ac92c7 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,8 +40,9 @@
         <!--Image properties-->
         <base.image>openjdk:11-jre-slim</base.image>
         <base.config>${project.basedir}/configuration/</base.config>
-        <image.name>o-ran-sc/ves-nf-oam-adopter</image.name>
+        <image.name>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>
@@ -147,11 +148,9 @@
                         <extensions>true</extensions>
                         <configuration>
                             <verbose>true</verbose>
-                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
-                            <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
                             <images>
                                 <image>
-                                    <name>${image.name}:${project.version}</name>
+                                    <name>${nexus.repository}${image.name}</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 cb5c418..b663067 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,6 +89,11 @@
                 <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>