Skip to content

Commit

Permalink
fix: APPS-1920 APPS-1921 update dependencies (#193)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Jesse S authored Aug 30, 2024
1 parent 29ac958 commit 72842cb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ ENV JAVA_OPTS="-Djdk.lang.Process.launchMechanism=vfork"
COPY . /workspace/app
RUN apt-get -y update && apt-get -y install git
RUN ./gradlew clean build -x test
RUN mkdir -p build/dependency && cd build/dependency && jar -xf ../libs/*[^p][^l][^a][^i][^n].jar

# Copy the non-plain jar into /build/dependency
RUN mkdir -p build/dependency && cd build/dependency && jar -xf $(ls ../libs/*.jar | grep -v "plain.jar")

FROM eclipse-temurin:17-jre
VOLUME /tmp
ARG DEPENDENCY=/workspace/app/build/dependency
COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
EXPOSE 8080
ENTRYPOINT ["java","-cp","app:app/lib/*","com.aerospike.restclient.AerospikeRestGatewayApplication"]
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = "3.2.4"
springBootVersion = "3.3.3"
httpclientVersion = "4.5.14"
aerospikeClientVersion = findProperty("aerospikeClientVersion") ?: "7.1.0"
}
Expand Down Expand Up @@ -77,9 +77,9 @@ dependencies {
implementation("com.aerospike:aerospike-client:${aerospikeClientVersion}")
implementation("com.aerospike:aerospike-document-api:2.0.3")
implementation("org.msgpack:jackson-dataformat-msgpack:0.9.8")
implementation('org.springframework.retry:spring-retry:2.0.5')
implementation('org.springframework:spring-aspects:6.1.5')
implementation('org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:3.1.0')
implementation('org.springframework.retry:spring-retry:2.0.8')
implementation('org.springframework:spring-aspects:6.1.12')
implementation('org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:3.1.2')
implementation('org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0')
implementation("javax.inject:javax.inject:1")
implementation("com.google.guava:guava:32.1.3-jre")
Expand Down

0 comments on commit 72842cb

Please sign in to comment.