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>

2 files changed, 39 insertions, 37 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