From 557d5fa281e2eec0b340110f87b38a344881eef0 Mon Sep 17 00:00:00 2001 From: allanmckenzie Date: Wed, 25 Jan 2023 11:27:16 +0000 Subject: [PATCH 1/2] Update to Java 17 --- .travis.yml | 5 ++--- CHANGELOG.md | 4 ++++ example-context/example-domain/pom.xml | 2 +- example-context/example-persistence/pom.xml | 2 +- .../example-command/example-command-api/pom.xml | 2 +- .../example-command/example-command-handler/pom.xml | 2 +- .../example-service/example-command/pom.xml | 2 +- .../example-custom/example-custom-api/pom.xml | 2 +- example-context/example-service/example-custom/pom.xml | 2 +- .../example-service/example-event-source/pom.xml | 2 +- .../example-event/example-event-indexer/pom.xml | 2 +- .../example-event/example-event-listener/pom.xml | 2 +- .../example-event/example-event-processor/pom.xml | 2 +- .../example-event/other-event-listener/pom.xml | 2 +- example-context/example-service/example-event/pom.xml | 2 +- .../example-service/example-feature-control/pom.xml | 2 +- .../example-service/example-healthcheck/pom.xml | 2 +- example-context/example-service/example-it/pom.xml | 9 ++------- .../example-service/example-liquibase/pom.xml | 2 +- .../example-query/example-query-api/pom.xml | 2 +- .../example-query/example-query-view/pom.xml | 2 +- example-context/example-service/example-query/pom.xml | 2 +- example-context/example-service/example-single/pom.xml | 2 +- example-context/example-service/pom.xml | 2 +- example-context/pom.xml | 2 +- pom.xml | 10 +++++----- 26 files changed, 35 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4e9d1ff..9a64d06f 100644 --- 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 index 22d497e1..6a142ebf 100644 --- 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 index 34153731..3f3f50e0 100644 --- a/example-context/example-domain/pom.xml +++ b/example-context/example-domain/pom.xml @@ -5,7 +5,7 @@ example-context uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-persistence/pom.xml b/example-context/example-persistence/pom.xml index 6db6b6de..1fa05195 100644 --- a/example-context/example-persistence/pom.xml +++ b/example-context/example-persistence/pom.xml @@ -5,7 +5,7 @@ example-context uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 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 index 70f0703b..f938030c 100644 --- 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 @@ example-command uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 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 index f5016479..3c065493 100644 --- 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 @@ example-command uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-command/pom.xml b/example-context/example-service/example-command/pom.xml index 7ad49a66..588cb3e6 100644 --- a/example-context/example-service/example-command/pom.xml +++ b/example-context/example-service/example-command/pom.xml @@ -5,7 +5,7 @@ example-service uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 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 index 13607f60..a43344b9 100644 --- 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 @@ example-custom uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-custom/pom.xml b/example-context/example-service/example-custom/pom.xml index 06a8cec8..aa5de42f 100644 --- a/example-context/example-service/example-custom/pom.xml +++ b/example-context/example-service/example-custom/pom.xml @@ -5,7 +5,7 @@ example-service uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-event-source/pom.xml b/example-context/example-service/example-event-source/pom.xml index ae8dd3dc..3d72eed8 100644 --- a/example-context/example-service/example-event-source/pom.xml +++ b/example-context/example-service/example-event-source/pom.xml @@ -5,7 +5,7 @@ example-service uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 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 index 6dc1b4e0..17ea6938 100644 --- 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 @@ example-event uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 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 index ad7afda7..07786b3e 100644 --- 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 @@ example-event uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 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 index cf947d01..e459116e 100644 --- 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 @@ example-event uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 example-event-processor 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 index 38b02568..987cc62a 100644 --- 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 @@ example-event uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-event/pom.xml b/example-context/example-service/example-event/pom.xml index 9c47a202..2e6a4371 100644 --- a/example-context/example-service/example-event/pom.xml +++ b/example-context/example-service/example-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.justice.services.example example-service - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-feature-control/pom.xml b/example-context/example-service/example-feature-control/pom.xml index 5137713e..edb7731f 100644 --- a/example-context/example-service/example-feature-control/pom.xml +++ b/example-context/example-service/example-feature-control/pom.xml @@ -5,7 +5,7 @@ example-service uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-healthcheck/pom.xml b/example-context/example-service/example-healthcheck/pom.xml index 05065646..c50479e8 100644 --- a/example-context/example-service/example-healthcheck/pom.xml +++ b/example-context/example-service/example-healthcheck/pom.xml @@ -5,7 +5,7 @@ example-service uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml index 5d6e11b4..f07fd1c3 100644 --- a/example-context/example-service/example-it/pom.xml +++ b/example-context/example-service/example-it/pom.xml @@ -5,7 +5,7 @@ uk.gov.justice.services.example example-service - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT example-it @@ -88,11 +88,6 @@ event-buffer-core test - - - - - uk.gov.justice.services file-service-api @@ -411,7 +406,7 @@ org.wildfly.plugins wildfly-maven-plugin - 2.0.2.Final + 4.0.0.Final ${jboss.home} ${server.config} diff --git a/example-context/example-service/example-liquibase/pom.xml b/example-context/example-service/example-liquibase/pom.xml index 312f18ec..e9622b8d 100644 --- a/example-context/example-service/example-liquibase/pom.xml +++ b/example-context/example-service/example-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.justice.services.example example-service - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 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 index d7627e97..128a47e6 100644 --- 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 @@ example-query uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 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 index 572a8e6f..c8185c3f 100644 --- 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 @@ example-query uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-query/pom.xml b/example-context/example-service/example-query/pom.xml index 067e583a..fe1747fa 100644 --- a/example-context/example-service/example-query/pom.xml +++ b/example-context/example-service/example-query/pom.xml @@ -5,7 +5,7 @@ example-service uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/example-single/pom.xml b/example-context/example-service/example-single/pom.xml index c4b30bdc..9733e28b 100644 --- a/example-context/example-service/example-single/pom.xml +++ b/example-context/example-service/example-single/pom.xml @@ -3,7 +3,7 @@ example-service uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/example-service/pom.xml b/example-context/example-service/pom.xml index fd6161a5..2d3624af 100644 --- a/example-context/example-service/pom.xml +++ b/example-context/example-service/pom.xml @@ -5,7 +5,7 @@ example-context uk.gov.justice.services.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/example-context/pom.xml b/example-context/pom.xml index e1ca086e..1ab05560 100644 --- a/example-context/pom.xml +++ b/example-context/pom.xml @@ -5,7 +5,7 @@ cake-shop uk.gov.justice.example - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index bb039d0c..baeebf90 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,12 @@ uk.gov.justice maven-framework-parent-pom - 11.0.1 + 17.0.0-M1 uk.gov.justice.example cake-shop - 11.0.0-SNAPSHOT + 17.0.0-SNAPSHOT pom Cakeshop Application @@ -34,9 +34,9 @@ 26.1.2.Final 3.2.0.Final - 11.0.1 - 11.0.1 - 11.0.1 + 17.0.0-M2 + 17.0.0-M2 + 17.0.0-M1 From 55984d667053d39a134a6b0300177411e2890c9e Mon Sep 17 00:00:00 2001 From: allanmckenzie Date: Thu, 16 Feb 2023 11:57:08 +0000 Subject: [PATCH 2/2] Update framework --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index baeebf90..07322e03 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ uk.gov.justice maven-framework-parent-pom - 17.0.0-M1 + 17.0.0-M2 uk.gov.justice.example @@ -34,9 +34,9 @@ 26.1.2.Final 3.2.0.Final - 17.0.0-M2 - 17.0.0-M2 - 17.0.0-M1 + 17.0.0-M3 + 17.0.0-M3 + 17.0.0-M2