Skip to content

INS-1584 #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amattu2 merged 6 commits into from
Mar 23, 2026
Merged

INS-1584 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
63acdea
Attempt at fixing jackson vulnerability
JoonLeeNIH Mar 23, 2026
65d693d
Updated Tomcat base image, which has Java 17.0.18, which fixes Java v…
JoonLeeNIH Mar 23, 2026
d15c3e0
Updated Tomcat version in POM
JoonLeeNIH Mar 23, 2026
d9166d6
Updated log4j dependencies to fix vulnerabilities
JoonLeeNIH Mar 23, 2026
af1b92c
Updated Spring dependencies to fix vulnerabilities
JoonLeeNIH Mar 23, 2026
2915e44
Trying not to upgrade Spring Framework to a new major version
JoonLeeNIH Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPY . .
RUN mvn package -DskipTests

# Production stage
FROM tomcat:11.0.13-jdk17 AS fnl_base_image
FROM tomcat:11.0.20-jdk17 AS fnl_base_image

RUN apt-get update && apt-get -y upgrade

Expand Down
15 changes: 11 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<properties>
<java.version>17</java.version>
<!-- Override Spring Framework version globally for Boot -->
<spring-framework.version>6.2.11</spring-framework.version>
<spring-framework.version>6.2.17</spring-framework.version>

<spring.restdocs.version>3.0.3</spring.restdocs.version>
<snakeyaml.version>2.3</snakeyaml.version>
Expand All @@ -33,6 +33,13 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.18.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
Expand All @@ -46,12 +53,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.24.3</version>
<version>2.25.3</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.3</version>
<version>2.25.3</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -189,7 +196,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>11.0.13</version>
<version>11.0.20</version>
</dependency>
<!-- JUnit -->
<dependency>
Expand Down
Loading