From 1619a148ae617d1c80ea90468fe3d27c1510d1dd Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 6 Feb 2024 13:25:04 +0100 Subject: [PATCH] Switch aai-common baseimage back to java 8 - downgrade base image to java 8 until aai-common is compatible with java 11 Issue-ID: AAI-3766 Signed-off-by: Fiete Ostkamp Change-Id: I90505b6a15b92fcf983e6444b60523574b2d2388 --- aai-aaf-auth/pom.xml | 2 +- aai-annotations/pom.xml | 2 +- aai-auth/pom.xml | 2 +- aai-common-docker/aai-common-images/pom.xml | 4 ++-- aai-common-docker/aai-common-images/src/main/docker/Dockerfile.alpine | 2 +- aai-common-docker/aai-haproxy-image/pom.xml | 4 ++-- aai-common-docker/pom.xml | 2 +- aai-core/pom.xml | 2 +- aai-els-onap-logging/pom.xml | 2 +- aai-failover/pom.xml | 2 +- aai-parent/pom.xml | 2 +- aai-rest/pom.xml | 2 +- aai-schema-abstraction/pom.xml | 2 +- aai-schema-ingest/pom.xml | 2 +- aai-utils/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/aai-aaf-auth/pom.xml b/aai-aaf-auth/pom.xml index 59374933..9e69e603 100644 --- a/aai-aaf-auth/pom.xml +++ b/aai-aaf-auth/pom.xml @@ -6,7 +6,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml aai-aaf-auth diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index c77ccc3e..60fa4eb3 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml aai-annotations diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index 5f92b811..3922d6cf 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml aai-auth diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml index 59668bee..4cb93653 100644 --- a/aai-common-docker/aai-common-images/pom.xml +++ b/aai-common-docker/aai-common-images/pom.xml @@ -25,11 +25,11 @@ org.onap.aai.aai-common aai-common-docker - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT aai-common-images - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT pom aai-aai-common-images Contains dockerfiles for aai-common images (alpine and ubuntu based). diff --git a/aai-common-docker/aai-common-images/src/main/docker/Dockerfile.alpine b/aai-common-docker/aai-common-images/src/main/docker/Dockerfile.alpine index 1cdd580f..805d2f69 100644 --- a/aai-common-docker/aai-common-images/src/main/docker/Dockerfile.alpine +++ b/aai-common-docker/aai-common-images/src/main/docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:jre-11.0.9_11-alpine +FROM eclipse-temurin:8-jre-alpine # For building the image in a proxy environment if necessary ARG HTTP_PROXY diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml index d2b63f8f..f77f4ef8 100644 --- a/aai-common-docker/aai-haproxy-image/pom.xml +++ b/aai-common-docker/aai-haproxy-image/pom.xml @@ -25,11 +25,11 @@ org.onap.aai.aai-common aai-common-docker - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT aai-haproxy-image - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT pom aai-aai-haproxy-image Contains dockerfiles for aai-haproxy image. diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml index deb3ba22..e0e29fe2 100644 --- a/aai-common-docker/pom.xml +++ b/aai-common-docker/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 682aac7d..348d4eb0 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -26,7 +26,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml aai-core diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml index 0b2ea682..820925ad 100644 --- a/aai-els-onap-logging/pom.xml +++ b/aai-els-onap-logging/pom.xml @@ -4,7 +4,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml aai-els-onap-logging diff --git a/aai-failover/pom.xml b/aai-failover/pom.xml index 5976c347..32a3c49f 100644 --- a/aai-failover/pom.xml +++ b/aai-failover/pom.xml @@ -5,7 +5,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml 4.0.0 diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index 5378bd18..72c907bf 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -27,7 +27,7 @@ limitations under the License. org.onap.aai.aai-common aai-common - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT aai-parent aai-parent diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index 2fa5677b..252c2837 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -29,7 +29,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml aai-rest diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml index 87d63199..24737ec5 100644 --- a/aai-schema-abstraction/pom.xml +++ b/aai-schema-abstraction/pom.xml @@ -28,7 +28,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index 2c4ab11d..14706af8 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -26,7 +26,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml aai-schema-ingest diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index bd7ba268..e48e4c23 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT ../aai-parent/pom.xml aai-utils diff --git a/pom.xml b/pom.xml index c6c98a1a..fa17a6d0 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.aai-common aai-common - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT pom aai-aai-common Contains all of the common code for resources and traversal repos diff --git a/version.properties b/version.properties index 4cf90139..c5bbf546 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=13 -patch_version=3 +patch_version=4 base_version=${major_version}.${minor_version}.${patch_version} -- 2.16.6