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>

9 files changed, 61 insertions, 58 deletions

diff --git a/compose/config/api/apiParameters.yaml b/compose/config/api/apiParameters.yaml
index 36d53915..5758068e 100644
--- 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 fea36e87..51635074 100644
--- 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 cc59dda5..9e8077a7 100644
--- 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 c46cc528..1959e877 100644
--- 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 5a563ae0..326ce217 100644
--- 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 18248030..4ae95582 100644
--- 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 e42d8b90..f57dac80 100644
--- 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 5d64e1f9..701449e0 100755
--- 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 85c0d3ac..2c11f0e1 100755
--- 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