Skip to content

Commit db80a8d

Browse files
committed
Update jdk for release
1 parent c0e7e63 commit db80a8d

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

snap/snapcraft.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: weasis
22
title: Weasis
33
base: core20
4-
version: '4.2.0'
4+
version: '4.2.1'
55
summary: A free/libre/open medical DICOM viewer
66
description: |
77
Weasis is a multipurpose standalone and web-based DICOM viewer with
@@ -57,8 +57,8 @@ parts:
5757
remote-openjdk:
5858
plugin: dump
5959
source:
60-
- on amd64: https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jdk_x64_linux_hotspot_21_35.tar.gz
61-
- on arm64: https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jdk_aarch64_linux_hotspot_21_35.tar.gz
60+
- on amd64: https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz
61+
- on arm64: https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz
6262
organize:
6363
'*': java-runtime/
6464
override-stage: 'true'
@@ -74,7 +74,7 @@ parts:
7474
- libstdc++6
7575
- libgcc1
7676
#source: weasis-distributions/target/native-dist/weasis-native.zip
77-
source: https://github.com/nroduit/Weasis/releases/download/v4.2.0/weasis-native.zip
77+
source: https://github.com/nroduit/Weasis/releases/download/v4.2.1/weasis-native.zip
7878
organize:
7979
'*': weasis-native/
8080
override-stage: 'true'

weasis-distributions/docker/Dockerfile

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@ RUN apt-get update \
1515
&& locale-gen en_US.UTF-8 \
1616
&& rm -rf /var/lib/apt/lists/*
1717

18-
ENV JAVA_VERSION jdk-21+35
18+
ENV JAVA_VERSION jdk-21.0.1+12
1919

2020
RUN set -eux; \
2121
ARCH="$(dpkg --print-architecture)"; \
2222
case "${ARCH}" in \
2323
aarch64|arm64) \
24-
ESUM='33e440c237438aa2e3866d84ead8d4e00dc0992d98d9fd0ee2fe48192f2dbc4b'; \
25-
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jdk_aarch64_linux_hotspot_21_35.tar.gz'; \
26-
;; \
27-
armhf|arm) \
28-
ESUM='43d0e2b021cbe51be30683f550eabe2476b3b21e65986ffe1d929fca10e0a0e6'; \
29-
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk21-2023-08-09-06-56-beta/OpenJDK21U-jdk_arm_linux_hotspot_2023-08-09-06-56.tar.gz'; \
24+
ESUM='e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9'; \
25+
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz'; \
3026
;; \
3127
amd64|i386:x86-64) \
32-
ESUM='82f64c53acaa045370d6762ebd7441b74e6fda14b464d54d1ff8ca941ec069e6'; \
33-
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jdk_x64_linux_hotspot_21_35.tar.gz'; \
28+
ESUM='1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1'; \
29+
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz'; \
30+
;; \
31+
armhf|arm) \
32+
ESUM='ea1368e420a9e2501dfd5c987b1d5e84895089c793661d75430cd2cad1c858a3'; \
33+
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk21u-2023-11-08-15-55-beta/OpenJDK21U-jdk_arm_linux_hotspot_2023-11-08-15-55.tar.gz'; \
3434
;; \
3535
*) \
3636
echo "Unsupported arch: ${ARCH}"; \
3737
exit 1; \
3838
;; \
3939
esac; \
40-
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
40+
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
4141
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
4242
mkdir -p "$JAVA_HOME"; \
4343
tar --extract \
@@ -54,10 +54,11 @@ RUN set -eux; \
5454
# https://openjdk.java.net/jeps/341
5555
java -Xshare:dump;
5656

57-
RUN echo Verifying install ... \
58-
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
59-
&& echo javac --version && javac --version \
60-
&& echo java --version && java --version \
61-
&& echo Complete.
57+
RUN set -eux; \
58+
echo "Verifying install ..."; \
59+
fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
60+
echo "javac --version"; javac --version; \
61+
echo "java --version"; java --version; \
62+
echo "Complete."
6263

6364
CMD ["jshell"]

0 commit comments

Comments
 (0)