Skip to content

Commit dff791f

Browse files
authored
Update to Java 17 (#39)
* Update to Java 17 * Add build script * Update parent Docker image to Java 17
1 parent ca8f420 commit dff791f

File tree

7 files changed

+32
-13
lines changed

7 files changed

+32
-13
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup Java JDK
1515
uses: actions/[email protected]
1616
with:
17-
java-version: 11
17+
java-version: 17
1818
distribution: temurin
1919
- name: Test
2020
run: ./gradlew clean check
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Java JDK
3030
uses: actions/[email protected]
3131
with:
32-
java-version: 11
32+
java-version: 17
3333
distribution: temurin
3434

3535
- name: Build
@@ -63,7 +63,7 @@ jobs:
6363
- name: Setup Java JDK
6464
uses: actions/[email protected]
6565
with:
66-
java-version: 11
66+
java-version: 17
6767
distribution: temurin
6868

6969
- name: Deploy

.github/workflows/codeql-analysis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ jobs:
4848

4949
# Setup Java version
5050
- name: Setup Java JDK
51-
uses: actions/setup-java@v1
51+
uses: actions/setup-java@v2.3.0
5252
with:
53-
java-version: 11
53+
java-version: 17
54+
distribution: temurin
5455

5556
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5657
# If this step fails, then you should remove it and run the build manually (see below)

.github/workflows/pr.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ jobs:
1212
uses: actions/checkout@v2
1313

1414
- name: Setup Java JDK
15-
uses: actions/setup-java@v1.4.3
15+
uses: actions/setup-java@v2.3.0
1616
with:
17-
java-version: 11
17+
java-version: 17
18+
distribution: temurin
1819

1920
- name: Test
2021
run: ./gradlew clean check
@@ -27,9 +28,10 @@ jobs:
2728
uses: actions/checkout@v2
2829

2930
- name: Setup Java JDK
30-
uses: actions/setup-java@v1.4.3
31+
uses: actions/setup-java@v2.3.0
3132
with:
32-
java-version: 11
33+
java-version: 17
34+
distribution: temurin
3335

3436
- name: Build
3537
run: ./gradlew clean build -x test -x intTest

autobot/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:11
1+
FROM eclipse-temurin:17
22

33
RUN mkdir -p /opt/app
44
COPY build/libs/*.jar /opt/app

autobot/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import okhttp3.Request
1515
import okhttp3.RequestBody.Companion.toRequestBody
1616
import org.yaml.snakeyaml.Yaml
1717

18-
val javaVersion = JavaVersion.VERSION_11
18+
val javaVersion = JavaVersion.VERSION_17
1919

2020
fun String.runCommand(currentWorkingDir: File = file("./")): String {
2121
val byteOut = ByteArrayOutputStream()
@@ -43,7 +43,7 @@ plugins {
4343
id("com.heroku.sdk.heroku-gradle") version "2.0.0"
4444
id("io.spring.dependency-management") version "1.0.11.RELEASE"
4545
id("org.springframework.boot") version "2.6.0"
46-
id("com.gorylenko.gradle-git-properties") version "2.2.2"
46+
id("com.gorylenko.gradle-git-properties") version "2.3.1"
4747
id("checkstyle")
4848
id("pmd")
4949
id("com.github.spotbugs") version "4.7.5"

build.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash -ex
2+
3+
export JAVA_HOME=`/usr/libexec/java_home -v 17`
4+
echo `java -version`
5+
./gradlew clean build

gradle.properties

+12-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,15 @@ pmd.version=6.40.0
2323
snakeyaml.version=1.29
2424
spotbugs.version=4.4.2
2525
twitter4j-core.version=4.0.7
26-
wiremock-jre8.version=2.31.0
26+
wiremock-jre8.version=2.31.0
27+
28+
#
29+
# Gradle arguments
30+
#
31+
# Flags are required due to https://openjdk.java.net/jeps/396
32+
org.gradle.jvmargs=--add-opens java.base/java.io=ALL-UNNAMED \
33+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
34+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
35+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
36+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
37+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

0 commit comments

Comments
 (0)