Merge pull request #110 from CJSCommonPlatform/update-to-java-17

Update to Java 17
CJSCommonPlatform · Feb 7, 2023 · 3ceeadf · 3ceeadf
2 parents ce8edb2 + 557d5fa
commit 3ceeadf
Show file tree

Hide file tree

Showing 26 changed files with 35 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 dist: xenial
-sudo: required
 language: java
+os: linux
 jdk:
-- openjdk11
+  - openjdk17
 git:
   depth: 3
 cache:
@@ -38,5 +38,4 @@ env:
   - JAVA_TOOL_OPTIONS=-Dhttps.protocols=TLSv1.2,TLSv1,TLSv1.1
   - PGPORT=5432
   - secure: grVrC6MdVIMFXNWl0ByQAcs9KckX/Fac68lJWaK07vUD/Q/Key4C4Df6FRUABL82pmnPZALcBISZ4bI7dILxnPdHLZ7m7Cf82V2c25mv8SkJ09uETbBQg8y4ohH8u5VGhvmEi2/5qFSfHY2CgswMdq8Ixw/823tdKVNSJ0rh60O/2yQS8MJsZ182oJRcJnpt10qM2VOkBb7z9QljnaJrseVrAg1g5sta2DYq3pC6LAqRvO0FR+f9b9o6Nwx5+rO4rj+nzUpwGkBSt/x1cxbboGgsISpPwnYzeuEvK460WIYJv4x3OVF731KYQiS66f5bRU+3iHGOAEwRKFz0uq2LM6mmFBKNaly2SHu+VCwGpWGGBi3BJZlei8dx/I/piaIF7COgDPFeHd/JSqQ0YEvO4EWYngHI/b1x62WlatgVijzsVA2x6XM/Rycl/EK81vP+G4ivsTVx4QK8nMgWxQPEMbU36XjtW1lOnuTH+IMwsz/hNop3DIJQf+laAaNAMD7Ubi1M+iESuZGnfKdEHMJNwiXq2Kjk7notK/+G5ZiY0G13DgyuQ8TzHWl89K80PFqPlBIKp5j7EmDkR6t4kyDDZVrDXlpb9a0xLNaeub2bjLjWNWACkIRpU+TgAfKuDFlNGgaeYCiyz3hEZiEa5GVfDA+BgWoanA1VD1HAZR0MrPg=
-  - secure: ne9Gv2AQ5uXLDkzTHDiiDcHtCktLMla5EhgkOQXDHv5ZY4IvO0/y0UkKh77otrBn9xNxFIXtdV9UQWSGb16GLtoQnFMN5mQdbIcOMKMPTuKmXCWq2FouPdS8R8zAIWC/3AH3ZdQ9SYJwgU2bTWY7IQlZsvPK347huBSAiUPGrbq3l07UcluDxMBVP+W42MhIGR0/ywXWPaVwUj5yQwgz1Iol9uB7DwGgJ12dtx4PEetmkfUvBG1xWqiqljjrlgUr4ZVMZ6R5KM2zg5r51fk+RaqU+A4QMH9Ax2Kwt28Uw1MdQkGphvWKbBQmDJ91or/GSuDhPWVZcthKMprAbLvv0x7BE5GCdlRSdMgit5qlxKbSxfC445JTldxfW1Z5jMcR/s3TziKetcXRhRfnymdS/QHaJLas+1WZh6s0jYGLPsnVaIxE4WQsyJjBsxMhrs1eTlyYbailQwVP9/6zhZ17svZhuN9rvHK8i33/qpeMjQK5J6iGgvG56NkNJiwUiVQyteTquqCG8SumKPfEqCSQjv/ByEvJjsEi/eEQG7MjWDdYXPE5sdjBAMh4w7gkSgFI8CMTb+e61UWBo3Q7IbGKYTHGgagxspJ0O1MhkYkdDgTWlyWYXT9AypZC4n6KePGAhC6LZ6bSL2FHfPCtqQVUMRI8Zlhufdi7/2NcUQIu/CY=
   - secure: R0hQ/PRZABQrU668Zsv8tkSXtT3lEZvFSddN1Mpe6SrcfE3NuG0H3df+NR6B32bu3TnfNQSDyJ9JHCFOAqosQGcBK6N2cQuo/F18cJWfKwmKH3PRm73wiqR142rMleVXAK8VzyDUoq6z34wZ5Uo3aFdSNZzSqIDSEPmJfpg4u3fZdFgq3G7Ad/v6FQJZqwx+DSO4/o5lP3QGBy4D41AW1s5ds039/QVU/C0+rZGJUle1XD6S2UwEyS4MDkATds2cYMrTS7l5YFTpkJECegzvfbx6WaOCTLu3ODqmnugMjvvAoS3+o7IKLbB9WRrvhD0blqmw7jFqQ5gb2W299rum822HJdHmMTRJfRnQ5W2wsx5ARsNcagOhbDZPZxg9w0B90djN9oeefDu7YGlysGbxUSvHkuks+XUJHaumINvAHefOuPQoxp6Hc3Y1ldhTtUYRb1tJDI01x0vZbVRQeNyC/y8eH8GcRa4tVbUWvTig3k2adiJwuBlWwf/N/ua6+WsZa9SroN6seV+VmVds97hOQEpplca8zRTI+vzIOCt/nFWk3vNkv3xH0tuh0xgp5YPxPMFgfHEgZLm08+ZDJDoEtJJfwMyjXDakvAVBJrkB7MplPSYZJKXhqlEHQTx5XPOxKi/pAbBZ9PoJrdaS1t8ZmYfie3vyxm6PdfWmKmLyFBc=
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [17.0.0] - 2023-02-07
+### Changed
+- Updated to Java 17
+
 ### Changed
 - Update framework-libraries to 11.0.0 for:
     - A default name of `jms.queue.DLQ` rather than the original name of `DLQ`

