Skip to content

Commit

Permalink
Update to Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
heyLu committed Jan 10, 2024
1 parent f36155a commit e8d78e6
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ jobs:
- name: Install GraphViz
run: sudo apt-get install graphviz -y

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: temurin

- name: Build Java server
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- uses: actions/checkout@v4
- name: Install GraphViz
run: sudo apt-get install graphviz -y
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: temurin
- name: Build Java server
run: make buildServer
Expand All @@ -38,10 +38,10 @@ jobs:
- uses: actions/checkout@v4
- name: Install GraphViz
run: sudo apt-get install graphviz -y
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: temurin
- name: Build Java server
run: make buildServer
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/update-versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ try {
diagramLibraryVersions.diagramsnet = [...diagramsnetVersionFound][0].groups.version
}

const dockerfileContent = await fs.readFile(ospath.join(rootDir, 'server', 'ops', 'docker', 'jdk11-jammy', 'Dockerfile'), 'utf8')
const dockerfileContent = await fs.readFile(ospath.join(rootDir, 'server', 'ops', 'docker', 'jdk17-jammy', 'Dockerfile'), 'utf8')
for (const line of dockerfileContent.split('\n')) {
const d2VersionFound = line.match(/^ARG D2_VERSION="(?<version>.+)"$/)
if (d2VersionFound) {
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ target "kroki" {
bytefield = "./bytefield"
tikz = "./tikz"
}
dockerfile = "ops/docker/jdk11-jammy/Dockerfile"
dockerfile = "ops/docker/jdk17-jammy/Dockerfile"
tags = ["yuzutech/kroki:${TAG}"]
}

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<configuration>
<source>8</source>
<target>8</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
Expand Down
6 changes: 3 additions & 3 deletions server/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ When a new version is available, we need to :

. update the fork
. run the following workflow: https://github.com/yuzutech/ditaa-mini/actions/workflows/native-image-on-demand.yml
. update the argument variable `ARG DITAA_VERSION="x.y.z"` in `server/ops/docker/jdk11-jammy/Dockerfile`
. update the argument variable `ARG DITAA_VERSION="x.y.z"` in `server/ops/docker/jdk17-jammy/Dockerfile`

=== PlantUML

Expand All @@ -24,7 +24,7 @@ When a new version is available, we need to:

. update the fork
. run the following workflow: https://github.com/yuzutech/plantuml/actions/workflows/native-image-on-demand.yml
. update the argument variable `ARG PLANTUML_VERSION="x.y.z"` in `server/ops/docker/jdk11-jammy/Dockerfile`
. update the argument variable `ARG PLANTUML_VERSION="x.y.z"` in `server/ops/docker/jdk17-jammy/Dockerfile`

=== UMLet

Expand All @@ -34,4 +34,4 @@ When a new version is available, we need to:

. update the fork
. run the following workflow: https://github.com/yuzutech/umlet/actions/workflows/release.yml
. update the argument variable `ARG UMLET_VERSION="x.y.z"` in `server/ops/docker/jdk11-jammy/Dockerfile`
. update the argument variable `ARG UMLET_VERSION="x.y.z"` in `server/ops/docker/jdk17-jammy/Dockerfile`
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ RUN SVGBOB_VERSION=`cat Cargo.toml | grep "svgbob_cli =" | sed -r 's/.*"([^"]+)"
# use a pre-built image to reduce build time

## yuzutech/kroki
FROM eclipse-temurin:11.0.20.1_1-jre-jammy
FROM eclipse-temurin:17.0.9_9-jre-jammy

ARG D2_VERSION="0.6.0"
ARG PLANTUML_VERSION="1.2023.11"
Expand Down
4 changes: 2 additions & 2 deletions server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<assertj-core.version>3.25.0</assertj-core.version>
<mockito-core.version>5.8.0</mockito-core.version>
<slf4j-api.version>2.0.9</slf4j-api.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<owasp-html-sanitizer.version>20220608.1</owasp-html-sanitizer.version>
<structurizr-dsl.version>1.32.0</structurizr-dsl.version>
<structurizr-export.version>1.16.1</structurizr-export.version>
Expand Down

0 comments on commit e8d78e6

Please sign in to comment.