From dd9e4733104efcaad8ac8fa8e355db175a44f991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sun, 9 Feb 2025 13:23:21 +0100 Subject: [PATCH 01/10] Fix botched test of required Java version --- src/main/java/helma/main/Server.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/helma/main/Server.java b/src/main/java/helma/main/Server.java index 6155de3b..88d70db7 100644 --- a/src/main/java/helma/main/Server.java +++ b/src/main/java/helma/main/Server.java @@ -149,12 +149,13 @@ public class Server implements Runnable { * check if we are running on a Java 2 VM - otherwise exit with an error message */ public static void checkJavaVersion() { - String javaVersion = System.getProperty("java.version"); + String javaVersion = System.getProperty("java.version", "0"); + int majorVersion = Integer.parseInt(javaVersion.split("\\.")[0]); - if ((javaVersion == null) || !javaVersion.startsWith("11")) { + if (majorVersion < 11) { System.err.println("This version of Helma requires Java 11 or greater."); - if (javaVersion == null) { // don't think this will ever happen, but you never know + if (majorVersion == 0) { // don't think this will ever happen, but you never know System.err.println("Your Java Runtime did not provide a version number. Please update to a more recent version."); } else { System.err.println("Your Java Runtime is version " + javaVersion + From 45adacd5cddc89883eb895e8590195f6491a5cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sat, 15 Feb 2025 15:25:13 +0100 Subject: [PATCH 02/10] Use name and URL of actual production environment --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cdad2c55..5acc94a2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,8 +7,8 @@ jobs: runs-on: antville environment: - name: weblogs.at - url: https://weblogs.at + name: antville.org + url: https://antville.org steps: - name: Copy files to production server From 156db3ee986efd324b3e50577ec9beafd1107b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sat, 15 Feb 2025 15:25:36 +0100 Subject: [PATCH 03/10] Try Forgejo action to create a release --- .github/workflows/release.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b189f260..3716dddf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,7 @@ name: Release on: + workflow_dispatch: push: tags: - 'v*' @@ -22,6 +23,15 @@ jobs: - name: Build with Gradle run: ./gradlew assembleDist + - uses: actions/forgejo-release@v2 + with: + direction: upload + url: https://code.host.antville.org + token: ${{ github.token }} + release-dir: build/distributions + release-notes-assistant: true + verbose: true + - name: Create release # FIXME: Currently only outputs gh command; adapt for Forgejo run: | From ff4b4b0f0794be5df0f7058a3f5b7063c83d7f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sat, 15 Feb 2025 15:45:49 +0100 Subject: [PATCH 04/10] =?UTF-8?q?Set=20the=20release=20title=20to=20today?= =?UTF-8?q?=E2=80=99s=20date=20as=20formatted=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3716dddf..77e08fe3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,7 @@ name: Release on: workflow_dispatch: push: - tags: - - 'v*' + tags: '2*' permissions: contents: write @@ -16,6 +15,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} LC_TIME: en_US.UTF-8 + TODAY: $(date +'%d %b %Y') steps: - uses: actions/checkout@v4 @@ -28,6 +28,8 @@ jobs: direction: upload url: https://code.host.antville.org token: ${{ github.token }} + title: ${{ env.TODAY }} + #tag: $(date +'%Y.%m.%d') release-dir: build/distributions release-notes-assistant: true verbose: true From 70337bda407ddad9a28fb384953428ff0fed4e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sat, 15 Feb 2025 15:46:07 +0100 Subject: [PATCH 05/10] Add a custom name for the release workflow --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77e08fe3..bbb377cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,8 @@ jobs: - name: Build with Gradle run: ./gradlew assembleDist - - uses: actions/forgejo-release@v2 + - name: Create release + uses: actions/forgejo-release@v2 with: direction: upload url: https://code.host.antville.org From 5bfcd0b6ea1f1147e79d385f44405a45707bac53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sat, 15 Feb 2025 15:46:32 +0100 Subject: [PATCH 06/10] Distinguish the (currently bogus) GitHub release workflows by name --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbb377cf..52994244 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: release-notes-assistant: true verbose: true - - name: Create release + - name: Create release at GitHub # FIXME: Currently only outputs gh command; adapt for Forgejo run: | echo gh release create "$GITHUB_REF_NAME" \ @@ -43,7 +43,7 @@ jobs: --title "$(date +'%d %b %Y')" \ --generate-notes - - name: Upload assets + - name: Upload release assets to GitHub # FIXME: Currently only outputs gh command; adapt for Forgejo run: | echo gh release upload "$GITHUB_REF_NAME" \ From 94557dd28e481893b5f948bc6d101dd011ef5b91 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 24 Jan 2025 13:14:06 +0000 Subject: [PATCH 07/10] Update dependency gradle to v8.12.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..e18bc253 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From d1ead6e081fb589693c10a43f17ea421f09ab634 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 10 Jan 2025 19:17:53 +0000 Subject: [PATCH 08/10] Update Jetty packages to v9.4.57.v20241219 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index abf4287f..24fdde85 100644 --- a/build.gradle +++ b/build.gradle @@ -66,8 +66,8 @@ dependencies { implementation 'com.sun.mail:javax.mail:1.6.2' implementation 'javax.servlet:javax.servlet-api:4.0.1' implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1' - implementation 'org.eclipse.jetty:jetty-servlet:9.4.56.v20240826' - implementation 'org.eclipse.jetty:jetty-xml:9.4.56.v20240826' + implementation 'org.eclipse.jetty:jetty-servlet:9.4.57.v20241219' + implementation 'org.eclipse.jetty:jetty-xml:9.4.57.v20241219' implementation 'org.mozilla:rhino-all:1.8.0' implementation 'org.sejda.imageio:webp-imageio:0.1.6' implementation 'xerces:xercesImpl:2.12.2' From b1a14ad87baee8eaada5cdff88df59303175d49f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 8 Feb 2025 03:13:48 +0000 Subject: [PATCH 09/10] Update dependency commons-logging:commons-logging to v1.3.5 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 24fdde85..8a00b21c 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.11.0' implementation 'commons-codec:commons-codec:1.17.1' implementation 'commons-fileupload:commons-fileupload:1.5' - implementation 'commons-logging:commons-logging:1.3.4' + implementation 'commons-logging:commons-logging:1.3.5' implementation 'commons-net:commons-net:3.11.1' implementation 'com.sun.mail:javax.mail:1.6.2' implementation 'javax.servlet:javax.servlet-api:4.0.1' From 6f6ea55b7b9220a698d29a167d330e42a2237f42 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 30 Jan 2025 23:13:45 +0000 Subject: [PATCH 10/10] Update dependency com.google.code.gson:gson to v2.12.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8a00b21c..8c71d733 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ configurations { } dependencies { - implementation 'com.google.code.gson:gson:2.11.0' + implementation 'com.google.code.gson:gson:2.12.1' implementation 'commons-codec:commons-codec:1.17.1' implementation 'commons-fileupload:commons-fileupload:1.5' implementation 'commons-logging:commons-logging:1.3.5'