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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b189f260..52994244 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,9 @@ name: Release on: + workflow_dispatch: push: - tags: - - 'v*' + tags: '2*' permissions: contents: write @@ -15,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 @@ -23,6 +24,18 @@ jobs: run: ./gradlew assembleDist - name: Create release + uses: actions/forgejo-release@v2 + with: + 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 + + - name: Create release at GitHub # FIXME: Currently only outputs gh command; adapt for Forgejo run: | echo gh release create "$GITHUB_REF_NAME" \ @@ -30,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" \ diff --git a/build.gradle b/build.gradle index bcae67c6..9bde766c 100644 --- a/build.gradle +++ b/build.gradle @@ -58,16 +58,16 @@ 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.18.0' 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' 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' 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 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 +