Java 17 Upgrade

- change of snapshot versions
- csit fixes
- apk update for openjdk security updates

Issue-ID: POLICY-4667
Change-Id: I0f1044b88db9573886e5c5a14ebabb098128b2f2
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/compose/config/api/apiParameters.yaml b/compose/config/api/apiParameters.yaml
index 36d5391..5758068 100644 (file)
--- a/compose/config/api/apiParameters.yaml
+++ b/compose/config/api/apiParameters.yaml
@@ -41,40 +41,40 @@ database:
 
 policy-preload:
   policyTypes:
-    - policytypes/onap.policies.monitoring.tcagen2.yaml
-    - policytypes/onap.policies.monitoring.tcagen2.v2.yaml
-    - policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
-    - policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml
-    - policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml
-    - policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml
-    - policytypes/onap.policies.Optimization.yaml
-    - policytypes/onap.policies.optimization.Resource.yaml
-    - policytypes/onap.policies.optimization.Service.yaml
-    - policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml
-    - policytypes/onap.policies.optimization.resource.DistancePolicy.yaml
-    - policytypes/onap.policies.optimization.resource.HpaPolicy.yaml
-    - policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml
-    - policytypes/onap.policies.optimization.resource.PciPolicy.yaml
-    - policytypes/onap.policies.optimization.service.QueryPolicy.yaml
-    - policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml
-    - policytypes/onap.policies.optimization.resource.Vim_fit.yaml
-    - policytypes/onap.policies.optimization.resource.VnfPolicy.yaml
-    - policytypes/onap.policies.controlloop.guard.Common.yaml
-    - policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml
-    - policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml
-    - policytypes/onap.policies.controlloop.guard.common.MinMax.yaml
-    - policytypes/onap.policies.controlloop.guard.common.Filter.yaml
-    - policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml
-    - policytypes/onap.policies.Naming.yaml
-    - policytypes/onap.policies.Match.yaml
-    - policytypes/onap.policies.native.Drools.yaml
-    - policytypes/onap.policies.native.Xacml.yaml
-    - policytypes/onap.policies.native.Apex.yaml
-    - policytypes/onap.policies.controlloop.operational.Common.yaml
-    - policytypes/onap.policies.controlloop.operational.common.Apex.yaml
-    - policytypes/onap.policies.controlloop.operational.common.Drools.yaml
+  - policytypes/onap.policies.monitoring.tcagen2.yaml
+  - policytypes/onap.policies.monitoring.tcagen2.v2.yaml
+  - policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
+  - policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml
+  - policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml
+  - policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml
+  - policytypes/onap.policies.Optimization.yaml
+  - policytypes/onap.policies.optimization.Resource.yaml
+  - policytypes/onap.policies.optimization.Service.yaml
+  - policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml
+  - policytypes/onap.policies.optimization.resource.DistancePolicy.yaml
+  - policytypes/onap.policies.optimization.resource.HpaPolicy.yaml
+  - policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml
+  - policytypes/onap.policies.optimization.resource.PciPolicy.yaml
+  - policytypes/onap.policies.optimization.service.QueryPolicy.yaml
+  - policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml
+  - policytypes/onap.policies.optimization.resource.Vim_fit.yaml
+  - policytypes/onap.policies.optimization.resource.VnfPolicy.yaml
+  - policytypes/onap.policies.controlloop.guard.Common.yaml
+  - policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml
+  - policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml
+  - policytypes/onap.policies.controlloop.guard.common.MinMax.yaml
+  - policytypes/onap.policies.controlloop.guard.common.Filter.yaml
+  - policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml
+  - policytypes/onap.policies.Naming.yaml
+  - policytypes/onap.policies.Match.yaml
+  - policytypes/onap.policies.native.Drools.yaml
+  - policytypes/onap.policies.native.Xacml.yaml
+  - policytypes/onap.policies.native.Apex.yaml
+  - policytypes/onap.policies.controlloop.operational.Common.yaml
+  - policytypes/onap.policies.controlloop.operational.common.Apex.yaml
+  - policytypes/onap.policies.controlloop.operational.common.Drools.yaml
   policies:
-    - policies/sdnc.policy.naming.input.tosca.yaml
+  - policies/sdnc.policy.naming.input.tosca.yaml
 
 management:
   endpoints:
@@ -82,5 +82,6 @@ management:
       base-path: /
       exposure:
         include: health,metrics,prometheus
