From 1dd9578b9109223a957fd1bfd1ded4f00d072614 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 26 Jul 2023 10:30:18 -0400
Subject: [PATCH] Update ccsdk/distribution for ODL Argon

Update ccsdk/distribution to use OpenDaylight Argon release

Issue-ID: CCSDK-3926
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I52287f7f0f12dd920ed4d4bb9c7034b7f72078a8
---
 .gitignore                                         |  4 ++++
 alpine/java17/pom.xml                              | 20 +++++++++++++++++++
 alpine/java17/src/main/docker/Dockerfile           | 23 ++++++++++++++++------
 .../src/main/resources/README-custom-certs.md      |  3 +++
 dependencies/pom.xml                               |  2 +-
 odlsli/odlsli-alpine/pom.xml                       |  2 +-
 pom.xml                                            |  4 ++--
 7 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 alpine/java17/src/main/resources/README-custom-certs.md

diff --git a/.gitignore b/.gitignore
index 4ca286c2..4a62595f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,7 @@ blackDuckHubProjectVersionName.txt
 
 # Generated dependency list
 direct-dependencies.txt
+
+# Ignore pems - these are only intended to aid in local compiles
+# and should not be shared
+*.pem
diff --git a/alpine/java17/pom.xml b/alpine/java17/pom.xml
index 5c590f6b..8a09a0be 100644
--- a/alpine/java17/pom.xml
+++ b/alpine/java17/pom.xml
@@ -64,6 +64,26 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-certificates</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>*.pem</include>
+                                        <include>*.md</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/alpine/java17/src/main/docker/Dockerfile b/alpine/java17/src/main/docker/Dockerfile
index 192d618b..5018e1af 100644
--- a/alpine/java17/src/main/docker/Dockerfile
+++ b/alpine/java17/src/main/docker/Dockerfile
@@ -3,16 +3,27 @@ FROM ${base.image}:${base.image.version}
 MAINTAINER CCSDK  Team (onap-ccsdk@lists.onap.org)
 USER root
 
-ARG HTTP_PROXY
-ARG HTTPS_PROXY
+ARG http_proxy
+ARG https_proxy
+ARG no_proxy
 
-ENV HTTP_PROXY  ${HTTP_PROXY}
-ENV http_proxy  ${HTTP_PROXY}
-ENV HTTPS_PROXY ${HTTPS_PROXY}
-ENV https_proxy ${HTTPS_PROXY}
+ENV HTTP_PROXY $http_proxy
+ENV http_proxy $http_proxy
+ENV HTTPS_PROXY $https_proxy
+ENV https_proxy $https_proxy
+ENV NO_PROXY $no_proxy
+ENV no_proxy $no_proxy
 
 ENV JAVA_HOME /opt/java/openjdk
 
+# Copy any certs
+COPY *.md *.pem /etc/ssl/certs/
+
+# Install certs
+RUN update-ca-certificates
+
+RUN echo "http_proxy = $http_proxy" && echo "https_proxy = $https_proxy" && echo "no_proxy = $no_proxy" &&  echo "HTTP_PROXY = $HTTP_PROXY" &&  echo "HTTPS_PROXY = $HTTPS_PROXY" && echo "NO_PROXY = $NO_PROXY"
+
 # Add tools needed for OpenDaylight
 RUN apk update && apk --no-cache add sudo bash iputils openssl git mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss
 
diff --git a/alpine/java17/src/main/resources/README-custom-certs.md b/alpine/java17/src/main/resources/README-custom-certs.md
new file mode 100644
index 00000000..ac414c11
--- /dev/null
+++ b/alpine/java17/src/main/resources/README-custom-certs.md
@@ -0,0 +1,3 @@
+Any .pem files in this directory will be copied to /etc/ssl/certs on the
+docker container and installed prior to running apk.  This might be needed,
+for example, for docker builds to work properly behind a corporate firewall.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 4d989c7f..3b18df4a 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -216,7 +216,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
-            <version>2.16</version>
+            <version>2.18.0</version>
         </dependency>
     </dependencies>
 
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 30c7a906..8d7b69a2 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -18,7 +18,7 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-chlorine-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-argon-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
diff --git a/pom.xml b/pom.xml
index 62c40807..8766bac6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.5.4</version>
+        <version>2.6.0</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
@@ -31,7 +31,7 @@
 
     <properties>
         <application.name>distribution</application.name>
-        <ccsdk.sli.version>1.6.2</ccsdk.sli.version>
+        <ccsdk.sli.version>1.7.1-SNAPSHOT</ccsdk.sli.version>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>
 
-- 
2.16.6