chore: rm unused deps and fixed Dockerfile builds

miracum · Jun 25, 2023 · f76e968 · f76e968
1 parent 3239371
commit f76e968
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.trivyignore b/.trivyignore
@@ -1,4 +1,5 @@
 CVE-2016-1000027
+CVE-2022-46175
 
 # fast-xml-parser, not relevant since we aren't working with or exposing XML
 CVE-2023-34104

diff --git a/src/Dockerfile b/src/Dockerfile
@@ -1,9 +1,8 @@
-FROM docker.io/library/gradle:8.1.1@sha256:7fcf85eecab73a3889738cdd5bce8794083ceb3af977adff8ad62723886e0023 AS build
+FROM docker.io/library/gradle:8.1.1-jdk17@sha256:e7a4bc8f4ee27feae2eac4de61ca64406b7137e6f6b107052accd24bf0806043 AS build
 WORKDIR /home/gradle/src
-ENV GRADLE_USER_HOME /gradle \
-    TZ="UTC"
+ENV GRADLE_USER_HOME="/gradle"
 
-ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.25.1
+ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.27.0
 RUN wget --quiet https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OPENTELEMETRY_JAVA_AGENT_VERSION}/opentelemetry-javaagent.jar
 
 COPY settings.gradle ./
@@ -21,7 +20,7 @@ RUN gradle :${MODULE_NAME}:build -x test --info && \
     java -Djarmode=layertools -jar ${MODULE_NAME}/build/libs/*.jar extract --destination ${MODULE_NAME}/
 
 FROM build AS test
-ARG MODULE_NAME=query
+ENV TZ="UTC"
 RUN gradle :${MODULE_NAME}:test && \
     gradle jacocoTestReport
 
@@ -37,5 +36,5 @@ COPY --from=build /home/gradle/src/${MODULE_NAME}/application/ .
 
 USER 65532:65532
 EXPOSE 8080/tcp 8081/tcp
-ENV SPRING_PROFILES_ACTIVE=prod
+ENV SPRING_PROFILES_ACTIVE="prod"
 ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
diff --git a/src/buildSrc/src/main/groovy/org.miracum.recruit.java-common-conventions.gradle b/src/buildSrc/src/main/groovy/org.miracum.recruit.java-common-conventions.gradle
@@ -24,7 +24,7 @@ testing {
         // Configure the built-in test suite
         test {
             // Use JUnit Jupiter test framework
-            useJUnitJupiter('5.8.2')
+            useJUnitJupiter()
         }
     }
 }
diff --git a/src/notify/build.gradle b/src/notify/build.gradle
@@ -11,13 +11,10 @@ plugins {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-mail'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'org.springframework.boot:spring-boot-starter-aop'
     implementation 'org.springframework.boot:spring-boot-starter-quartz'
 
     implementation 'org.springframework.retry:spring-retry:1.3.4'
 
     // https://mvnrepository.com/artifact/jakarta.mail/jakarta.mail-api
     implementation 'jakarta.mail:jakarta.mail-api:2.1.2'
-
-    testImplementation 'ognl:ognl:3.3.4'
 }