diff --git a/example-context/example-domain/pom.xml b/example-context/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-context</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-persistence/pom.xml b/example-context/example-persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-context</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-command/example-command-api/pom.xml b/example-context/example-service/example-command/example-command-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-command</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-command/example-command-handler/pom.xml b/example-context/example-service/example-command/example-command-handler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-command</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-command/pom.xml b/example-context/example-service/example-command/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-custom/example-custom-api/pom.xml b/example-context/example-service/example-custom/example-custom-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-custom</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-custom/pom.xml b/example-context/example-service/example-custom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event-source/pom.xml b/example-context/example-service/example-event-source/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event/example-event-indexer/pom.xml b/example-context/example-service/example-event/example-event-indexer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-event</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event/example-event-listener/pom.xml b/example-context/example-service/example-event/example-event-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-event</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event/example-event-processor/pom.xml b/example-context/example-service/example-event/example-event-processor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-event</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>example-event-processor</artifactId>

diff --git a/example-context/example-service/example-event/other-event-listener/pom.xml b/example-context/example-service/example-event/other-event-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-event</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event/pom.xml b/example-context/example-service/example-event/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.services.example</groupId>
         <artifactId>example-service</artifactId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-feature-control/pom.xml b/example-context/example-service/example-feature-control/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-healthcheck/pom.xml b/example-context/example-service/example-healthcheck/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.services.example</groupId>
         <artifactId>example-service</artifactId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>example-it</artifactId>
     <properties>
@@ -88,11 +88,6 @@
             <artifactId>event-buffer-core</artifactId>
             <scope>test</scope>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.exparity</groupId>-->
-<!--            <artifactId>hamcrest-date</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>file-service-api</artifactId>
@@ -411,7 +406,7 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>2.0.2.Final</version>
+                <version>4.0.0.Final</version>
                 <configuration>
                     <jbossHome>${jboss.home}</jbossHome>
                     <serverConfig>${server.config}</serverConfig>

diff --git a/example-context/example-service/example-liquibase/pom.xml b/example-context/example-service/example-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.services.example</groupId>
         <artifactId>example-service</artifactId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-query/example-query-api/pom.xml b/example-context/example-service/example-query/example-query-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-query</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-query/example-query-view/pom.xml b/example-context/example-service/example-query/example-query-view/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-query</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-query/pom.xml b/example-context/example-service/example-query/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-single/pom.xml b/example-context/example-service/example-single/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/pom.xml b/example-context/example-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-context</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/pom.xml b/example-context/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>cake-shop</artifactId>
         <groupId>uk.gov.justice.example</groupId>
-        <version>11.0.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>uk.gov.justice</groupId>
         <artifactId>maven-framework-parent-pom</artifactId>
-        <version>11.0.1</version>
+        <version>17.0.0-M1</version>
     </parent>
 
     <groupId>uk.gov.justice.example</groupId>
     <artifactId>cake-shop</artifactId>
-    <version>11.0.0-SNAPSHOT</version>
+    <version>17.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Cakeshop Application</name>
@@ -34,9 +34,9 @@
         <wildfly.version>26.1.2.Final</wildfly.version>
         <wildfly.maven.plugin.version>3.2.0.Final</wildfly.maven.plugin.version>
 
-        <framework-libraries.version>11.0.1</framework-libraries.version>
-        <framework.version>11.0.1</framework.version>
-        <event-store.version>11.0.1</event-store.version>
+        <framework-libraries.version>17.0.0-M2</framework-libraries.version>
+        <framework.version>17.0.0-M2</framework.version>
+        <event-store.version>17.0.0-M1</event-store.version>
     </properties>
 
     <dependencyManagement>