Merge 866d41d into 45382bc

CJSCommonPlatform · May 25, 2022 · b24237b · b24237b
2 parents 45382bc + 866d41d
commit b24237b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,31 +2,31 @@ dist: trusty
 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,5 +35,6 @@ notifications:
     secure: fPlaMvrczZ2riJ4tjMOAqxSGj4JfxGlH/K08knLgG4T/n6EL4LN4+184Npz9XueNbV3m26WUrPkbXEiWXpqkKsbwcZXqqnFxGacGiyxv7LeBeQLYp7NFeARAyB5qDwUpjHlCPAEoAeyeGsZNrpui/wceY4j1tB7ObfdwbxLzAO0tekdbwitSaK1cc7V2sVHkBYr7ChuC+dVO1pshPw0EVTmzPioS8nfFKPaxWoMgyRAuYe7MD0U7DxNQ4Wzsb7tpfd5Oom1wLXyZ7M3wwSMMamIAAxHVG389Az6YvN7hXQggTGDawf/YwVOaoMR2bh7uHBCOiNZO1GbRTOA7IuTPwT7GsK94THRtfvqNm7RFBPkoD4657FATnk2o5c7QNTY3dAlYLsxLnS6mVTL/vAbqC7BbDHo/UGsxmOusQtKt8sRoL8pOCEInHaS3b88Osl7u7oYO/E4YTptdnkEe8tNyWWdx34nEUT0j1Mu/VAN38YcgTMUuiBU6chkMJ5BjIHisJlAAnBJ9VGgF9liqnigNwAGhbrHZPyAlKUX8HLejpD+t4aR0UaEvvauh6aHh4pYm0mZra4zOBC/lBDOXqsu5ajHL8LpHc6j+5FrmNwciiTVoxdud2S4c0U2ymr3L07ivX+UyhoraS9oSH3v7L73Q4NyvuAmD8Zc0xw/cR4Pff9c=
 env:
   global:
-  - 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=
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>uk.gov.justice</groupId>
         <artifactId>maven-framework-parent-pom</artifactId>
-        <version>11.0.0-M3</version>
+        <version>11.0.0-M6</version>
     </parent>
 
     <groupId>uk.gov.justice.example</groupId>
@@ -34,9 +34,9 @@
         <wildfly.version>20.0.1.Final</wildfly.version>
         <wildfly.maven.plugin.version>2.0.2.Final</wildfly.maven.plugin.version>
 
-        <framework-libraries.version>11.0.0-M13</framework-libraries.version>
-        <framework.version>11.0.0-M10</framework.version>
-        <event-store.version>11.0.0-M11</event-store.version>
+        <framework-libraries.version>11.0.0-M16</framework-libraries.version>
+        <framework.version>11.0.0-M14</framework.version>
+        <event-store.version>11.0.0-M16</event-store.version>
     </properties>
 
     <dependencyManagement>