Skip to content

Commit 001dec5

Browse files
authored
Iss2409 - Remove Java 11 support (#204)
* feat: Update source and target compatibility Java version to 17 Signed-off-by: Jade Carino <carino_jade@yahoo.co.uk> * feat: Update simplatform-jar Dockerfile to build based on Open JDK 17 Signed-off-by: Jade Carino <carino_jade@yahoo.co.uk> * feat: Update Simplatform web app to use Tomcat version 9 Java 17 base image Signed-off-by: Jade Carino <carino_jade@yahoo.co.uk> --------- Signed-off-by: Jade Carino <carino_jade@yahoo.co.uk>
1 parent 349d65d commit 001dec5

File tree

8 files changed

+24
-18
lines changed

8 files changed

+24
-18
lines changed

dockerfiles/dockerfile.simplatform-amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/galasa-dev/openjdk:11-jdk
1+
FROM ghcr.io/galasa-dev/openjdk:17
22

33
RUN mkdir /galasa
44

galasa-simbank-tests/dev.galasa.simbank.manager/build-example.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ plugins {
33
id 'biz.aQute.bnd.builder' version '7.1.0'
44
}
55

6-
sourceCompatibility = '11'
7-
targetCompatibility = '11'
6+
java {
7+
toolchain {
8+
languageVersion = JavaLanguageVersion.of(17)
9+
}
10+
}
811

912
group = '%%prefix%%'
1013
version = '0.1.0'

galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
14-
<java.version>11</java.version>
15-
<maven.compiler.source>11</maven.compiler.source>
16-
<maven.compiler.target>11</maven.compiler.target>
14+
<java.version>17</java.version>
15+
<maven.compiler.source>17</maven.compiler.source>
16+
<maven.compiler.target>17</maven.compiler.target>
1717
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
1818
<unpackBundle>true</unpackBundle>
1919
</properties>

galasa-simbank-tests/dev.galasa.simbank.tests/build-example.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ plugins {
33
id 'biz.aQute.bnd.builder' version '7.1.0'
44
}
55

6-
sourceCompatibility = '11'
7-
targetCompatibility = '11'
6+
java {
7+
toolchain {
8+
languageVersion = JavaLanguageVersion.of(17)
9+
}
10+
}
811

912
group = '%%prefix%%'
1013
version = '0.1.0'

galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
14-
<java.version>11</java.version>
15-
<maven.compiler.source>11</maven.compiler.source>
16-
<maven.compiler.target>11</maven.compiler.target>
14+
<java.version>17</java.version>
15+
<maven.compiler.source>17</maven.compiler.source>
16+
<maven.compiler.target>17</maven.compiler.target>
1717
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
1818
<unpackBundle>true</unpackBundle>
1919
</properties>

galasa-simbank-tests/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
<properties>
6060
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6161
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
62-
<java.version>11</java.version>
63-
<maven.compiler.source>11</maven.compiler.source>
64-
<maven.compiler.target>11</maven.compiler.target>
62+
<java.version>17</java.version>
63+
<maven.compiler.source>17</maven.compiler.source>
64+
<maven.compiler.target>17</maven.compiler.target>
6565
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
6666

6767
<unpackBundle>true</unpackBundle>

galasa-simplatform-application/galasa-simplatform-webapp/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tomcat:8.5.82-jre11-temurin
1+
FROM tomcat:9-jre17-temurin
22

33
ADD target/galasa-simplatform-webapp.war /usr/local/tomcat/webapps/
44
EXPOSE 8080

galasa-simplatform-application/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
<properties>
5757
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5858
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
59-
<java.version>11</java.version>
60-
<maven.compiler.source>11</maven.compiler.source>
61-
<maven.compiler.target>11</maven.compiler.target>
59+
<java.version>17</java.version>
60+
<maven.compiler.source>17</maven.compiler.source>
61+
<maven.compiler.target>17</maven.compiler.target>
6262
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
6363

6464
<gpg.skip>true</gpg.skip>

0 commit comments

Comments
 (0)