diff options
author | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-02-06 13:25:04 +0100 |
---|---|---|
committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-02-06 13:25:04 +0100 |
commit | 1619a148ae617d1c80ea90468fe3d27c1510d1dd (patch) | |
tree | 071b9d17f28b8d33d2702046e3ce66f194584234 | |
parent | 62b1841e39516c8fd51b7b00f8ece02778f6d9b4 (diff) |
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 <Fiete.Ostkamp@telekom.de>
Change-Id: I90505b6a15b92fcf983e6444b60523574b2d2388
-rw-r--r-- | aai-aaf-auth/pom.xml | 2 | ||||
-rw-r--r-- | aai-annotations/pom.xml | 2 | ||||
-rw-r--r-- | aai-auth/pom.xml | 2 | ||||
-rw-r--r-- | aai-common-docker/aai-common-images/pom.xml | 4 | ||||
-rw-r--r-- | aai-common-docker/aai-common-images/src/main/docker/Dockerfile.alpine | 2 | ||||
-rw-r--r-- | aai-common-docker/aai-haproxy-image/pom.xml | 4 | ||||
-rw-r--r-- | aai-common-docker/pom.xml | 2 | ||||
-rw-r--r-- | aai-core/pom.xml | 2 | ||||
-rw-r--r-- | aai-els-onap-logging/pom.xml | 2 | ||||
-rw-r--r-- | aai-failover/pom.xml | 2 | ||||
-rw-r--r-- | aai-parent/pom.xml | 2 | ||||
-rw-r--r-- | aai-rest/pom.xml | 2 | ||||
-rw-r--r-- | aai-schema-abstraction/pom.xml | 2 | ||||
-rw-r--r-- | aai-schema-ingest/pom.xml | 2 | ||||
-rw-r--r-- | aai-utils/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-aaf-auth</artifactId> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-annotations</artifactId> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-auth</artifactId> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common-docker</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> </parent> <artifactId>aai-common-images</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-aai-common-images</name> <description>Contains dockerfiles for aai-common images (alpine and ubuntu based).</description> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common-docker</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> </parent> <artifactId>aai-haproxy-image</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-aai-haproxy-image</name> <description>Contains dockerfiles for aai-haproxy image.</description> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> 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. <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-core</artifactId> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-els-onap-logging</artifactId> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> 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. <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> </parent> <artifactId>aai-parent</artifactId> <name>aai-parent</name> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-rest</artifactId> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> 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. <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-schema-ingest</artifactId> 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 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-utils</artifactId> @@ -30,7 +30,7 @@ <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.13.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-aai-common</name> <description>Contains all of the common code for resources and traversal repos</description> 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} |