CJSCommonPlatform · allanmckenzie · May 14, 2020 · Apr 8, 2020 · Apr 9, 2020 · Apr 9, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,9 @@ before_script:
   - psql -c 'create database frameworkviewstore;' -U postgres
   - psql -c 'create database frameworkfilestore;' -U postgres
   - psql -c 'create database frameworksystem;' -U postgres
+  - psql -c 'create database fileservice;' -U postgres
   - psql -c "CREATE USER framework WITH PASSWORD 'framework';" -U postgres
+  - psql -c "CREATE USER fileservice WITH PASSWORD 'fileservice';" -U postgres
 addons:
   postgresql: "9.5"
   sonarcloud:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [6.4.2] - 2020-04-23
+### Changed
+- Update framework-api to 4.3.0
+
+## [6.4.1] - 2020-04-09
+### Added
+- Added get file-service datasource to TestJdbcDataSourceProvider
+
 ## [6.4.0] - 2019-11-12
 ### Changed
 - SHUTTER command renamed to SUSPEND

diff --git a/aggregate/pom.xml b/aggregate/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/common-rest/pom.xml b/common-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/custom/pom.xml b/components/custom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>components</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/components/pom.xml b/components/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/event-subscription-test-utils/pom.xml b/event-subscription-test-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-subscription/pom.xml b/event-subscription/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-bom/pom.xml b/framework-bom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-system/framework-management/pom.xml b/framework-system/framework-management/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-system</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-system/framework-system-liquibase/pom.xml b/framework-system/framework-system-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-system</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-system/pom.xml b/framework-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-system/shuttering-persistence/pom.xml b/framework-system/shuttering-persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-system</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-utilities/pom.xml b/framework-utilities/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jmx/jmx-api/pom.xml b/jmx/jmx-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jmx</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jmx/jmx-command-client/pom.xml b/jmx/jmx-command-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jmx</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jmx/jmx-command-handling/pom.xml b/jmx/jmx-command-handling/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jmx</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/jmx/pom.xml b/jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/messaging/messaging-core/pom.xml b/messaging/messaging-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>messaging</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/messaging/messaging-jms/pom.xml b/messaging/messaging-jms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>messaging</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/messaging/pom.xml b/messaging/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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

diff --git a/persistence/pom.xml b/persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>uk.gov.justice.services</groupId>
     <artifactId>microservice-framework</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.4.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Microservice Framework</name>
@@ -46,7 +46,7 @@
 
         <common-bom.version>2.4.0</common-bom.version>
         <test-utils.version>1.24.3</test-utils.version>
-        <framework-api.version>4.1.0</framework-api.version>
+        <framework-api.version>4.3.0</framework-api.version>
         <utilities.version>1.20.3</utilities.version>
         <json-schema-catalog.version>1.7.6</json-schema-catalog.version>
         <embedded-artemis.version>1.2.0</embedded-artemis.version>

diff --git a/test-utils/pom.xml b/test-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/test-utils/test-utils-common/pom.xml b/test-utils/test-utils-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>test-utils</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/test-utils/test-utils-core/pom.xml b/test-utils/test-utils-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.services</groupId>
         <artifactId>test-utils</artifactId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/test-utils/test-utils-enveloper-provider/pom.xml b/test-utils/test-utils-enveloper-provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>test-utils</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/test-utils/test-utils-framework-persistence/pom.xml b/test-utils/test-utils-framework-persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>test-utils</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/.../main/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProvider.java b/.../main/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProvider.java
@@ -34,6 +34,10 @@ public DataSource getSystemDataSource(final String contextName) {
 
     }
 
+    public DataSource getFileServiceDataSource() {
+        return getDataSource("fileservice", "fileservice");
+    }
+
     private DataSource getDataSource(final String contextName, final String databaseName) {
 
         final PGSimpleDataSource dataSource = new PGSimpleDataSource();

diff --git a/...est/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProviderIT.java b/...est/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProviderIT.java
@@ -37,6 +37,7 @@ public void shouldGetADataSourceToTheEventStore() throws Exception {
             assertThat(connection.isClosed(), is(false));
         }
     }
+
     @Test
     public void shouldGetADataSourceToSystem() throws Exception {
 
@@ -46,4 +47,14 @@ public void shouldGetADataSourceToSystem() throws Exception {
             assertThat(connection.isClosed(), is(false));
         }
     }
+
+    @Test
+    public void shouldGetDataSourceToFileService() throws Exception {
+
+        final DataSource dataSource = testJdbcDataSourceProvider.getFileServiceDataSource();
+
+        try(final Connection connection = dataSource.getConnection()) {
+            assertThat(connection.isClosed(), is(false));
+        }
+    }
 }
diff --git a/test-utils/test-utils-jmx/pom.xml b/test-utils/test-utils-jmx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>test-utils</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/test-utils/test-utils-messaging/pom.xml b/test-utils/test-utils-messaging/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>test-utils</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>