From fdbd89ed0c57f370f6ba3e6390f4b523c965fb9c Mon Sep 17 00:00:00 2001
From: Alexander Mazuruk <a.mazuruk@samsung.com>
Date: Thu, 18 Feb 2021 16:07:04 +0100
Subject: Unify integration-* image usage

Some Dockerfiles in this repositry had nexus host provided, some
didn't. Now all do.

Additionally switched to latest tag which follows current recommendation
by seccom.

Issue-ID: INT-1864
Issue-ID: DCAEGEN2-2420
Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com>
Change-Id: I2501adfef69718658fa82d85a035a050a295f402
---
 mod2/auth-service/Dockerfile    | 4 ++--
 mod2/auth-service/pom.xml       | 3 ++-
 mod2/catalog-service/Dockerfile | 2 +-
 mod2/catalog-service/pom.xml    | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mod2/auth-service/Dockerfile b/mod2/auth-service/Dockerfile
index b125fc0..5c03a87 100644
--- a/mod2/auth-service/Dockerfile
+++ b/mod2/auth-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/integration-java11:7.1.0
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 WORKDIR /usr/app
 VOLUME /tmp
 
@@ -11,4 +11,4 @@ COPY ${PROJECT_BUILD_DIR_NAME}/${FINAL_JAR} .
 
 ENTRYPOINT ["java", \
             "-Djava.security.egd=file:/dev/./urandom", \
-            "-jar", "mod-auth-service.jar"]
\ No newline at end of file
+            "-jar", "mod-auth-service.jar"]
diff --git a/mod2/auth-service/pom.xml b/mod2/auth-service/pom.xml
index b1135c5..b25fe99 100644
--- a/mod2/auth-service/pom.xml
+++ b/mod2/auth-service/pom.xml
@@ -5,6 +5,7 @@
   ~  *  org.onap.dcae
   ~  *  ================================================================================
   ~  *  Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+  ~  *  Copyright (c) 2021 Samsung Electronics. All rights reserved.
   ~  *  ================================================================================
   ~  *  Licensed under the Apache License, Version 2.0 (the "License");
   ~  *  you may not use this file except in compliance with the License.
@@ -31,7 +32,7 @@
 	</parent>
 	<groupId>org.onap.dcaegen2.platform.mod</groupId>
 	<artifactId>auth-service</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<name>auth-service</name>
 	<description>REST APIs to serve Auth Service</description>
 
diff --git a/mod2/catalog-service/Dockerfile b/mod2/catalog-service/Dockerfile
index 0870a21..8e5134b 100644
--- a/mod2/catalog-service/Dockerfile
+++ b/mod2/catalog-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/integration-java11:7.1.0
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
 ARG PROJECT_BUILD_DIR_NAME
 ARG FINAL_JAR
diff --git a/mod2/catalog-service/pom.xml b/mod2/catalog-service/pom.xml
index 992f149..7f60632 100644
--- a/mod2/catalog-service/pom.xml
+++ b/mod2/catalog-service/pom.xml
@@ -4,6 +4,7 @@
   ~  org.onap.dcae
   ~  ================================================================================
   ~  Copyright (c) 2020-2021 AT&T Intellectual Property. All rights reserved.
+  ~  Copyright (c) 2021 Samsung Electronics. All rights reserved.
   ~  ================================================================================
   ~  Licensed under the Apache License, Version 2.0 (the "License");
   ~  you may not use this file except in compliance with the License.
@@ -30,7 +31,7 @@
     </parent>
     <groupId>org.onap.dcaegen2.platform.mod</groupId>
     <artifactId>catalog-service</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
 
     <properties>
         <java.version>11</java.version>
@@ -209,4 +210,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
\ No newline at end of file
+</project>
-- 
cgit 1.2.3-korg