From e6b41e6815bf8ef94bb30984526476a03686d300 Mon Sep 17 00:00:00 2001 From: tamassoltesz Date: Tue, 30 Sep 2025 14:11:51 +0200 Subject: [PATCH 1/6] add jdk instead of jre --- .github/helpers/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/helpers/docker/Dockerfile b/.github/helpers/docker/Dockerfile index 1aefd471..676c9215 100644 --- a/.github/helpers/docker/Dockerfile +++ b/.github/helpers/docker/Dockerfile @@ -4,9 +4,9 @@ RUN apt-get update && apt-get install -y curl wget zip RUN ARCH=$(dpkg --print-architecture) && \ if [ "$ARCH" = "amd64" ]; then \ - wget -O jre.zip https://github.com/supertokens/jre/raw/refs/heads/master/jre-21.0.7-linux.zip; \ + wget -O jre.zip https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-linux-x64.tar.gz; \ elif [ "$ARCH" = "arm64" ]; then \ - wget -O jre.zip https://github.com/supertokens/jre/raw/refs/heads/master/jre-21.0.7-linux-aarch.zip; \ + wget -O jre.zip https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-mac-x64.zip; \ else \ echo "Unsupported architecture: $ARCH" && exit 1; \ fi From a6b9a3802e5e6046807ea07df94db3f36dfbb342 Mon Sep 17 00:00:00 2001 From: tamassoltesz Date: Tue, 30 Sep 2025 14:31:22 +0200 Subject: [PATCH 2/6] fix build --- .github/helpers/docker/Dockerfile | 4 ++-- build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/helpers/docker/Dockerfile b/.github/helpers/docker/Dockerfile index 676c9215..b17ec287 100644 --- a/.github/helpers/docker/Dockerfile +++ b/.github/helpers/docker/Dockerfile @@ -4,14 +4,14 @@ RUN apt-get update && apt-get install -y curl wget zip RUN ARCH=$(dpkg --print-architecture) && \ if [ "$ARCH" = "amd64" ]; then \ - wget -O jre.zip https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-linux-x64.tar.gz; \ + wget -O jre.zip https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-linux-x64.zip; \ elif [ "$ARCH" = "arm64" ]; then \ wget -O jre.zip https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-mac-x64.zip; \ else \ echo "Unsupported architecture: $ARCH" && exit 1; \ fi RUN unzip jre.zip -RUN mv jre-21.0.7 jre || mv jre-21.0.7-linux-aarch/jre-21.0.7 jre +RUN mv jdk-openlogic-openjdk-21.0.8+9-linux-x64 jre || mv openlogic-openjdk-21.0.8+9-mac-x64/jdk-21.0.8.jdk jre ADD ./cli ./cli ADD ./core ./core ADD ./plugin-interface ./plugin-interface diff --git a/build.gradle b/build.gradle index e4f63f45..e6c2f107 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java-library' } -version = "9.1.0" +version = "9.2.0" repositories { mavenCentral() From 09306fcef2776c05d28c706b0c646823fe76b98a Mon Sep 17 00:00:00 2001 From: tamassoltesz Date: Tue, 30 Sep 2025 14:54:38 +0200 Subject: [PATCH 3/6] increase plugin interface version --- pluginInterfaceSupported.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pluginInterfaceSupported.json b/pluginInterfaceSupported.json index 6ca7c9ca..1ae83d46 100644 --- a/pluginInterfaceSupported.json +++ b/pluginInterfaceSupported.json @@ -1,6 +1,6 @@ { "_comment": "contains a list of plugin interfaces branch names that this core supports", "versions": [ - "8.1" + "8.2" ] } From e06e15e3f5c2849fc0eb5388747f9bec6a505c4d Mon Sep 17 00:00:00 2001 From: tamassoltesz Date: Tue, 30 Sep 2025 15:59:27 +0200 Subject: [PATCH 4/6] fix jdk download --- .github/helpers/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/helpers/docker/Dockerfile b/.github/helpers/docker/Dockerfile index b17ec287..0f34ea41 100644 --- a/.github/helpers/docker/Dockerfile +++ b/.github/helpers/docker/Dockerfile @@ -4,14 +4,14 @@ RUN apt-get update && apt-get install -y curl wget zip RUN ARCH=$(dpkg --print-architecture) && \ if [ "$ARCH" = "amd64" ]; then \ - wget -O jre.zip https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-linux-x64.zip; \ + wget -O jre.tar.gz https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-linux-x64.tar.gz; \ elif [ "$ARCH" = "arm64" ]; then \ wget -O jre.zip https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-mac-x64.zip; \ else \ echo "Unsupported architecture: $ARCH" && exit 1; \ fi -RUN unzip jre.zip -RUN mv jdk-openlogic-openjdk-21.0.8+9-linux-x64 jre || mv openlogic-openjdk-21.0.8+9-mac-x64/jdk-21.0.8.jdk jre +RUN unzip jre.zip || tar xvfz jre.tar.gz +RUN mv openlogic-openjdk-21.0.8+9-linux-x64 jre || mv openlogic-openjdk-21.0.8+9-mac-x64/jdk-21.0.8.jdk jre ADD ./cli ./cli ADD ./core ./core ADD ./plugin-interface ./plugin-interface From d6bb32ad555c4d73cdc130b0605ed4e02863d5e7 Mon Sep 17 00:00:00 2001 From: tamassoltesz Date: Tue, 30 Sep 2025 20:17:21 +0200 Subject: [PATCH 5/6] fix jdk download --- .github/helpers/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/helpers/docker/Dockerfile b/.github/helpers/docker/Dockerfile index 0f34ea41..8c0a5989 100644 --- a/.github/helpers/docker/Dockerfile +++ b/.github/helpers/docker/Dockerfile @@ -11,7 +11,7 @@ RUN ARCH=$(dpkg --print-architecture) && \ echo "Unsupported architecture: $ARCH" && exit 1; \ fi RUN unzip jre.zip || tar xvfz jre.tar.gz -RUN mv openlogic-openjdk-21.0.8+9-linux-x64 jre || mv openlogic-openjdk-21.0.8+9-mac-x64/jdk-21.0.8.jdk jre +RUN mv openlogic-openjdk-21.0.8+9-linux-x64 jre && ls jre || mv openlogic-openjdk-21.0.8+9-mac-x64/jdk-21.0.8.jdk jre && ls jre ADD ./cli ./cli ADD ./core ./core ADD ./plugin-interface ./plugin-interface From 5c304e3eed51204c2fe811f700b1da03c0064662 Mon Sep 17 00:00:00 2001 From: tamassoltesz Date: Tue, 30 Sep 2025 20:38:45 +0200 Subject: [PATCH 6/6] unify jdk handling --- .github/helpers/docker/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/helpers/docker/Dockerfile b/.github/helpers/docker/Dockerfile index 8c0a5989..51fd6d48 100644 --- a/.github/helpers/docker/Dockerfile +++ b/.github/helpers/docker/Dockerfile @@ -4,14 +4,14 @@ RUN apt-get update && apt-get install -y curl wget zip RUN ARCH=$(dpkg --print-architecture) && \ if [ "$ARCH" = "amd64" ]; then \ - wget -O jre.tar.gz https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-linux-x64.tar.gz; \ + wget -O jre.tar.gz https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8+9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.8_9.tar.gz; \ elif [ "$ARCH" = "arm64" ]; then \ - wget -O jre.zip https://builds.openlogic.com/downloadJDK/openlogic-openjdk/21.0.8+9/openlogic-openjdk-21.0.8+9-mac-x64.zip; \ + wget -O jre.tar.gz https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8+9/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.8_9.tar.gz; \ else \ echo "Unsupported architecture: $ARCH" && exit 1; \ fi -RUN unzip jre.zip || tar xvfz jre.tar.gz -RUN mv openlogic-openjdk-21.0.8+9-linux-x64 jre && ls jre || mv openlogic-openjdk-21.0.8+9-mac-x64/jdk-21.0.8.jdk jre && ls jre +RUN tar xvfz jre.tar.gz +RUN mv jdk-21.0.8+9 jre ADD ./cli ./cli ADD ./core ./core ADD ./plugin-interface ./plugin-interface