Use o-ran mirror repository

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

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 7ae2bef..25738b6 100644 (file)
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-app/pom.xml
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-app/pom.xml
@@ -148,7 +148,7 @@
                                 <image>
                                     <name>${nexus.repository}${image.name}</name>
                                     <build>
-                                        <from>${base.image}</from>
+                                        <from>${nexus.repository.mirror}${base.image}</from>
                                         <tags>
                                             <tag>${project.version}</tag>
                                         </tags>

diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/pom.xml b/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/pom.xml
index 7c8c356..ecf61cc 100644 (file)
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/pom.xml
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/pom.xml
@@ -136,7 +136,7 @@
                                 <image>
                                     <name>${nexus.repository}${image.name}</name>
                                     <build>
-                                        <from>${base.image}</from>
+                                        <from>${nexus.repository.mirror}${base.image}</from>
                                         <tags>
                                             <tag>${project.version}</tag>
                                         </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 7a74e26..47c8e68 100644 (file)
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-parent/pom.xml
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-parent/pom.xml
@@ -74,9 +74,10 @@
         <spotbugs-maven-plugin.version>4.2.3</spotbugs-maven-plugin.version>
         <swagger-codegen-maven-plugin.version>3.0.25</swagger-codegen-maven-plugin.version>
         <!--Image properties-->
-        <base.image>library/openjdk:11-jre-slim</base.image>
+        <base.image>openjdk:11-jre-slim</base.image>
         <base.config>${project.basedir}/configuration/</base.config>
         <image.workdir>/o-ran-ves-adapter/</image.workdir>
+        <nexus.repository.mirror>nexus3.o-ran-sc.org:10001/</nexus.repository.mirror>
         <nexus.repository>nexus3.o-ran-sc.org:10003/o-ran-sc/</nexus.repository>
     </properties>
 
@@ -89,11 +90,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>