Skip to content

Commit 72842cb

Browse files
author
Jesse S
authored
fix: APPS-1920 APPS-1921 update dependencies (#193)
* fix: APPS-1920 APPS-1921 update dependencies org.springframework.boot:spring-boot-starter-web -> 3.3.3 org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j -> 3.1.2 * fix docker build * dep: Upgrade spring-aspects:6.1.12 spring-retry:2.0.8
1 parent 29ac958 commit 72842cb

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ ENV JAVA_OPTS="-Djdk.lang.Process.launchMechanism=vfork"
77
COPY . /workspace/app
88
RUN apt-get -y update && apt-get -y install git
99
RUN ./gradlew clean build -x test
10-
RUN mkdir -p build/dependency && cd build/dependency && jar -xf ../libs/*[^p][^l][^a][^i][^n].jar
10+
11+
# Copy the non-plain jar into /build/dependency
12+
RUN mkdir -p build/dependency && cd build/dependency && jar -xf $(ls ../libs/*.jar | grep -v "plain.jar")
1113

1214
FROM eclipse-temurin:17-jre
1315
VOLUME /tmp
1416
ARG DEPENDENCY=/workspace/app/build/dependency
15-
COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
1617
COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
18+
COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
1719
COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
1820
EXPOSE 8080
1921
ENTRYPOINT ["java","-cp","app:app/lib/*","com.aerospike.restclient.AerospikeRestGatewayApplication"]

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext {
3-
springBootVersion = "3.2.4"
3+
springBootVersion = "3.3.3"
44
httpclientVersion = "4.5.14"
55
aerospikeClientVersion = findProperty("aerospikeClientVersion") ?: "7.1.0"
66
}
@@ -77,9 +77,9 @@ dependencies {
7777
implementation("com.aerospike:aerospike-client:${aerospikeClientVersion}")
7878
implementation("com.aerospike:aerospike-document-api:2.0.3")
7979
implementation("org.msgpack:jackson-dataformat-msgpack:0.9.8")
80-
implementation('org.springframework.retry:spring-retry:2.0.5')
81-
implementation('org.springframework:spring-aspects:6.1.5')
82-
implementation('org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:3.1.0')
80+
implementation('org.springframework.retry:spring-retry:2.0.8')
81+
implementation('org.springframework:spring-aspects:6.1.12')
82+
implementation('org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:3.1.2')
8383
implementation('org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0')
8484
implementation("javax.inject:javax.inject:1")
8585
implementation("com.google.guava:guava:32.1.3-jre")

0 commit comments

Comments
 (0)