Skip to content

Commit 26ec98d

Browse files
authored
fix:Spring liveness fix (#53)
* fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740) * fix:clean up suppressions (RDCC-1740)
1 parent 6de303a commit 26ec98d

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

build.gradle

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616
id 'io.spring.dependency-management' version '1.0.9.RELEASE'
1717
id 'org.owasp.dependencycheck' version '5.3.0'
1818
id 'org.sonarqube' version '2.8'
19-
id 'org.springframework.boot' version '2.3.2.RELEASE'
19+
id 'org.springframework.boot' version '2.3.1.RELEASE'
2020
id "org.flywaydb.flyway" version "6.5.1"
2121
id "io.freefair.lombok" version "4.1.6"
2222
id 'uk.gov.hmcts.java' version '0.9.0'
@@ -213,13 +213,20 @@ dependencies {
213213

214214
compile group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final'
215215

216-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: '2.3.2.RELEASE'
217-
218-
219216
compile group: 'org.springframework.boot', name: 'spring-boot-starter-json', version: versions.springBoot
220-
//compile group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: versions.springBoot
221-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc'
222-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springBoot
217+
compile (group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc')
218+
{
219+
exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket"
220+
exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core"
221+
}
222+
compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springBoot)
223+
{
224+
exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket"
225+
exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core"
226+
}
227+
228+
compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.37'
229+
compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.37'
223230
compile group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-hystrix', version: versions.springHystrix
224231

225232
compile group: 'org.springframework.boot', name: 'spring-boot-starter-cache', version: versions.springBoot

src/main/java/uk/gov/hmcts/reform/judicialapi/JudicialApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import uk.gov.hmcts.reform.health.HealthAutoConfiguration;
66

7-
87
@SpringBootApplication(scanBasePackages = "uk.gov.hmcts.reform.judicialapi", exclude = HealthAutoConfiguration.class)
98
@SuppressWarnings("HideUtilityClassConstructor") // Spring needs a constructor, its not a utility class
109
public class JudicialApplication {

src/main/resources/application.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@ server:
22
port: ${PORT:8093}
33

44
management:
5-
endpoint:
6-
health:
7-
cache:
8-
time-to-live: 30s
9-
show-details: "always"
105
endpoints:
6+
jmx:
7+
exposure:
8+
include: 'health'
119
web:
1210
base-path: "/"
13-
exposure:
14-
include: health, info
15-
security:
16-
enabled: false
11+
endpoint:
12+
health:
13+
show-details: "always"
1714

1815
spring:
1916
jpa:

0 commit comments

Comments
 (0)