Skip to content

Commit d57e5ee

Browse files
Merge remote-tracking branch 'origin/devin/java8-to-11' into devin/java8-to-11
Co-Authored-By: Joao Esteves <joao.esteves@cognition.ai>
2 parents 1fa8099 + dd1fceb commit d57e5ee

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Stage 1
33
#----------------------------------
44

5-
# Import docker image with maven installed
6-
FROM maven:3.8.3-openjdk-17 as builder
5+
# Import docker image with maven installed (Java 11 for migration)
6+
FROM maven:3.8.8-eclipse-temurin-11 as builder
77

88
# Add maintainer, so that new user will understand who had written this Dockerfile
99
MAINTAINER Madhup Pandey<madhuppandey2908@gmail.com>
@@ -24,8 +24,8 @@ RUN mvn clean install -DskipTests=true
2424
# Stage 2
2525
#--------------------------------------
2626

27-
# Import small size java image
28-
FROM openjdk:17-alpine as deployer
27+
# Import small size java image (Java 11 for migration)
28+
FROM eclipse-temurin:11-jre-alpine as deployer
2929

3030
# Copy build from stage 1 (builder)
3131
COPY --from=builder /src/target/*.jar /src/target/bankapp.jar

Jenkinsfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@
22
pipeline {
33
agent any
44

5+
tools {
6+
jdk 'JDK11' // Configure JDK 11 in Jenkins Global Tool Configuration
7+
maven 'Maven3' // Ensure Maven 3.x is configured
8+
}
9+
510
environment{
611
SONAR_HOME = tool "Sonar"
12+
JAVA_HOME = "${tool 'JDK11'}"
13+
PATH = "${JAVA_HOME}/bin:${env.PATH}"
714
}
815

916
parameters {

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@
8888
<version>3.11.0</version>
8989
<configuration>
9090
<release>11</release>
91+
<compilerArgs>
92+
<arg>-Xlint:all</arg>
93+
</compilerArgs>
9194
</configuration>
9295
</plugin>
9396
<plugin>

0 commit comments

Comments
 (0)