-      path-mapping.metrics: plain-metrics
-      path-mapping.prometheus: metrics
+      path-mapping:
+        -metrics: plain-metrics
+        -prometheus: metrics

diff --git a/compose/config/api/apiParametersPostgres.yaml b/compose/config/api/apiParametersPostgres.yaml
index fea36e8..5163507 100644 (file)
--- a/compose/config/api/apiParametersPostgres.yaml
+++ b/compose/config/api/apiParametersPostgres.yaml
@@ -82,5 +82,6 @@ management:
       base-path: /
       exposure:
         include: health,metrics,prometheus
-      path-mapping.metrics: plain-metrics
-      path-mapping.prometheus: metrics
+      path-mapping:
+        -metrics: plain-metrics
+        -prometheus: metrics

diff --git a/compose/config/pap/papParameters.yaml b/compose/config/pap/papParameters.yaml
index cc59dda..9e8077a 100644 (file)
--- a/compose/config/pap/papParameters.yaml
+++ b/compose/config/pap/papParameters.yaml
@@ -86,5 +86,6 @@ management:
       base-path: /
       exposure:
         include: health, metrics, prometheus
-      path-mapping.metrics: plain-metrics
-      path-mapping.prometheus: metrics
+      path-mapping:
+        -metrics: plain-metrics
+        -prometheus: metrics

diff --git a/compose/config/pap/papParametersPostgres.yaml b/compose/config/pap/papParametersPostgres.yaml
index c46cc52..1959e87 100644 (file)
--- a/compose/config/pap/papParametersPostgres.yaml
+++ b/compose/config/pap/papParametersPostgres.yaml
@@ -86,5 +86,6 @@ management:
       base-path: /
       exposure:
         include: health, metrics, prometheus
-      path-mapping.metrics: plain-metrics
-      path-mapping.prometheus: metrics
+      path-mapping:
+        -metrics: plain-metrics
+        -prometheus: metrics

diff --git a/compose/docker-compose.gui.yml b/compose/docker-compose.gui.yml
index 5a563ae..326ce21 100644 (file)
--- a/compose/docker-compose.gui.yml
+++ b/compose/docker-compose.gui.yml
@@ -27,7 +27,7 @@ services:
        CLAMP_URL: http://policy-clamp-backend:8445
        CLAMP_DISABLE_SSL_VALIDATION: "true"
      ports:
-      - 2445:2445
+      - "2445:2445"
      volumes:
       - ./config/policy-gui/application.yaml:/opt/app/policy/gui/etc/application.yml
       - ./config/policy-gui/logback.xml:/opt/app/policy/gui/etc/logback.xml:ro
@@ -48,7 +48,7 @@ services:
         MARIADB_HOST: mariadb
         RUNTIME_HOST: policy-clamp-runtime-acm
      ports:
-      - 8445:8445
+      - "8445:8445"
      volumes:
       - ./config/clamp/ClampBackend.properties:/opt/policy/clamp/config/ClampBackend.properties:ro
       - ./config/clamp/logback-backend.xml:/opt/policy/clamp/config/logback.xml:ro

diff --git a/compose/docker-compose.postgres.yml b/compose/docker-compose.postgres.yml
index 1824803..4ae9558 100644 (file)
--- a/compose/docker-compose.postgres.yml
+++ b/compose/docker-compose.postgres.yml
@@ -28,7 +28,7 @@ services:
     expose:
       - 5432
     ports:
-      - 5432:5432
+      - "5432:5432"
   policy-db-migrator:
     image: ${CONTAINER_LOCATION}onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
     container_name: policy-db-migrator
@@ -139,7 +139,7 @@ services:
       'pap', '6969'
     ]
   prometheus:
-    image: ${CONTAINER_LOCATION}prom/prometheus:latest
+    image: nexus3.onap.org:10001/prom/prometheus:latest
     container_name: prometheus
     hostname: prometheus
     ports:

diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index e42d8b9..f57dac8 100644 (file)
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -20,7 +20,7 @@
 version: '2'
 services:
    mariadb:
-      image: ${CONTAINER_LOCATION}mariadb:${POLICY_MARIADB_VER}
+      image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800', '--default-authentication-plugin=mysql_native_password']
@@ -29,7 +29,7 @@ services:
          - ./config/db:/docker-entrypoint-initdb.d:ro
          - ./config/clamp/policy-clamp-create-tables.sql:/tmp/policy-clamp-create-tables.sql
       ports:
-       - 3306:3306
+       - "3306:3306"
    policy-db-migrator:
       image: ${CONTAINER_LOCATION}onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
       container_name: policy-db-migrator
