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

fix: APPS-1920 APPS-1921 update dependencies #193

Merged
merged 3 commits into from
Aug 30, 2024
Merged

fix: APPS-1920 APPS-1921 update dependencies #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ed3783
fix: APPS-1920 APPS-1921 update dependencies
jdogmcsteezy Aug 30, 2024
f49e3dd
fix docker build
jdogmcsteezy Aug 30, 2024
a2697b7
dep: Upgrade spring-aspects:6.1.12 spring-retry:2.0.8
jdogmcsteezy Aug 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: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
Loading