Skip to content
This repository has been archived by the owner on Aug 13, 2020. It is now read-only.

Commit

Permalink
Merge pull request #802 from CJSCommonPlatform/release-6.4.x
Browse files Browse the repository at this point in the history 
Release 6.4.x
  • Loading branch information
@allanmckenzie
allanmckenzie committed May 14, 2020
2 parents e0235bb + b370d44 commit 25dc170
Show file tree
Hide file tree
Showing 36 changed files with 58 additions and 33 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
View file
Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aggregate/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion common-rest/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion components/custom/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion components/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion event-subscription-test-utils/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion event-subscription/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion framework-bom/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion framework-system/framework-management/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion framework-system/framework-system-liquibase/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion framework-system/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion framework-system/shuttering-persistence/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion framework-utilities/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-api/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-command-client/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-command-handling/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion jmx/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion messaging/messaging-core/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion messaging/messaging-jms/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion messaging/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion persistence/persistence-deltaspike/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion persistence/persistence-jdbc/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion persistence/pom.xml
View file
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test-utils/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test-utils/test-utils-common/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test-utils/test-utils-core/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test-utils/test-utils-enveloper-provider/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test-utils/test-utils-framework-persistence/pom.xml
View file
Expand Up @@ -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>

Expand Down
4 changes: 4 additions & 0 deletions .../main/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProvider.java
View file
Expand Up @@ -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();
Expand Down
11 changes: 11 additions & 0 deletions ...est/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProviderIT.java
View file
Expand Up @@ -37,6 +37,7 @@ public void shouldGetADataSourceToTheEventStore() throws Exception {
assertThat(connection.isClosed(), is(false));
}
}

@Test
public void shouldGetADataSourceToSystem() throws Exception {

Expand All @@ -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));
}
}
}
2 changes: 1 addition & 1 deletion test-utils/test-utils-jmx/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test-utils/test-utils-messaging/pom.xml
View file
Expand Up @@ -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>

Expand Down

0 comments on commit 25dc170

Please sign in to comment.