@@ -126,7 +126,7 @@ services:
       hostname: policy-xacml-pdp
       ports:
        - ${XACML_PORT}:6969
-       - 30999:3904
+       - "30999:3904"
       volumes:
        - ./config/xacml-pdp/defaultConfig.json:/opt/app/policy/pdpx/etc/defaultConfig.json:ro
        - ./config/xacml-pdp/logback.xml:/opt/app/policy/pdpx/etc/logback.xml:ro
@@ -272,7 +272,7 @@ services:
        - simulator
       hostname: policy-clamp-ac-http-ppnt
       ports:
-       - 30290:6969
+       - "30290:6969"
       volumes:
        - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml
        - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
@@ -289,7 +289,7 @@ services:
        - simulator
       hostname: policy-clamp-ac-k8s-ppnt
       ports:
-       - 30295:6969
+       - "30295:6969"
       volumes:
        - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml
        - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
@@ -325,7 +325,7 @@ services:
        - simulator
       hostname: policy-clamp-ac-a1pms-ppnt
       ports:
-       - 30296:6969
+       - "30296:6969"
       volumes:
        - ./config/clamp/A1pmsParticipantParameters.yaml:/opt/app/policy/clamp/etc/A1pmsParticipantParameters.yaml:ro
        - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
@@ -342,7 +342,7 @@ services:
        - simulator
       hostname: policy-clamp-ac-kserve-ppnt
       ports:
-       - 30297:6969
+       - "30297:6969"
       volumes:
        - ./config/clamp/KserveParticipantParameters.yaml:/opt/app/policy/clamp/etc/KserveParticipantParameters.yaml:ro
        - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
@@ -370,7 +370,7 @@ services:
         'message-router', '3904'
       ]
    prometheus:
-      image: ${CONTAINER_LOCATION}prom/prometheus:latest
+      image: nexus3.onap.org:10001/prom/prometheus:latest
       container_name: prometheus
       hostname: prometheus
       ports:
@@ -378,7 +378,7 @@ services:
       volumes:
        - ./metrics/prometheus.yml:/etc/prometheus/prometheus.yml
    grafana:
-      image: ${CONTAINER_LOCATION}grafana/grafana:latest
+      image: nexus3.onap.org:10001/grafana/grafana:latest
       container_name: grafana
       depends_on:
        - prometheus

diff --git a/compose/export-ports.sh b/compose/export-ports.sh
index 5d64e1f..701449e 100755 (executable)
--- a/compose/export-ports.sh
+++ b/compose/export-ports.sh
@@ -19,13 +19,12 @@
 
 if $(docker images | grep -q "onap\/policy-api")
 then
