Skip to content

Commit 6916bad

Browse files
nroduitnroduit
committed
Prepare to release
1 parent 8feb905 commit 6916bad

File tree

6 files changed

+39
-32
lines changed

6 files changed

+39
-32
lines changed

‎.github/workflows/build-installer.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
19-
java-version: '23'
19+
java-version: '24'
2020
cache: 'maven'
2121

2222
- name: Build with Maven
@@ -75,7 +75,7 @@ jobs:
7575
uses: actions/setup-java@v4
7676
with:
7777
distribution: 'temurin'
78-
java-version: '23'
78+
java-version: '24'
7979

8080
- name: Download weasis-native
8181
uses: actions/download-artifact@v4

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
20-
java-version: '23'
20+
java-version: '24'
2121
cache: 'maven'
2222
- name: Cache SonarCloud packages
2323
uses: actions/cache@v4

‎weasis-core/src/main/java/org/weasis/core/api/media/data/TagW.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ public String addGMTOffset(String format, TagReadable readable) {
453453
if (StringUtil.hasText(format)) {
454454
return format + " " + offset;
455455
} else {
456-
return "$V " + offset;
456+
return "$V " + offset; // NON-NLS
457457
}
458458
}
459459
}

‎weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/mpr/MprView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,8 +654,8 @@ private JMenu buildMipThicknessMenu(boolean all) {
654654
int value = (Integer) thicknessSpinner.getValue();
655655
double mmValue = (value * 2 + 1) * minRatio;
656656
conversionLabel.setText(
657-
" %d pix = %s %s"
658-
.formatted(value, DecFormatter.allNumber(mmValue), abbr)); // NON-NLS
657+
" %d pix = %s %s" // NON-NLS
658+
.formatted(value, DecFormatter.allNumber(mmValue), abbr));
659659
});
660660

661661
// Adding components to the panel

‎weasis-distributions/docker/Dockerfile‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
1-
# Based on image: https://github.com/adoptium/containers/blob/main/22/jdk/ubuntu/jammy/Dockerfile
2-
# Additional packages: https://github.com/adoptium/temurin22-binaries/releases/
1+
# Based on image: https://github.com/adoptium/containers/blob/main/24/jdk/ubuntu/noble/Dockerfile
2+
# Additional packages: https://github.com/adoptium/temurin24-binaries/releases/
33
# Add libraries required by weasis build: bzip2 unzip xz-utils fakeroot rpm
4-
FROM ubuntu:22.04
54

6-
ENV JAVA_HOME /opt/java/openjdk
7-
ENV PATH $JAVA_HOME/bin:$PATH
5+
FROM ubuntu:24.04
6+
7+
ENV JAVA_HOME=/opt/java/openjdk
8+
ENV PATH=$JAVA_HOME/bin:$PATH
89

910
# Default to UTF-8 file.encoding
1011
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
1112

