From 31ca2726a8bbff08c6af04f032b88cae810c97f0 Mon Sep 17 00:00:00 2001
From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com>
Date: Tue, 16 May 2023 15:41:35 +0200
Subject: [PATCH] [ACS-5192] Upgrade Repository Components to Java 17 (#1919)

---
 amps/ags/rm-community/rm-community-repo/.env     | 2 +-
 amps/ags/rm-community/rm-community-repo/pom.xml  | 4 ++--
 packaging/tests/environment/.env                 | 2 +-
 packaging/tests/tas-cmis/pom.xml                 | 4 ++--
 packaging/tests/tas-restapi/pom.xml              | 4 ++--
 pom.xml                                          | 2 +-
 scripts/ci/docker-compose/docker-compose-db.yaml | 2 +-
 scripts/ci/docker-compose/docker-compose.yaml    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env
index 443245722d..488c6703e7 100644
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.7-A5
 POSTGRES_TAG=14.4
-ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
+ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index 67d142f449..f5a1fd0aea 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -436,7 +436,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre11-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>
@@ -507,7 +507,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre11-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>
diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env
index 443245722d..488c6703e7 100644
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.7-A5
 POSTGRES_TAG=14.4
-ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
+ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index eaf6f12e15..244fef4889 100644
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -16,12 +16,12 @@
     </organization>
 
     <properties>
-        <maven.build.sourceVersion>11</maven.build.sourceVersion>
+        <maven.build.sourceVersion>17</maven.build.sourceVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <chemistry-opencmis-commons-api>1.1.0</chemistry-opencmis-commons-api>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <maven-release.version>2.5.3</maven-release.version>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <suiteXmlFile>${project.basedir}/src/test/resources/cmis-suite.xml</suiteXmlFile>
         <cmis.binding />
         <cmis.basePath />
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index a2fddfa577..e1fcb9b6bd 100644
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -13,14 +13,14 @@
 
     <properties>
         <suiteXmlFile>${project.basedir}/src/test/resources/restapi-suite.xml</suiteXmlFile>
-        <maven.build.sourceVersion>11</maven.build.sourceVersion>
+        <maven.build.sourceVersion>17</maven.build.sourceVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <rest.api.explorer.branch>master</rest.api.explorer.branch>
         <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
         <org.glassfish.version>1.1.4</org.glassfish.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <scribejava-apis.version>8.3.1</scribejava-apis.version>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
     </properties>
 
     <profiles>
diff --git a/pom.xml b/pom.xml
index f7735b6cad..6edc33b439 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <builder.name>entitled-builder</builder.name>
         <local.registry>127.0.0.1:5000</local.registry>
 
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.build.sourceVersion>${java.version}</maven.build.sourceVersion>
diff --git a/scripts/ci/docker-compose/docker-compose-db.yaml b/scripts/ci/docker-compose/docker-compose-db.yaml
index 1e74d3f65d..0f7a7c9a94 100644
--- a/scripts/ci/docker-compose/docker-compose-db.yaml
+++ b/scripts/ci/docker-compose/docker-compose-db.yaml
@@ -34,7 +34,7 @@ services:
     ports:
       - "3307:3306"
   activemq:
-    image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+    image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
     ports:
       - "5672:5672" # AMQP
       - "61616:61616" # OpenWire
\ No newline at end of file
diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml
index dc37e4649f..c662f3a3cd 100644
--- a/scripts/ci/docker-compose/docker-compose.yaml
+++ b/scripts/ci/docker-compose/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
       - "5433:5432"
   activemq:
     profiles: ["default", "with-transform-core-aio", "activemq", "with-mtls-transform-core-aio"]
-    image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+    image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
     ports:
       - "5672:5672" # AMQP
       - "61616:61616" # OpenWire