-    CONTAINER_LOCATION=$(
+    export CONTAINER_LOCATION=$(
         docker images |
         grep onap/policy-api |
         head -1 |
         sed 's/onap\/policy-api.*$//'
     )
-    export CONTAINER_LOCATION
 else
     export CONTAINER_LOCATION="nexus3.onap.org:10001/"
 fi

diff --git a/compose/get-versions.sh b/compose/get-versions.sh
index 85c0d3a..2c11f0e 100755 (executable)
--- a/compose/get-versions.sh
+++ b/compose/get-versions.sh
@@ -2,7 +2,7 @@
 
 # ============LICENSE_START====================================================
 #  Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
-#  Modification Copyright 2021-2022 Nordix Foundation.
+#  Modification Copyright 2021-2023 Nordix Foundation.
 #  Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -107,7 +107,7 @@ function getDockerVersion
 getDockerVersion docker
 export POLICY_DOCKER_VERSION="$docker_image_version"
 
-getDockerVersion models "'policy-models-simulator'" 2.6.4
+getDockerVersion models "'policy-models-simulator'" 3.0.1
 export POLICY_MODELS_VERSION="$docker_image_version"
 
 getDockerVersion api

diff --git a/csit/resources/tests/api-test.robot b/csit/resources/tests/api-test.robot
index 74ea7c4..9bb2254 100644 (file)
--- a/csit/resources/tests/api-test.robot
+++ b/csit/resources/tests/api-test.robot
@@ -108,16 +108,16 @@ Metrics
     [Documentation]  Verify policy-api is exporting prometheus metrics
     ${auth}=  PolicyAdminAuth
     ${resp}=  GetMetrics  ${POLICY_API_IP}  ${auth}  /policy/api/v1/
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="GET",outcome="SUCCESS",status="200",uri="/healthcheck",}
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="GET",outcome="SUCCESS",status="200",uri="/policytypes",} 1.0
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="GET",outcome="SUCCESS",status="200",uri="/policies",} 1.0
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="GET",outcome="SUCCESS",status="200",uri="/policies/{policyId}/versions/{policyVersion}",} 1.0
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="GET",outcome="SUCCESS",status="200",uri="/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies",} 1.0
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="POST",outcome="SUCCESS",status="200",uri="/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies",} 1.0
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="POST",outcome="SUCCESS",status="200",uri="/policytypes",} 1.0
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="DELETE",outcome="SUCCESS",status="200",uri="/policies/{policyId}/versions/{policyVersion}",} 1.0
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="DELETE",outcome="SUCCESS",status="200",uri="/policytypes/{policyTypeId}/versions/{versionId}",} 3.0
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="DELETE",outcome="SUCCESS",status="200",uri="/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="GET",outcome="SUCCESS",status="200",uri="/healthcheck",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="GET",outcome="SUCCESS",status="200",uri="/policytypes",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="GET",outcome="SUCCESS",status="200",uri="/policies",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="GET",outcome="SUCCESS",status="200",uri="/policies/{policyId}/versions/{policyVersion}",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="GET",outcome="SUCCESS",status="200",uri="/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="POST",outcome="SUCCESS",status="200",uri="/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="POST",outcome="SUCCESS",status="200",uri="/policytypes",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="DELETE",outcome="SUCCESS",status="200",uri="/policies/{policyId}/versions/{policyVersion}",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="DELETE",outcome="SUCCESS",status="200",uri="/policytypes/{policyTypeId}/versions/{versionId}",} 3.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="DELETE",outcome="SUCCESS",status="200",uri="/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}",} 1.0
     Should Contain  ${resp.text}  http_server_requests_seconds_sum
     Should Contain  ${resp.text}  http_server_requests_seconds_max
     Should Contain  ${resp.text}  spring_data_repository_invocations_seconds_count

diff --git a/csit/resources/tests/pap-test.robot b/csit/resources/tests/pap-test.robot
index 09c2640..8232843 100644 (file)
--- a/csit/resources/tests/pap-test.robot
+++ b/csit/resources/tests/pap-test.robot
@@ -54,8 +54,8 @@ Metrics
     [Documentation]  Verify policy pap is exporting prometheus metrics
     ${auth}=  PolicyAdminAuth
     ${resp}=  GetMetrics  ${POLICY_PAP_IP}  ${auth}  /policy/pap/v1/
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="GET",outcome="SUCCESS",status="200",uri="/healthcheck",}
-    Should Contain  ${resp.text}  http_server_requests_seconds_count{exception="None",method="GET",outcome="SUCCESS",status="200",uri="/components/healthcheck",} 1.0
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="GET",outcome="SUCCESS",status="200",uri="/healthcheck",}
+    Should Contain  ${resp.text}  http_server_requests_seconds_count{error="none",exception="none",method="GET",outcome="SUCCESS",status="200",uri="/components/healthcheck",} 1.0
     Should Contain  ${resp.text}  spring_data_repository_invocations_seconds_count{exception="None",method="save",repository="PdpGroupRepository",state="SUCCESS",} 1.0
     Should Contain  ${resp.text}  spring_data_repository_invocations_seconds_count{exception="None",method="findByKeyName",repository="PdpGroupRepository",state="SUCCESS",} 1.0
     Should Contain  ${resp.text}  spring_data_repository_invocations_seconds_count{exception="None",method="findAll",repository="PolicyStatusRepository",state="SUCCESS",}

diff --git a/policy-db-migrator/pom.xml b/policy-db-migrator/pom.xml
index f1a1d95..686055f 100644 (file)
--- a/policy-db-migrator/pom.xml
+++ b/policy-db-migrator/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>docker</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-db-migrator</artifactId>
@@ -52,7 +52,6 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -72,7 +71,6 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-
                 <configuration>
                     <verbose>true</verbose>
                     <apiVersion>1.23</apiVersion>
@@ -122,9 +120,6 @@
                             <goal>build</goal>
                             <goal>push</goal>
                         </goals>
-                        <configuration>
-                            <image>${docker.dbm.imagename}</image>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/policy-db-migrator/src/main/docker/Dockerfile b/policy-db-migrator/src/main/docker/Dockerfile
index 49f624b..97f7a65 100644 (file)
--- a/policy-db-migrator/src/main/docker/Dockerfile
+++ b/policy-db-migrator/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #-------------------------------------------------------------------------------
-FROM onap/policy-jre-alpine:3.0.0-SNAPSHOT
+FROM onap/policy-jre-alpine:3.0.1-SNAPSHOT
 
 LABEL maintainer="Policy Team"
 LABEL org.opencontainers.image.title="Policy db-migrator"
