Skip to content

Commit

Permalink
Merge pull request #6 from DiSSCo/feature/add-actuator
Browse files Browse the repository at this point in the history
Add actuator and web to enable the /health endpoints
  • Loading branch information
samleeflang authored Apr 18, 2024
2 parents 5bac3a4 + 8a72d83 commit e71e3fd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/.trivyignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Date: June 16, 2023
# Issue: snappy-java high issue, https://www.cvedetails.com/cve/CVE-2023-34453/
# Solution: Spring needs to update its version
CVE-2023-34455
# April 18 2024
# Spring boot needs to update its version of spring
CVE-2024-22262
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG JAR_FILE=target/*.jar
COPY ${JAR_FILE} application.jar
RUN java -Djarmode=layertools -jar application.jar extract

FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:17-jdk-alpine
RUN adduser -D -u 1000 java
WORKDIR application
COPY --chown=java:java --from=builder application/dependencies/ ./
Expand Down
14 changes: 10 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.0</version>
<version>3.2.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>eu.dissco.core</groupId>
Expand All @@ -16,8 +16,7 @@
<description>DiSSCo core consumer for event provenance records</description>
<properties>
<java.version>17</java.version>
<snakeyaml.version>2.0</snakeyaml.version>
<testcontainers.version>1.17.6</testcontainers.version>
<testcontainers.version>1.19.7</testcontainers.version>
<sonar.organization>dissco</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.coverage.jacoco.xmlReportPaths>../app-it/target/site/jacoco-aggregate/jacoco.xml
Expand Down Expand Up @@ -67,7 +66,14 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<artifactId>spring-boot-starter-web</artifactId>
<groupId>org.springframework.boot</groupId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down

0 comments on commit e71e3fd

Please sign in to comment.