Skip to content
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

Jump to bottom

Security updates #1619

Merged
merged 2 commits into from
Jan 30, 2024
Merged

Security updates #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
766395b
Security updates
ha7315 Jan 30, 2024
3831745
Modify POM changes to bring into line with standard approach. Bump t…
NToppingCCS Jan 30, 2024
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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG APP_DIR=/app
FROM maven:3.9.5-eclipse-temurin-17-alpine as build
FROM maven:3.9.6-eclipse-temurin-17-alpine as build
COPY . /build
RUN cd /build && mvn package

FROM eclipse-temurin:17.0.9_9-jre-alpine
RUN apk --no-cache add curl
FROM eclipse-temurin:17.0.10_7-jre-alpine
RUN apk upgrade && apk add curl && rm -rf /var/cache/apk/*
ARG APP_DIR
RUN addgroup -S appuser && \
adduser -S -G appuser appuser && \
Expand Down
40 changes: 35 additions & 5 deletions pom.xml
View file
Open in desktop
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.6</version>
<version>3.2.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>uk.gov.crowncommercial.dts</groupId>
Expand All @@ -25,10 +25,10 @@
<simple-odf.version>0.9.0</simple-odf.version>
<jena-core.version>4.10.0</jena-core.version>
<commons-io.version>2.15.1</commons-io.version>
<aws-java-sdk-s3.version>1.12.629</aws-java-sdk-s3.version>
<aws-java-sdk-s3.version>1.12.647</aws-java-sdk-s3.version>
<tika-core.version>2.9.1</tika-core.version>
<java-cfenv-boot.version>3.1.3</java-cfenv-boot.version>
<notifications-java-client.version>4.1.0-RELEASE</notifications-java-client.version>
<notifications-java-client.version>4.1.1-RELEASE</notifications-java-client.version>
<poi-ooxml.version>5.2.5</poi-ooxml.version>
<xerces.xercesimpl.version>2.12.2</xerces.xercesimpl.version>
<snakeyaml.version>2.2</snakeyaml.version>
Expand All @@ -39,9 +39,12 @@
<jackson.version>2.15.2</jackson.version>
<hibernate.version>6.3.1.Final</hibernate.version>
<junit.version>5.9.3</junit.version>
<opensearch.version>1.2.1</opensearch.version>
<opensearch.version>1.3.0</opensearch.version>
<shedlock.version>5.10.0</shedlock.version>
<spring-boot.version>3.1.6</spring-boot.version>
<spring-boot.version>3.2.2</spring-boot.version>
<jose.version>0.9.4</jose.version>
<jsonpath.version>2.9.0</jsonpath.version>
<logback.version>1.4.14</logback.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -223,6 +226,17 @@
<groupId>uk.gov.service.notify</groupId>
<artifactId>notifications-java-client</artifactId>
<version>${notifications-java-client.version}</version>
<exclusions>
<exclusion>
<artifactId>jose4j</artifactId>
<groupId>org.bitbucket.b_c</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>${jose.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
Expand All @@ -232,6 +246,7 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${jsonpath.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
Expand Down Expand Up @@ -284,6 +299,10 @@
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
<exclusion>
<artifactId>json-path</artifactId>
<groupId>com.jayway.jsonpath</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -307,6 +326,17 @@
<artifactId>rollbar-logback</artifactId>
<version>${rollbar.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/uk/gov/crowncommercial/dts/scale/cat/config/ConclaveClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static org.springframework.http.HttpHeaders.ACCEPT;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.client.transport.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.springframework.context.annotation.Bean;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/uk/gov/crowncommercial/dts/scale/cat/config/DocumentUploadClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static org.springframework.http.HttpHeaders.ACCEPT;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.client.transport.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.springframework.context.annotation.Bean;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/uk/gov/crowncommercial/dts/scale/cat/config/JaggaerClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import java.time.Duration;
import java.util.Arrays;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.client.Request;
import org.eclipse.jetty.client.transport.HttpClientTransportDynamic;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/uk/gov/crowncommercial/dts/scale/cat/config/JaggaerSOAPClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static org.springframework.http.HttpHeaders.ACCEPT;
import java.util.Base64;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.client.transport.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.springframework.beans.factory.annotation.Value;
Expand Down
Loading