@@ -30,7 +30,7 @@ LABEL org.opencontainers.image.created="${git.build.time}"
 LABEL org.opencontainers.image.version="${git.build.version}"
 LABEL org.opencontainers.image.revision="${git.commit.id.abbrev}"
 
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
+ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk
 ENV POLICY_ETC /opt/app/policy/etc
 ENV POLICY_PROFILE /opt/app/policy/etc/profile.d
 ENV POLICY_BIN /opt/app/policy/bin

diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml
index f8a3a82..7f9f84e 100644 (file)
--- a/policy-jdk/alpine/pom.xml
+++ b/policy-jdk/alpine/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>policy-jdk</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
@@ -45,7 +45,6 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>

diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile
index ab856bf..b0a73a9 100644 (file)
--- a/policy-jdk/alpine/src/main/docker/Dockerfile
+++ b/policy-jdk/alpine/src/main/docker/Dockerfile
@@ -18,11 +18,11 @@
 #   SPDX-License-Identifier: Apache-2.0
 #   ============LICENSE_END=========================================================
 
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 LABEL maintainer="Policy Team"
 LABEL org.opencontainers.image.title="Policy JRE Alpine"
-LABEL org.opencontainers.image.description="Policy Java 11 JRE image based on Alpine"
+LABEL org.opencontainers.image.description="Policy Java 17 JRE image based on Alpine"
 LABEL org.opencontainers.image.url="https://github.com/onap/policy-docker"
 LABEL org.opencontainers.image.vendor="ONAP Policy Team"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
@@ -44,11 +44,12 @@ ARG group=onap
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 # Generic additions
-RUN apk add --no-cache \
+RUN apk update && \
+    apk add --no-cache \
         libretls \
         musl-locales \
         musl-locales-lang \
-        openjdk11-jdk \
+        openjdk17-jdk \
         openssl \
         ca-certificates && \
     rm -rf /var/cache/apk/* && \

diff --git a/policy-jdk/pom.xml b/policy-jdk/pom.xml
index 8c150a6..7d7d652 100644 (file)
--- a/policy-jdk/pom.xml
+++ b/policy-jdk/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>docker</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-jdk</artifactId>

diff --git a/policy-jre/alpine/pom.xml b/policy-jre/alpine/pom.xml
index 1dde8bc..e606f7e 100644 (file)
--- a/policy-jre/alpine/pom.xml
+++ b/policy-jre/alpine/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>policy-jre</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
@@ -45,7 +45,6 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>prepare-package</phase>

diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile
index f1bf249..d8af19f 100644 (file)
--- a/policy-jre/alpine/src/main/docker/Dockerfile
+++ b/policy-jre/alpine/src/main/docker/Dockerfile
@@ -18,11 +18,11 @@
 #   SPDX-License-Identifier: Apache-2.0
 #   ============LICENSE_END=========================================================
 
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 LABEL maintainer="Policy Team"
 LABEL org.opencontainers.image.title="Policy JRE Alpine"
-LABEL org.opencontainers.image.description="Policy Java 11 JRE image based on Alpine"
+LABEL org.opencontainers.image.description="Policy Java 17 JRE image based on Alpine"
 LABEL org.opencontainers.image.url="https://github.com/onap/policy-docker"
 LABEL org.opencontainers.image.vendor="ONAP Policy Team"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
@@ -43,11 +43,12 @@ ARG group=onap
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 # Generic additions
-RUN apk add --no-cache \
+RUN apk update && \
+    apk add --no-cache \
         libretls \
         musl-locales \
         musl-locales-lang \
-        openjdk11-jre \
+        openjdk17-jre \
         openssl \
         ca-certificates && \
     rm -rf /var/cache/apk/* && \

diff --git a/policy-jre/pom.xml b/policy-jre/pom.xml
index e75daf9..3dbe28f 100644 (file)
--- a/policy-jre/pom.xml
+++ b/policy-jre/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>docker</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-jre</artifactId>

diff --git a/pom.xml b/pom.xml
index c21c574..090b58a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.policy.docker</groupId>
     <artifactId>docker</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.1-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <name>policy-docker</name>

diff --git a/version.properties b/version.properties
index 4ba0a9a..3288dcd 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 minor=3
 minor=0
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}