From 6302edb304f69068b108a69001d69bc6213b6a6a Mon Sep 17 00:00:00 2001
From: Alexander Mazuruk <a.mazuruk@samsung.com>
Date: Thu, 18 Feb 2021 17:01:57 +0100
Subject: [PATCH] Change openjdk baseOS img to integration-java11

Benefits from switching over:
* minimal {java11,python} images maintained by integration team
* using currently "blessed by seccom" versions (:latest tag used)
* should limit spread of legal issues across layers
* integration images will be the first to have automated compliance
  documentation
* should limit spread of base layers (contributing to deployment
  footprint - more base layers = more to download, more to store etc...)

Issue-ID: INT-1864
Issue-ID: DCAEGEN2-2420
Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com>
Change-Id: I272dee1761e293b57f5c9df76f873d86f012a2ab
---
 dcae-analytics/dcae-analytics-model/pom.xml      |  3 +-
 dcae-analytics/dcae-analytics-tca-core/pom.xml   |  3 +-
 dcae-analytics/dcae-analytics-tca-model/pom.xml  |  3 +-
 dcae-analytics/dcae-analytics-tca-web/Dockerfile | 35 ++++++++++++------------
 dcae-analytics/dcae-analytics-tca-web/pom.xml    |  3 +-
 dcae-analytics/dcae-analytics-test/pom.xml       |  3 +-
 dcae-analytics/dcae-analytics-web/pom.xml        |  3 +-
 dcae-analytics/pom.xml                           |  3 +-
 dcae-analytics/version.properties                |  5 ++--
 eelf-logger/eelf-logger-api/pom.xml              |  3 +-
 eelf-logger/eelf-logger-logback-impl/pom.xml     |  3 +-
 eelf-logger/eelf-logger-model/pom.xml            |  3 +-
 eelf-logger/pom.xml                              |  3 +-
 pom.xml                                          |  3 +-
 version.properties                               |  4 +--
 15 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml
index 75898e7..96f235d 100644
--- a/dcae-analytics/dcae-analytics-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-model/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018 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.
@@ -27,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml
index 64ea595..81a97f1 100644
--- a/dcae-analytics/dcae-analytics-tca-core/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-core/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018-2019 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.
@@ -27,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-core</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-model/pom.xml b/dcae-analytics/dcae-analytics-tca-model/pom.xml
index 9343142..0510883 100644
--- a/dcae-analytics/dcae-analytics-tca-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-model/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018 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.
@@ -27,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-web/Dockerfile b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
index 411b6b1..2791e03 100644
--- a/dcae-analytics/dcae-analytics-tca-web/Dockerfile
+++ b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
@@ -1,9 +1,4 @@
-# NOTE: This Dockerfile is auto generated and filtered via maven resources plugin.
-# Edits to generated Dockerfile will NOT be saved.
-# Only changes made in docker/Dockerfile template file will be persistent
-# ==========================================================================
-
-FROM openjdk:11-jre-slim
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
 MAINTAINER Rajiv Singla <rs153v@att.com>
 
@@ -11,22 +6,26 @@ ARG PROJECT_BUILD_DIR_NAME
 ARG FINAL_JAR
 ARG DEPENDENCIES_DIR
 ARG DOCKER_ARTIFACT_DIR
+ARG user=tca-gen2
+ARG group=tca-gen2
 
-RUN mkdir -p /var/log/ONAP/dcaegen2/analytics/tca-gen2
-#Add a new user and group to allow container to be run as non-root
-RUN groupadd tca-gen2 && useradd -g tca-gen2 tca-gen2; \
-    chmod a+rwx /opt; \
-    chmod a+rwx /var/log/ONAP/dcaegen2/analytics/tca-gen2; \
-    chown -R tca-gen2:tca-gen2 /opt; \
-    chown -R tca-gen2:tca-gen2 /var/log/ONAP/dcaegen2/analytics/tca-gen2
-
-#Copy dependencies and executable jar
 WORKDIR ${DOCKER_ARTIFACT_DIR}
+#Copy dependencies and executable jar
 COPY ${PROJECT_BUILD_DIR_NAME}/${FINAL_JAR} .
