Skip to content

Commit

Permalink
Merge pull request #1241 from eikek/update-java
Browse files Browse the repository at this point in the history
Update java to jdk17
  • Loading branch information
mergify[bot] authored Nov 11, 2023
2 parents 69caad5 + 9a922e2 commit b8843cc
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '11' ]
java: [ '[email protected]' ]
steps:
- uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: true
matrix:
java: [ 'openjdk@1.11' ]
java: [ 'openjdk@1.17' ]
steps:
- uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: true
matrix:
java: [ 'openjdk@1.11' ]
java: [ 'openjdk@1.17' ]
steps:
- uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion docker/build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cd "$(dirname "$0")"

trap "{ docker buildx rm sharry-builder; }" EXIT

platforms="linux/amd64,linux/aarch64,linux/arm/v7"
platforms="linux/amd64,linux/arm64"
docker buildx create --name sharry-builder --use

if [[ $version == *SNAPSHOT* ]]; then
Expand Down
4 changes: 1 addition & 3 deletions docker/sharry.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ ARG version=
ARG sharry_url=
ARG TARGETPLATFORM

RUN JDKPKG="openjdk11"; \
if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then JDKPKG="openjdk8"; fi; \
apk -U add --no-cache $JDKPKG tzdata unzip curl bash
RUN apk -U add --no-cache openjdk17 tzdata unzip curl bash

WORKDIR /opt

Expand Down
6 changes: 3 additions & 3 deletions modules/microsite/docs/doc/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ other options.
It is enough to install the JRE. The JDK is required, if you want to
build sharry from source.

Sharry has been tested with Java version 1.8 (or sometimes referred
to as JRE 8 and JDK 8, respectively). The pre-build packages are also
build using JDK 8. But a later version of Java should work as well.
Sharry has been tested with Java version 17. The pre-build packages
are also build using JDK 17. But a later version of Java should work
as well.


## Database
Expand Down

0 comments on commit b8843cc

Please sign in to comment.