Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dockerfiles/dockerfile.simplatform-amd64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/galasa-dev/openjdk:11-jdk
FROM ghcr.io/galasa-dev/openjdk:17

RUN mkdir /galasa

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ plugins {
id 'biz.aQute.bnd.builder' version '7.1.0'
}

sourceCompatibility = '11'
targetCompatibility = '11'
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

group = '%%prefix%%'
version = '0.1.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<unpackBundle>true</unpackBundle>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ plugins {
id 'biz.aQute.bnd.builder' version '7.1.0'
}

sourceCompatibility = '11'
targetCompatibility = '11'
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

group = '%%prefix%%'
version = '0.1.0'
Expand Down
6 changes: 3 additions & 3 deletions galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<unpackBundle>true</unpackBundle>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions galasa-simbank-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>

<unpackBundle>true</unpackBundle>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tomcat:8.5.82-jre11-temurin
FROM tomcat:9-jre17-temurin

ADD target/galasa-simplatform-webapp.war /usr/local/tomcat/webapps/
EXPOSE 8080
Expand Down
6 changes: 3 additions & 3 deletions galasa-simplatform-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>

<gpg.skip>true</gpg.skip>
Expand Down