-#Overcome Docker limitation to put ARG inside ENTRYPOINT
-RUN ln -s ${FINAL_JAR} tca-gen2.jar
+
+USER root
+
+#Symlink to overcome Docker limitation to put ARG inside ENTRYPOINT
+RUN mkdir -p /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \
+    addgroup $group && adduser --system --disabled-password --no-create-home --ingroup $group $user && \
+    chmod g+rwx /opt; \
+    chmod u+rw /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \
+    chown -R $user /opt && \
+    chown -R $user /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \
+    ln -s ${FINAL_JAR} tca-gen2.jar && \
+    chown $user ${FINAL_JAR} tca-gen2.jar
 
 EXPOSE 8100
 
-USER tca-gen2:tca-gen2
+USER $user
 ENTRYPOINT ["java", "-Dspring.profiles.active=configBindingService,dmaap,mongo", "-jar", "tca-gen2.jar"]
diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 3d4784d..86d332f 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+  ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
   ~ ================================================================================
   ~ Modifications Copyright (C) 2019 IBM
   ~ ================================================================================
@@ -29,7 +30,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-web</artifactId>
diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml
index c705e15..5102cc6 100644
--- a/dcae-analytics/dcae-analytics-test/pom.xml
+++ b/dcae-analytics/dcae-analytics-test/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018 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.
@@ -27,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-test</artifactId>
diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml
index c217c93..4d7efb7 100644
--- a/dcae-analytics/dcae-analytics-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-web/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018-2019 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.
@@ -27,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-web</artifactId>
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index 7f8d169..4f8fc42 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018-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.
@@ -27,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>tca-gen2-parent</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics</artifactId>
diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties
index d67f858..b1893d0 100644
--- a/dcae-analytics/version.properties
+++ b/dcae-analytics/version.properties
@@ -1,6 +1,7 @@
 #
 # ================================================================================
 # Copyright (c) 2018 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.
@@ -17,8 +18,8 @@
 #
 #
 major=1
-minor=2
-patch=2
+minor=3
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
diff --git a/eelf-logger/eelf-logger-api/pom.xml b/eelf-logger/eelf-logger-api/pom.xml
index c827e98..00fa5cb 100644
--- a/eelf-logger/eelf-logger-api/pom.xml
+++ b/eelf-logger/eelf-logger-api/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018 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.
@@ -27,7 +28,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-api</artifactId>
diff --git a/eelf-logger/eelf-logger-logback-impl/pom.xml b/eelf-logger/eelf-logger-logback-impl/pom.xml
index 3e1e43b..399077d 100644
--- a/eelf-logger/eelf-logger-logback-impl/pom.xml
+++ b/eelf-logger/eelf-logger-logback-impl/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018 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.
@@ -27,7 +28,7 @@
     <parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-logback-impl</artifactId>
diff --git a/eelf-logger/eelf-logger-model/pom.xml b/eelf-logger/eelf-logger-model/pom.xml
index 45fd2c2..8458548 100644
--- a/eelf-logger/eelf-logger-model/pom.xml
+++ b/eelf-logger/eelf-logger-model/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018 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.
@@ -27,7 +28,7 @@
     <parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-model</artifactId>
diff --git a/eelf-logger/pom.xml b/eelf-logger/pom.xml
index c8ab5fd..472a715 100644
--- a/eelf-logger/pom.xml
+++ b/eelf-logger/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018-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.
@@ -26,7 +27,7 @@
 	<parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
 		<artifactId>tca-gen2-parent</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
     <artifactId>eelf-logger</artifactId>
diff --git a/pom.xml b/pom.xml
index 581c587..e610942 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ~ ================================================================================
   ~ Copyright (c) 2018 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.
@@ -28,7 +29,7 @@
 
     <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
     <artifactId>tca-gen2-parent</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
 
     <name>dcaegen2-analytics-tca-gen2</name>
     <packaging>pom</packaging>
diff --git a/version.properties b/version.properties
index 152260f..7d6815b 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
-minor=2
-patch=2
+minor=3
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
2.16.6