Skip to content

Commit

Permalink
library-version-update
Browse files Browse the repository at this point in the history
  • Loading branch information
gopal-mahajan committed Dec 6, 2024
1 parent a8e904d commit 3d963d6
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 25 deletions.
4 changes: 2 additions & 2 deletions docker/depl.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG VERSION="1.0.0-SNAPSHOT"

# Using maven base image in builder stage to build Java code.
FROM maven:3-eclipse-temurin-11 as builder
FROM maven:3-eclipse-temurin-21-jammy as builder

WORKDIR /usr/share/app
COPY pom.xml .
Expand All @@ -13,7 +13,7 @@ COPY src src
RUN mvn clean package -Dmaven.test.skip=true

# Java Runtime as the base for final image
FROM eclipse-temurin:11-jre-focal
FROM eclipse-temurin:21.0.5_11-jre-jammy

ARG VERSION
ENV JAR="iudx.auditing.server-cluster-${VERSION}-fat.jar"
Expand Down
4 changes: 2 additions & 2 deletions docker/dev.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG VERSION="1.0.0-SNAPSHOT"

# Using maven base image in builder stage to build Java code.
FROM maven:3-eclipse-temurin-11 as builder
FROM maven:3-eclipse-temurin-21-jammy as builder

WORKDIR /usr/share/app
COPY pom.xml .
Expand All @@ -14,7 +14,7 @@ COPY src src
RUN mvn clean package -Dmaven.test.skip=true

# Java Runtime as the base for final image
FROM eclipse-temurin:11-jre-focal
FROM eclipse-temurin:21.0.5_11-jre-jammy

ARG VERSION
ENV JAR="iudx.auditing.server-dev-${VERSION}-fat.jar"
Expand Down
46 changes: 25 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,23 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hazelcast.version>4.0.2</hazelcast.version>
<curator.version>5.6.0</curator.version>
<micrometer.version>1.12.3</micrometer.version>
<apache-log4j2.version>2.23.0</apache-log4j2.version>
<curator.version>5.7.1</curator.version>
<micrometer.version>1.14.1</micrometer.version>
<apache-log4j2.version>2.24.2</apache-log4j2.version>
<lmax-disruptor.version>4.0.0</lmax-disruptor.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-surefire-report-plugin.version>3.2.5</maven-surefire-report-plugin.version>
<maven-checkstyle-plugin-google.version>3.3.1</maven-checkstyle-plugin-google.version>
<openjdk.version>11</openjdk.version>
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
<maven-surefire-report-plugin.version>3.5.2</maven-surefire-report-plugin.version>
<maven-checkstyle-plugin-google.version>3.6.0</maven-checkstyle-plugin-google.version>
<openjdk.version>21</openjdk.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<disruptor.version>4.0.0</disruptor.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
<checkstyle.version>10.13.0</checkstyle.version>
<maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
<vertx.version>4.5.4</vertx.version>
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<checkstyle.version>10.20.2</checkstyle.version>
<maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
<vertx.version>4.5.11</vertx.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<exec.mainClass>iudx.auditing.server.deploy.Deployer</exec.mainClass>
<exec.mainClassDev>iudx.auditing.server.deploy.DeployerDev</exec.mainClassDev>
</properties>
Expand Down Expand Up @@ -80,7 +79,6 @@
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-rabbitmq-client</artifactId>
<version>4.5.8</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
Expand Down Expand Up @@ -161,23 +159,29 @@
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-zerodep</artifactId>
<version>3.3.5</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
<version>1.17.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version> <!-- Latest Mockito compatible with Java 21 -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.10.0</version>
<version>5.14.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -406,7 +410,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 3d963d6

Please sign in to comment.