12-
RUN apt-get update \
13-
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget fontconfig ca-certificates p11-kit binutils tzdata locales curl bzip2 unzip xz-utils fakeroot rpm \
14-
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
15-
&& locale-gen en_US.UTF-8 \
16-
&& rm -rf /var/lib/apt/lists/*
13+
RUN set -eux; \
14+
apt-get update; \
15+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget fontconfig ca-certificates p11-kit binutils tzdata locales curl bzip2 unzip xz-utils fakeroot rpm \
16+
; \
17+
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
18+
locale-gen en_US.UTF-8; \
19+
rm -rf /var/lib/apt/lists/*
1720

18-
ENV JAVA_VERSION jdk-22.0.1+8
21+
ENV JAVA_VERSION=jdk-24+36
1922

2023
RUN set -eux; \
2124
ARCH="$(dpkg --print-architecture)"; \
2225
case "${ARCH}" in \
23-
amd64|i386:x86-64) \
24-
ESUM='05cd9359dacb1a1730f7c54f57e0fed47942a5292eb56a3a0ee6b13b87457a43'; \
25-
BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_linux_hotspot_22.0.2_9.tar.gz'; \
26-
;; \
27-
aarch64|arm64) \
28-
ESUM='dac62747b5158c4bf4c4636432e3bdb9dea47f80f0c9d1d007f19bd5483b7d29'; \
29-
BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.2_9.tar.gz'; \
26+
amd64) \
27+
ESUM='78832cb5ea4074f2215cde0d01d6192d09c87636fc24b36647aea61fb23b8272'; \
28+
BINARY_URL='https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_linux_hotspot_24.0.1_9.tar.gz'; \
3029
;; \
31-
armhf|arm) \
32-
ESUM='f82f8dff34e169b1a6244dd75232e338955bd225551279ef0a88bb508ceec0d4'; \
33-
BINARY_URL='https://download.bell-sw.com/java/22.0.2+11/bellsoft-jdk22.0.2+11-linux-arm32-vfp-hflt.tar.gz'; \
30+
arm64) \
31+
ESUM='a598260e340028d9b2383c23df16aa286769a661bd3bf28a52e8c1a5774b1110'; \
32+
BINARY_URL='https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_linux_hotspot_24.0.1_9.tar.gz'; \
3433
;; \
3534
*) \
3635
echo "Unsupported arch: ${ARCH}"; \
3736
exit 1; \
3837
;; \
3938
esac; \
4039
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
40+
wget --progress=dot:giga -O /tmp/openjdk.tar.gz.sig ${BINARY_URL}.sig; \
41+
export GNUPGHOME="$(mktemp -d)"; \
42+
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <temurin-dev@eclipse.org>" imported
43+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
44+
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
45+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
4146
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
4247
mkdir -p "$JAVA_HOME"; \
4348
tar --extract \
@@ -60,5 +65,7 @@ RUN set -eux; \
6065
echo "javac --version"; javac --version; \
6166
echo "java --version"; java --version; \
6267
echo "Complete."
68+
COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh
69+
ENTRYPOINT ["/__cacert_entrypoint.sh"]
6370

6471
CMD ["jshell"]

‎weasis-parent/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<!-- force command line arguments settings to set version -->
1616
<!-- $ mvn clean install -Drevision=4.2.2 -Dchangelist=-SNAPSHOT -->
1717
<revision>4.6.0</revision>
18-
<changelist>-SNAPSHOT</changelist> <!-- Remove "-SNAPSHOT" for release -->
18+
<changelist></changelist> <!-- Remove "-SNAPSHOT" for release -->
1919

20-
<java-version>23</java-version>
21-
<jdk-version>23</jdk-version>
20+
<java-version>24</java-version>
21+
<jdk-version>24</jdk-version>
2222
<enforcer.jdk-version>[${jdk-version},)</enforcer.jdk-version>
2323
<enforcer.maven-version>[3.6.3,)</enforcer.maven-version>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -27,7 +27,7 @@
2727
<app.version>${revision}${changelist}</app.version>
2828
<base.minimal.version>4.6.0</base.minimal.version>
2929
<i18n.version>4.0.0-SNAPSHOT</i18n.version>
30-
<weasis.releasenotes>https://github.com/nroduit/Weasis/blob/master/CHANGELOG.md#v451-2024-09-18</weasis.releasenotes>
30+
<weasis.releasenotes>https://github.com/nroduit/Weasis/blob/master/CHANGELOG.md#v460-2025-04-17</weasis.releasenotes>
3131

3232
<felix.framework.version>7.0.5</felix.framework.version>
3333
<flatlaf.version>3.5.4</flatlaf.version>
@@ -237,7 +237,7 @@
237237
<plugin>
238238
<groupId>org.jacoco</groupId>
239239
<artifactId>jacoco-maven-plugin</artifactId>
240-
<version>0.8.12</version>
240+
<version>0.8.13</version>
241241
</plugin>
242242
</plugins>
243243
</pluginManagement>

0 commit comments

Comments
 (0)