Update to release version of framework 11

CJSCommonPlatform · Jan 26, 2023 · c1de2fb · c1de2fb
1 parent 68b2655
commit c1de2fb
Show file tree

Hide file tree

Showing 26 changed files with 48 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,31 +2,31 @@ dist: xenial
 sudo: required
 language: java
 jdk:
-  - openjdk11
+- openjdk11
 git:
   depth: 3
 cache:
   directories:
-    - "$HOME/.m2"
+  - "$HOME/.m2"
 services:
-  - postgresql
+- postgresql
 before_script:
-  - psql -c 'create database frameworkeventstore;' -U postgres
-  - psql -c 'create database frameworkviewstore;' -U postgres
-  - psql -c 'create database frameworkfilestore;' -U postgres
-  - psql -c 'create database frameworksystem;' -U postgres
-  - psql -c "CREATE USER framework WITH PASSWORD 'framework';" -U postgres
+- psql -c 'create database frameworkeventstore;' -U postgres
+- psql -c 'create database frameworkviewstore;' -U postgres
+- psql -c 'create database frameworkfilestore;' -U postgres
+- psql -c 'create database frameworksystem;' -U postgres
+- psql -c "CREATE USER framework WITH PASSWORD 'framework';" -U postgres
 addons:
   postgresql: '9.5'
   sonarcloud:
     organization: cjscommonplatform
     token:
       secure: MPrE0HzubH6Of0OeMlYuB5vEZNVfJE8wZG/iWdVmNHBVWWodEP4sO8s1GggKQk5rrHiSlVXs+G7OIM4X6Kg2HnjUj05G28IpirtkDnCLvIcSqAZxecO21tIBYwHn/mCdihHQOPjA8RFjc8+TSsRDNipeR3QvOzf6g5XZtOV/Ew+p5VoirIbI9jOO/qdOzHuQjZhARmI7HXqEmpkXJiObfyT5uJvO047lSbKA48VLWSfv2zFl5+8uymT+0g8fHPm9JWTNn7VLyKQQ4en7Cr9NC03Ahk8rXybB0qOrHj3fewtUGBp3pCa8bU6XaMFzSNHixueUG2mxxxI9ROB7nz+19CSOGafXZsygjDqPeT8D1wHHGGBmc90WQE3JhU9YFMXKnx5/a8OJyIAGRUE81wt3FsJUu+OvIHdQEOlM7geWYv6P52VbgmJSSvMgRnzNE3seq0LSsFxQXAQmAmDLWwWz0t2wbzO8dUmmU4jn5xoqSe2RBENaD1vDG37rvi8aGrr+Xg2005/8yIvlr+7ZZbeiHdYXqzbiDdYQyGjr8FaJLI3WPBtCRhsvJBgdQhuMFI/V44ntwAP6CzOty9Gfldlp+ybaY9UcFSKbGxBcrHPJfsS2ajgPUjW1K8KBFc7IKfy/XWhBsWOEHgVb2n4AZSV/nFTpK4HwpvHid0bEHcyTpk8=
 before_install:
-  - git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
-  - ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml
-  - ln -sfT ${PWD}/target/travis-settings/mvnw mvnw
-  - ln -sft ${PWD} ${PWD}/target/travis-settings/.mvn
+- git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
+- ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml
+- ln -sfT ${PWD}/target/travis-settings/mvnw mvnw
+- ln -sft ${PWD} ${PWD}/target/travis-settings/.mvn
 install: "${PWD}/target/travis-settings/java/install.sh -e -DexcludeGroupIds=uk.gov.justice.service,uk.gov.justice.services"
 script: "${PWD}/target/travis-settings/java/script-install.sh coveralls:report sonar:sonar"
 after_success: "${PWD}/target/travis-settings/java/after_success.sh"
@@ -35,6 +35,7 @@ notifications:
     secure: fPlaMvrczZ2riJ4tjMOAqxSGj4JfxGlH/K08knLgG4T/n6EL4LN4+184Npz9XueNbV3m26WUrPkbXEiWXpqkKsbwcZXqqnFxGacGiyxv7LeBeQLYp7NFeARAyB5qDwUpjHlCPAEoAeyeGsZNrpui/wceY4j1tB7ObfdwbxLzAO0tekdbwitSaK1cc7V2sVHkBYr7ChuC+dVO1pshPw0EVTmzPioS8nfFKPaxWoMgyRAuYe7MD0U7DxNQ4Wzsb7tpfd5Oom1wLXyZ7M3wwSMMamIAAxHVG389Az6YvN7hXQggTGDawf/YwVOaoMR2bh7uHBCOiNZO1GbRTOA7IuTPwT7GsK94THRtfvqNm7RFBPkoD4657FATnk2o5c7QNTY3dAlYLsxLnS6mVTL/vAbqC7BbDHo/UGsxmOusQtKt8sRoL8pOCEInHaS3b88Osl7u7oYO/E4YTptdnkEe8tNyWWdx34nEUT0j1Mu/VAN38YcgTMUuiBU6chkMJ5BjIHisJlAAnBJ9VGgF9liqnigNwAGhbrHZPyAlKUX8HLejpD+t4aR0UaEvvauh6aHh4pYm0mZra4zOBC/lBDOXqsu5ajHL8LpHc6j+5FrmNwciiTVoxdud2S4c0U2ymr3L07ivX+UyhoraS9oSH3v7L73Q4NyvuAmD8Zc0xw/cR4Pff9c=
 env:
   global:
-    - 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=
+  - 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=
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,18 +6,17 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 ## [Unreleased]
 
 ### Changed
-- Update framework-libraries to 11.0.0-M20 for:
+- Update framework-libraries to 11.0.0 for:
     - A default name of `jms.queue.DLQ` rather than the original name of `DLQ`
     - A new constructor to pass the name in if you don't want the default name
     - New builder `MessageConsumerClientBuilder` that allows ActiveMQ connection parameters to be specified
 - Updated to java 11 and OpenJdk
 - Removed trigger from the event publishing process
 - Updated wildfly to 20.0.1-Final  
 - Reduced the maximum runtime for each iteration of the publishing beans in the IT tests to 450 milliseconds
-- Update to maven-framework-parent-pom 11.0.0-M1
-- Update to framework-libraries 11.0.0-M1
-- Update to framework 11.0.0-M1
-- Update to event-store 11.0.0-M1
+- Update to maven-framework-parent-pom 11.0.0
+- Update to framework 11.0.0
+- Update to event-store 11.0.0
 - Bumped the base version of the project to 11.0.0 to match the framework libraries and show java 11 change  
 - Handled the move to the new Cloudsmith.io maven repository
 - Updated slf4j/log4j bridge jar from slf4j-log4j12 to slf4j-reload4j

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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>example-it</artifactId>
     <properties>

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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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-M1-SNAPSHOT</version>
+        <version>11.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.0-M6</version>
+        <version>11.0.0</version>
     </parent>
 
     <groupId>uk.gov.justice.example</groupId>
     <artifactId>cake-shop</artifactId>
-    <version>11.0.0-M1-SNAPSHOT</version>
+    <version>11.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.0-M29</framework-libraries.version>
-        <framework.version>11.0.0-M31</framework.version>
-        <event-store.version>11.0.0-M32</event-store.version>
+        <framework-libraries.version>11.0.0</framework-libraries.version>
+        <framework.version>11.0.0</framework.version>
+        <event-store.version>11.0.0</event-store.version>
     </properties>
 
     <dependencyManagement>