Skip to content

Commit

Permalink
Merge e8715c0 into 06d4311
Browse files Browse the repository at this point in the history
  • Loading branch information
allanmckenzie committed May 20, 2022
2 parents 06d4311 + e8715c0 commit 50fbb82
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 6 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
[Semantic Versioning](http://semver.org/).

## [Unreleased]
### Fixed
- Healthchecks how return json with correct UTF-8 charset

## [11.0.0-M13] - 2022-05-20
### Changed
- Update liquibase to 4.10.0

## [11.0.0-M11] - 2022-03-25
### Fixed
- Healthchecks how return json with correct UTF-8 charset

## [11.0.0-M10] - 2022-03-23
### Changed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class MediaTypesMappingCacheInitialiserTest {
@InjectMocks
private MediaTypesMappingCacheInitialiser mediaTypesMappingCacheInitialiser;

@SuppressWarnings("unchecked")
@SuppressWarnings({"unchecked", "OptionalGetWithoutIsPresent"})
@Test
public void shouldInitialiseTheMappingCache() throws Exception {
final String actionName = "example.add-recipe";
Expand Down
16 changes: 16 additions & 0 deletions framework-system/framework-system-liquibase/liquibase.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env bash

CONTEXT_NAME=framework
FRAMEWORK_VERSION=11.0.0-M13-SNAPSHOT

#fail script on error
set -e


function runSystemLiquibase() {
echo "Running system Liquibase"
java -jar target/framework-system-liquibase-${FRAMEWORK_VERSION}.jar --url=jdbc:postgresql://localhost:5432/${CONTEXT_NAME}system --username=${CONTEXT_NAME} --password=${CONTEXT_NAME} --logLevel=info update
echo "Finished running system liquibase"
}

runSystemLiquibase
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
changeLogFile=liquibase/framework-system-changelog.xml
changelog-file: liquibase/framework-system-changelog.xml
liquibase.hub.mode: off
strict: true
liquibase.headless: true
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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-M5</version>
</parent>

<groupId>uk.gov.justice.services</groupId>
Expand Down Expand Up @@ -47,7 +47,7 @@

<properties>
<cpp.repo.name>microservice_framework</cpp.repo.name>
<framework-libraries.version>11.0.0-M13</framework-libraries.version>
<framework-libraries.version>11.0.0-M15</framework-libraries.version>
</properties>

<dependencyManagement>
Expand Down

0 comments on commit 50fbb82

Please sign in to comment.