diff --git a/.travis.yml b/.travis.yml index 882c3cf81..5de2a7cc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ dist: xenial language: java os: linux jdk: -- openjdk11 +- openjdk17 git: depth: 3 cache: @@ -36,5 +36,4 @@ env: - JAVA_TOOL_OPTIONS=-Dhttps.protocols=TLSv1.2,TLSv1,TLSv1.1 - PGPORT=5432 - secure: lcrjU4FFEm3ryzo6EoRlAY+cYyyO8xgabV6SqnVYm7JCOu9zcuJwhAt4yN6EeGV22xAMY50Q5pXPg8HA54hZW/frOCcgsi4AhEIhxjmb0Ea6GigQdKFm6zVC4hR/6NH2zrosLJ2agE1tQEV5JHrxAE2dq8eQrWdr8fQxB/eSwNycFQ6X/djjpT7ZuGKV3rT0hHSjmxOISFu82XKKlhOAgvDhqjj5IEWb8slR6VPMIDuJycG43o+wMws5WDbt2eE2OnBtD/VRyAVpIP8fFrskfCqF9Z/YT0P7/nGtDkWcFhQTWo06p2dpF9yFDnPbsB4AQedRsPXj/o2M5Vx6MKjWabRINCsfbSPGv/jYaMTNWdrPTLLrdbDE+1UI9XHUgZmTYsoMhJRZq9QS8kgDINhU25sYBHQUXXapZSsK27dimLk5HiPAacxi+ShSR2h4UFRG2fBOFus9X8lgHjtxg9ycq656/FGkzpufRqWXokXifSz1Glv7WB/xquKl8yS4oSllccxfzRRxKGmQfqdry8LDE/p5UdP7EtNJ/sKKC6TGGZMzv+Wmq6HPMUfq3oVy6B/Uilsfc53WgCZCdxodDW2KVeQ4YGb/Mljtzx0brcSqV3qcUHywBPbLvVtQd0STnFsPbMxDxbQRV5J1y7StwKqrZFHfuotw0U3Tua7g4KxmzRw= - - secure: UHNnRLM7vMhHix7ZyMobgQGqBOzfMhl6SZ14jLlRTDhg7i/pET5Ji4CslforcGYdcuvPmb6Fs19nBsqJX1AgbmIQR8EnQO0PbR7JMcBDw0o1oTRCYs8cOvsBwZh7TIDGB5Wy8SgWrE23ZFsain5eVjvaggeWEJNraVNQCJ5M59UHnqjtzhy8/QYtUZLis8ofEYzbhd1XGz9zbHb/PdXQgN0YdSBP1z0VKbj8bA5aIAy28oTWgOu0TygP45sMOyqpXJFuAcBuDx/4kJzMhUibeIdqyBCbcLr82F3Ao4ria8HMau2n1cyGI/9QdPtu1xbzg9doqR6wp/4aF4N8mWAKRgJW1nm14SSMW5/REIPVn2Fur+NwChaL5Ns8hY11o0HQTucwbxxlWgabDwxrLnesldphoebMnqKe1loBjtOrb2F2RLYQfQortwRPn29pMXpKVPTmw+hAhZ7qFG3P7EXytcObb3xPwONP+9Ge5jpQIvGrQwrlxTg8bQGBzJcBlDZefb8q01AcZTt1mgC62olaSQ9758M9PYafW3jxGKtGjbkEHD9V1X43QN+Pz04yZr9L7zxlo9kXOL+QoUqVmqjCVjkjfsc7g3OKWwi3fBNXGnJ6j4mNsHAdglqfoWzg9cltizrT+/X/DYsUSMFnVaVCXcpzKV7L+x1Ae9XQiGOhhhg= - - secure: Y4yHPTeyhmA5rF0JVVsloLpJSaN+GWnUh4Itjrvo5xK+kDKAsSwq63nM4FmH+H71HAavFdd4DBbdfUiPede7P8ce1yv4/irkXzn8yL+x2JS9RUrKR35IF6olQ69FzfnTsDVUXg9i4Wb5Q6DJy8oGQETB0CVYJz3UT/fJPdEa0nnQBSJ0H+/6gNufsgwcFTL66K9ebPKKkKGve5WBlLUTrerR3puCTIOiAHv+Km+vfRhg7wbRyCEYOG91kyZBGSDvfubzECxwbuzee55RxSxnd19YC0QjHcUvhJLvsxRB6KV+xF7S6IQHQToXafaTxX2bKa2gADCqr649LJhlML2uKD48td5dBAKxZBL7Myep1kWxHOBrmBOc1cVikXp2yeIIyeIFQraJCbcCZhVibGiFxXdhfvhwcuGhLHOejVYYTOyFK91BCvIpOvQjwbpL3X6/HzqvFFLDfaAZtp62ZCNREUsKzaYbZnXxEs/5sKypKyTqFWorTIg3uuEDsyp5REMjNNeoICNKnhhM1XjeB9gSS+BlDoOcshPkimK8Lncp4KgBNhCVI54I8rkfFX8Dl3apW6a8xEWISzHwI6LHfyRgWAsmCEPwdk1HZ7PZsfVCBoDQP2gEi9MzLGAiNSfbtP4X6HtI8h01C6AqNm8SawUkNkJ6if78ICsLdF8Ob9ILhlc= + - secure: guA3HiuLziyJKfX/sD+jrNwNe/9rThk3H0rzcS1179MbwMVPzK0Tl4aiQEz2xBB//3iEVDOHEQAftKqI9BNaBIfehJ3a4i0eoVTgtf082EuqwBLrHI4hRzjZoWDrSiaOPXmhr+pMNGCPITfeVhgRti1ou5xqJsnEQ5WY68R9xMFKGTFOslvGN4vgM4fxszHMRNZrkd9/CpjqwKk7n10nIOS+g/g0xv979D9ISC8CxrLd+koQpr6h64m8QXu/NBmWf/FSNHipvGVK0PId4cObSqyq+NIh7WpOT20Co+0Rtr0FPuf7lmE+WiMuKMv7SHBrV5kGdpQrGhPMcZEHU9ULvNf8tGDZqs616toxAr1grtKepapzLIF5kKssUfVp3DnuEnxI65pugvBuaW4s1aqbCrrwwyC5qzG5Gkde7My+bPMPBt0DfYhxiAM0XAsU9jy+xbi5iY0/pfmJK9HM1+zVTaV6byv9BiUakVHLJThYYXUnsbqnTnpQSBQYrXb25cXPR6Kb6OuEJnN9MR1/do3+lfKV+636wswE1SOmFBlY2k/RwWtUStd0LJu0Im8mGPxC/E59t5gxb5XuICl/TiUbY1SsmvxsUcIJ4bmKxHPiBWAaFDI8K2+oHJR524L/4KZCBYBbbWPz3TkS9wC6qmJ1QgeC2i0dkeibunrT4aRcjfM= diff --git a/CHANGELOG.md b/CHANGELOG.md index d2039ffd9..2ca4656a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to [Unreleased] +## [17.0.0-M3] - 2023-02-15 +### Changed +- Update framework-libraries to 17.0.0-M3 + +## [17.0.0-M2] - 2023-02-03 +### Changed +- Update framework-libraries to 17.0.0-M2 + +## [17.0.0-M1] - 2023-02-03 +### Changed +- Update to Java 17 + ## [11.0.1] - 2023-02-01 ### Changed - Downgraded maven minimum version to 3.3.9 until the pipeline maven version is updated diff --git a/aggregate/pom.xml b/aggregate/pom.xml index a50cf4a15..6804e7865 100644 --- a/aggregate/pom.xml +++ b/aggregate/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/common-rest/pom.xml b/common-rest/pom.xml index 067474412..15f9db29f 100644 --- a/common-rest/pom.xml +++ b/common-rest/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 04bda221a..d179a9d06 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/components/custom/pom.xml b/components/custom/pom.xml index 54ed79114..2de92c793 100644 --- a/components/custom/pom.xml +++ b/components/custom/pom.xml @@ -5,7 +5,7 @@ components uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/components/pom.xml b/components/pom.xml index ab8148161..f0cb10330 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index 94f0cf970..cd72a4e11 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 @@ -125,13 +125,11 @@ org.apache.tomee openejb-core - 7.1.4 test org.apache.tomee openejb-server - 7.1.4 test diff --git a/event-subscription-test-utils/pom.xml b/event-subscription-test-utils/pom.xml index b84af9942..4986ac6b4 100644 --- a/event-subscription-test-utils/pom.xml +++ b/event-subscription-test-utils/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/event-subscription/pom.xml b/event-subscription/pom.xml index 4b2d3b110..0fc4b56a7 100644 --- a/event-subscription/pom.xml +++ b/event-subscription/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-bom/pom.xml b/framework-bom/pom.xml index ccc940f82..08372826f 100644 --- a/framework-bom/pom.xml +++ b/framework-bom/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/direct-adapter-core/pom.xml b/framework-generators/direct-adapter-core/pom.xml index c54d98bdb..f04a9ab67 100644 --- a/framework-generators/direct-adapter-core/pom.xml +++ b/framework-generators/direct-adapter-core/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/direct-client-generator-plugin/pom.xml b/framework-generators/direct-client-generator-plugin/pom.xml index 81c2b0f74..6ff558aef 100644 --- a/framework-generators/direct-client-generator-plugin/pom.xml +++ b/framework-generators/direct-client-generator-plugin/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/direct-client-generator/pom.xml b/framework-generators/direct-client-generator/pom.xml index c30db9250..fe5647d2e 100644 --- a/framework-generators/direct-client-generator/pom.xml +++ b/framework-generators/direct-client-generator/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/generators-commons/pom.xml b/framework-generators/generators-commons/pom.xml index b1555e346..ee9d06b2d 100644 --- a/framework-generators/generators-commons/pom.xml +++ b/framework-generators/generators-commons/pom.xml @@ -5,7 +5,7 @@ uk.gov.justice.framework-generators framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/generators-subscription/pom.xml b/framework-generators/generators-subscription/pom.xml index 91539c0e3..6bf791bfa 100644 --- a/framework-generators/generators-subscription/pom.xml +++ b/framework-generators/generators-subscription/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/generators-test-utils/pom.xml b/framework-generators/generators-test-utils/pom.xml index a046d36df..df0d3d6af 100644 --- a/framework-generators/generators-test-utils/pom.xml +++ b/framework-generators/generators-test-utils/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/messaging-adapter-core/pom.xml b/framework-generators/messaging-adapter-core/pom.xml index bedec5d72..0af3292f8 100644 --- a/framework-generators/messaging-adapter-core/pom.xml +++ b/framework-generators/messaging-adapter-core/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/messaging-adapter-generator-plugin/pom.xml b/framework-generators/messaging-adapter-generator-plugin/pom.xml index 6e8b310ff..562e73b1d 100644 --- a/framework-generators/messaging-adapter-generator-plugin/pom.xml +++ b/framework-generators/messaging-adapter-generator-plugin/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/messaging-adapter-generator/pom.xml b/framework-generators/messaging-adapter-generator/pom.xml index 75e1c8d39..a91ff6c4d 100644 --- a/framework-generators/messaging-adapter-generator/pom.xml +++ b/framework-generators/messaging-adapter-generator/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT messaging-adapter-generator diff --git a/framework-generators/messaging-client-generator-plugin/pom.xml b/framework-generators/messaging-client-generator-plugin/pom.xml index 92145fa82..5a591b07b 100644 --- a/framework-generators/messaging-client-generator-plugin/pom.xml +++ b/framework-generators/messaging-client-generator-plugin/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/messaging-client-generator/pom.xml b/framework-generators/messaging-client-generator/pom.xml index 3c6be7861..6804eaded 100644 --- a/framework-generators/messaging-client-generator/pom.xml +++ b/framework-generators/messaging-client-generator/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/pom.xml b/framework-generators/pom.xml index a6faee5b0..e12dda4d7 100644 --- a/framework-generators/pom.xml +++ b/framework-generators/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/rest-adapter-core/pom.xml b/framework-generators/rest-adapter-core/pom.xml index f700f313c..2054bdce3 100644 --- a/framework-generators/rest-adapter-core/pom.xml +++ b/framework-generators/rest-adapter-core/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 rest-adapter-core diff --git a/framework-generators/rest-adapter-file-service/pom.xml b/framework-generators/rest-adapter-file-service/pom.xml index e78f98f31..96c3be4f6 100644 --- a/framework-generators/rest-adapter-file-service/pom.xml +++ b/framework-generators/rest-adapter-file-service/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/rest-adapter-generator-plugin/pom.xml b/framework-generators/rest-adapter-generator-plugin/pom.xml index 5d8819702..f633cf385 100644 --- a/framework-generators/rest-adapter-generator-plugin/pom.xml +++ b/framework-generators/rest-adapter-generator-plugin/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/rest-adapter-generator/pom.xml b/framework-generators/rest-adapter-generator/pom.xml index e6b065669..53acfc04c 100644 --- a/framework-generators/rest-adapter-generator/pom.xml +++ b/framework-generators/rest-adapter-generator/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/rest-client-core/pom.xml b/framework-generators/rest-client-core/pom.xml index 90e3e07e9..08dd57c82 100644 --- a/framework-generators/rest-client-core/pom.xml +++ b/framework-generators/rest-client-core/pom.xml @@ -7,7 +7,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT rest-client-core diff --git a/framework-generators/rest-client-generator-plugin/pom.xml b/framework-generators/rest-client-generator-plugin/pom.xml index f4ce40e02..028371eb0 100644 --- a/framework-generators/rest-client-generator-plugin/pom.xml +++ b/framework-generators/rest-client-generator-plugin/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/rest-client-generator/pom.xml b/framework-generators/rest-client-generator/pom.xml index 795387895..8289ade77 100644 --- a/framework-generators/rest-client-generator/pom.xml +++ b/framework-generators/rest-client-generator/pom.xml @@ -7,7 +7,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT rest-client-generator diff --git a/framework-generators/unifiedsearch-client-generator-plugin/pom.xml b/framework-generators/unifiedsearch-client-generator-plugin/pom.xml index c2b4d9a5f..9f5d59a81 100644 --- a/framework-generators/unifiedsearch-client-generator-plugin/pom.xml +++ b/framework-generators/unifiedsearch-client-generator-plugin/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/unifiedsearch-client-generator/pom.xml b/framework-generators/unifiedsearch-client-generator/pom.xml index 349c8d687..6c6267537 100644 --- a/framework-generators/unifiedsearch-client-generator/pom.xml +++ b/framework-generators/unifiedsearch-client-generator/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-generators/unifiedsearch-core/pom.xml b/framework-generators/unifiedsearch-core/pom.xml index d0344892c..6102ffe82 100644 --- a/framework-generators/unifiedsearch-core/pom.xml +++ b/framework-generators/unifiedsearch-core/pom.xml @@ -5,7 +5,7 @@ framework-generators uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-jmx-command-client/pom.xml b/framework-jmx-command-client/pom.xml index 5f769f5a4..9c4105b21 100644 --- a/framework-jmx-command-client/pom.xml +++ b/framework-jmx-command-client/pom.xml @@ -12,7 +12,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT framework-jmx-command-client diff --git a/framework-system/framework-healthcheck/pom.xml b/framework-system/framework-healthcheck/pom.xml index 09d066bf1..6c7b15c6f 100644 --- a/framework-system/framework-healthcheck/pom.xml +++ b/framework-system/framework-healthcheck/pom.xml @@ -5,7 +5,7 @@ framework-system uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-system/framework-management/pom.xml b/framework-system/framework-management/pom.xml index 098eaae7a..ff71e8586 100644 --- a/framework-system/framework-management/pom.xml +++ b/framework-system/framework-management/pom.xml @@ -5,7 +5,7 @@ framework-system uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-system/framework-system-liquibase/pom.xml b/framework-system/framework-system-liquibase/pom.xml index f8e1c8314..253bbe8e7 100644 --- a/framework-system/framework-system-liquibase/pom.xml +++ b/framework-system/framework-system-liquibase/pom.xml @@ -5,7 +5,7 @@ framework-system uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-system/pom.xml b/framework-system/pom.xml index 5427580c7..2bf2636f8 100644 --- a/framework-system/pom.xml +++ b/framework-system/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-system/shuttering-persistence/pom.xml b/framework-system/shuttering-persistence/pom.xml index ede3a15a9..25a92e1a2 100644 --- a/framework-system/shuttering-persistence/pom.xml +++ b/framework-system/shuttering-persistence/pom.xml @@ -5,7 +5,7 @@ framework-system uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/framework-system/shuttering-persistence/src/test/java/uk/gov/justice/services/shuttering/persistence/StoredCommandRepositoryIT.java b/framework-system/shuttering-persistence/src/test/java/uk/gov/justice/services/shuttering/persistence/StoredCommandRepositoryIT.java index 57d2a0d1d..f3087771f 100644 --- a/framework-system/shuttering-persistence/src/test/java/uk/gov/justice/services/shuttering/persistence/StoredCommandRepositoryIT.java +++ b/framework-system/shuttering-persistence/src/test/java/uk/gov/justice/services/shuttering/persistence/StoredCommandRepositoryIT.java @@ -1,5 +1,6 @@ package uk.gov.justice.services.shuttering.persistence; +import static java.time.temporal.ChronoUnit.MILLIS; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; @@ -17,6 +18,7 @@ import uk.gov.justice.services.test.utils.persistence.TestJdbcDataSourceProvider; import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; import java.util.List; import java.util.UUID; import java.util.stream.Stream; @@ -59,7 +61,7 @@ public void shouldInsertAndGetShutteredCommands() throws Exception { storedCommandRepository.deleteAll(); - final ZonedDateTime now = new UtcClock().now(); + final ZonedDateTime now = new UtcClock().now().truncatedTo(MILLIS); final StoredCommand storedCommand_1 = new StoredCommand(randomUUID(), "command envelope 1", "destination 1", now.plusSeconds(1)); final StoredCommand storedCommand_2 = new StoredCommand(randomUUID(), "command envelope 2", "destination 2", now.plusSeconds(2)); @@ -91,7 +93,7 @@ public void shouldDeleteShutteredCommand() throws Exception { storedCommandRepository.deleteAll(); - final ZonedDateTime now = new UtcClock().now(); + final ZonedDateTime now = new UtcClock().now().truncatedTo(MILLIS); final StoredCommand storedCommand_1 = new StoredCommand(randomUUID(), "command envelope 1", "destination 1", now.plusSeconds(1)); final StoredCommand storedCommand_2 = new StoredCommand(randomUUID(), "command envelope 2", "destination 2", now.plusSeconds(2)); @@ -128,7 +130,7 @@ public void shouldBeIdempotentWhenSaving() throws Exception { storedCommandRepository.deleteAll(); final UUID envelopeId = fromString("0b305815-f251-481d-9a69-2ff60c3a88ca"); - final StoredCommand storedCommand = new StoredCommand(envelopeId, "command envelope 1", "destination 1", new UtcClock().now()); + final StoredCommand storedCommand = new StoredCommand(envelopeId, "command envelope 1", "destination 1", new UtcClock().now().truncatedTo(MILLIS)); storedCommandRepository.save(storedCommand); diff --git a/framework-utilities/pom.xml b/framework-utilities/pom.xml index ea54dbfc6..51b2475f9 100644 --- a/framework-utilities/pom.xml +++ b/framework-utilities/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/jmx/jmx-api/pom.xml b/jmx/jmx-api/pom.xml index 6c408c575..8960674c1 100644 --- a/jmx/jmx-api/pom.xml +++ b/jmx/jmx-api/pom.xml @@ -5,7 +5,7 @@ jmx uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/jmx/jmx-command-client/pom.xml b/jmx/jmx-command-client/pom.xml index c30af498d..bc3e39f22 100644 --- a/jmx/jmx-command-client/pom.xml +++ b/jmx/jmx-command-client/pom.xml @@ -5,7 +5,7 @@ jmx uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/jmx/jmx-command-handling/pom.xml b/jmx/jmx-command-handling/pom.xml index 297d41057..3c9e2e4ee 100644 --- a/jmx/jmx-command-handling/pom.xml +++ b/jmx/jmx-command-handling/pom.xml @@ -5,7 +5,7 @@ jmx uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/jmx/jmx-command-handling/src/test/java/uk/gov/justice/services/jmx/state/persistence/SystemCommandStatusRepositoryIT.java b/jmx/jmx-command-handling/src/test/java/uk/gov/justice/services/jmx/state/persistence/SystemCommandStatusRepositoryIT.java index 11231c072..445796f83 100644 --- a/jmx/jmx-command-handling/src/test/java/uk/gov/justice/services/jmx/state/persistence/SystemCommandStatusRepositoryIT.java +++ b/jmx/jmx-command-handling/src/test/java/uk/gov/justice/services/jmx/state/persistence/SystemCommandStatusRepositoryIT.java @@ -1,5 +1,6 @@ package uk.gov.justice.services.jmx.state.persistence; +import static java.time.temporal.ChronoUnit.MILLIS; import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.randomUUID; @@ -20,6 +21,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -62,7 +64,7 @@ public void cleanTable() throws Exception { @Test public void shouldSaveAndFindAll() throws Exception { - final ZonedDateTime now = new UtcClock().now(); + final ZonedDateTime now = new UtcClock().now().truncatedTo(MILLIS);; final UUID catchupCommandId = randomUUID(); final SystemCommandStatus catchupCommandStatus_1 = new SystemCommandStatus( catchupCommandId, @@ -101,7 +103,7 @@ public void shouldSaveAndFindAll() throws Exception { @Test public void shouldFindAllStatusesOfACommand() throws Exception { - final ZonedDateTime now = new UtcClock().now(); + final ZonedDateTime now = new UtcClock().now().truncatedTo(MILLIS); final UUID catchupCommandId = randomUUID(); final SystemCommandStatus catchupCommandStatus_1 = new SystemCommandStatus( catchupCommandId, @@ -140,7 +142,7 @@ public void shouldFindAllStatusesOfACommand() throws Exception { @Test public void shouldGetTheLatestStatusOfACommandById() throws Exception { - final ZonedDateTime now = new UtcClock().now(); + final ZonedDateTime now = new UtcClock().now().truncatedTo(MILLIS);; final UUID catchupCommandId = randomUUID(); final SystemCommandStatus catchupCommandStatus_1 = new SystemCommandStatus( catchupCommandId, @@ -186,7 +188,7 @@ public void shouldReturnEmptyIfNoLatestStatusFound() throws Exception { @Test public void shouldGetTheLatestStatusOfACommand() throws Exception { - final ZonedDateTime now = new UtcClock().now(); + final ZonedDateTime now = new UtcClock().now().truncatedTo(MILLIS);; final UUID catchupCommandId = randomUUID(); final SystemCommandStatus indexerCommandStatus_1 = new SystemCommandStatus( catchupCommandId, diff --git a/jmx/pom.xml b/jmx/pom.xml index f1e02e020..6e1a1e6fb 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/messaging/messaging-core/pom.xml b/messaging/messaging-core/pom.xml index 27fe6cc70..6aa91ca80 100644 --- a/messaging/messaging-core/pom.xml +++ b/messaging/messaging-core/pom.xml @@ -5,7 +5,7 @@ messaging uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/messaging/messaging-jms/pom.xml b/messaging/messaging-jms/pom.xml index d5f7720e1..3e42d3a34 100644 --- a/messaging/messaging-jms/pom.xml +++ b/messaging/messaging-jms/pom.xml @@ -5,7 +5,7 @@ messaging uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/messaging/pom.xml b/messaging/pom.xml index edcece383..62ffa21e4 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/metrics/metrics-interceptor/pom.xml b/metrics/metrics-interceptor/pom.xml index 728a13d0c..273473aa6 100644 --- a/metrics/metrics-interceptor/pom.xml +++ b/metrics/metrics-interceptor/pom.xml @@ -5,7 +5,7 @@ metrics uk.gov.justice.metrics - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/metrics/metrics-servlet/pom.xml b/metrics/metrics-servlet/pom.xml index c437b723b..196ec97b9 100644 --- a/metrics/metrics-servlet/pom.xml +++ b/metrics/metrics-servlet/pom.xml @@ -5,7 +5,7 @@ metrics uk.gov.justice.metrics - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/metrics/pom.xml b/metrics/pom.xml index 07ed7a3df..e42315408 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -7,7 +7,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT uk.gov.justice.metrics diff --git a/persistence/persistence-deltaspike/pom.xml b/persistence/persistence-deltaspike/pom.xml index 16a7984f2..9da75f12a 100644 --- a/persistence/persistence-deltaspike/pom.xml +++ b/persistence/persistence-deltaspike/pom.xml @@ -5,7 +5,7 @@ persistence uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/persistence/persistence-jdbc/pom.xml b/persistence/persistence-jdbc/pom.xml index 9cde42e4b..a54f8b15b 100644 --- a/persistence/persistence-jdbc/pom.xml +++ b/persistence/persistence-jdbc/pom.xml @@ -5,7 +5,7 @@ persistence uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/persistence/pom.xml b/persistence/pom.xml index 05b5ed883..9057f880b 100644 --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 975fb4b97..e8fe29621 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,12 @@ uk.gov.justice maven-framework-parent-pom - 11.0.1 + 17.0.0-M2 uk.gov.justice.services microservice-framework - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT pom Microservice Framework @@ -48,7 +48,7 @@ microservice_framework - 11.0.1 + 17.0.0-M3 diff --git a/raml-lint-check/lint-check-rules/pom.xml b/raml-lint-check/lint-check-rules/pom.xml index 7c69e9f34..bc4f3f3eb 100644 --- a/raml-lint-check/lint-check-rules/pom.xml +++ b/raml-lint-check/lint-check-rules/pom.xml @@ -5,7 +5,7 @@ raml-lint-check uk.gov.justice.framework-generators - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 jar diff --git a/raml-lint-check/pom.xml b/raml-lint-check/pom.xml index 938e9386b..294c0e57f 100644 --- a/raml-lint-check/pom.xml +++ b/raml-lint-check/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/test-utils/pom.xml b/test-utils/pom.xml index 8ee174e98..a90281145 100644 --- a/test-utils/pom.xml +++ b/test-utils/pom.xml @@ -5,7 +5,7 @@ microservice-framework uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/test-utils/test-utils-common/pom.xml b/test-utils/test-utils-common/pom.xml index 6d63b939d..3d6ba1df2 100644 --- a/test-utils/test-utils-common/pom.xml +++ b/test-utils/test-utils-common/pom.xml @@ -5,7 +5,7 @@ test-utils uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/test-utils/test-utils-core/pom.xml b/test-utils/test-utils-core/pom.xml index 477edd620..9ef52d4d8 100644 --- a/test-utils/test-utils-core/pom.xml +++ b/test-utils/test-utils-core/pom.xml @@ -5,7 +5,7 @@ uk.gov.justice.services test-utils - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/test-utils/test-utils-enveloper-provider/pom.xml b/test-utils/test-utils-enveloper-provider/pom.xml index 8bb10d9b6..a3d92aa43 100644 --- a/test-utils/test-utils-enveloper-provider/pom.xml +++ b/test-utils/test-utils-enveloper-provider/pom.xml @@ -5,7 +5,7 @@ test-utils uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/test-utils/test-utils-framework-persistence/pom.xml b/test-utils/test-utils-framework-persistence/pom.xml index 0afb43741..e19e48e9f 100644 --- a/test-utils/test-utils-framework-persistence/pom.xml +++ b/test-utils/test-utils-framework-persistence/pom.xml @@ -5,7 +5,7 @@ test-utils uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/test-utils/test-utils-jmx/pom.xml b/test-utils/test-utils-jmx/pom.xml index 01b815d20..6013c64a0 100644 --- a/test-utils/test-utils-jmx/pom.xml +++ b/test-utils/test-utils-jmx/pom.xml @@ -5,7 +5,7 @@ test-utils uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0 diff --git a/test-utils/test-utils-messaging/pom.xml b/test-utils/test-utils-messaging/pom.xml index 32a5cc45d..f5a2d1f39 100644 --- a/test-utils/test-utils-messaging/pom.xml +++ b/test-utils/test-utils-messaging/pom.xml @@ -5,7 +5,7 @@ test-utils uk.gov.justice.services - 11.0.2-SNAPSHOT + 17.0.0-M3-SNAPSHOT 4.0.0