From d19e77432e271327701aff9b4e3554e12d9d692b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 21 Sep 2022 09:28:37 +0200 Subject: [PATCH 1/7] build with jdk 19 --- .github/workflows/appimage.yml | 4 ++-- .github/workflows/build.yml | 4 ++-- .github/workflows/debian.yml | 4 ++-- .github/workflows/mac-dmg.yml | 4 ++-- .github/workflows/pullrequest.yml | 4 ++-- .github/workflows/win-exe.yml | 4 ++-- .idea/misc.xml | 2 +- pom.xml | 16 ++++++++-------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 7027c9ddf..e18f048a6 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -10,7 +10,7 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: build: @@ -23,7 +23,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - id: versions diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5270365b3..3707cd46f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: types: [labeled] env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 defaults: run: @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Cache SonarCloud packages diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 6f43b5155..fb0a8f9e3 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -15,7 +15,7 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: build: @@ -32,7 +32,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - id: versions diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 0d175fbf9..21a790fa0 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -10,7 +10,7 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: build: @@ -33,7 +33,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} architecture: ${{ matrix.architecture }} cache: 'maven' diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 79a0d5a21..66fab46a5 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -4,7 +4,7 @@ on: pull_request: env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 defaults: run: @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Build and Test diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 91d967bf7..8cbdad21e 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -15,7 +15,7 @@ on: default: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 defaults: run: @@ -32,7 +32,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - id: versions diff --git a/.idea/misc.xml b/.idea/misc.xml index 4731638fd..e5d629592 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ba9f44c88..1fd9855d8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ UTF-8 - 17 + 19 com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh @@ -52,14 +52,14 @@ 1.7.0 - 5.8.1 - 4.4.0 + 5.9.1 + 4.8.0 2.2 23.0.0 - 7.1.0 - 0.8.7 + 7.2.1 + 0.8.8 @@ -263,7 +263,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 + 3.3.0 org.apache.maven.plugins @@ -273,7 +273,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.0.0-M7 org.codehaus.mojo @@ -283,7 +283,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.2 + 3.3.0 org.jacoco From cde67966daf644cd899a275d781f57c35eee6401 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 21 Sep 2022 09:49:57 +0200 Subject: [PATCH 2/7] fix test --- .../java/org/cryptomator/launcher/SupportedLanguagesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java index 5a9f1bc07..7d76409e8 100644 --- a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java +++ b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java @@ -18,7 +18,7 @@ public class SupportedLanguagesTest { var locale = Locale.forLanguageTag(tag); Assertions.assertNotEquals("und", locale.toLanguageTag(), "Undefined language tag"); - var bundle = Assertions.assertDoesNotThrow(() -> ResourceBundle.getBundle("/i18n/strings", locale)); + var bundle = Assertions.assertDoesNotThrow(() -> ResourceBundle.getBundle("i18n.strings", locale)); Assertions.assertEquals(locale, bundle.getLocale()); Assertions.assertFalse(bundle.keySet().isEmpty()); From dd31908f3a784dc27412b9dad772eb44e0a3b8a2 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 21 Sep 2022 15:50:08 +0200 Subject: [PATCH 3/7] Use for windows exe and msi build same JDKs --- .github/workflows/win-exe.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 8cbdad21e..55ee4b2b0 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -16,6 +16,8 @@ on: env: JAVA_VERSION: 19 + JAVA_DIST: 'zulu' + JAVA_CACHE: 'maven' defaults: run: @@ -32,9 +34,9 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - distribution: 'zulu' + distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} - cache: 'maven' + cache: ${{ env.JAVA_CACHE }} - id: versions name: Apply version information run: | @@ -223,9 +225,9 @@ jobs: run: mv dist/win/bundle/resources/Cryptomator*.msi dist/win/bundle/resources/Cryptomator.msi - uses: actions/setup-java@v2 with: - distribution: 'temurin' + distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} - cache: 'maven' + cache: ${{ env.JAVA_CACHE }} - name: Generate license for exe run: > mvn -B license:add-third-party From 6367cc2dfb5aa0bdf30dd54d2a61d74659333fc0 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 14 Oct 2022 13:10:37 +0200 Subject: [PATCH 4/7] depend on coffeelibs-jdk-19 --- .github/workflows/debian.yml | 2 +- dist/linux/debian/control | 2 +- dist/linux/debian/rules | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 687dd0834..e225e7f38 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -20,7 +20,7 @@ env: jobs: build: name: Build Debian Package - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 with: diff --git a/dist/linux/debian/control b/dist/linux/debian/control index ef06120b3..77aba901c 100644 --- a/dist/linux/debian/control +++ b/dist/linux/debian/control @@ -2,7 +2,7 @@ Source: cryptomator Maintainer: Cryptobot Section: utils Priority: optional -Build-Depends: debhelper (>=10), openjdk-17-jdk +Build-Depends: debhelper (>=10), coffeelibs-jdk-19 Standards-Version: 4.5.0 Homepage: https://cryptomator.org Vcs-Git: https://github.com/cryptomator/cryptomator.git diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index b77e6f8f2..04c256f60 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -4,6 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +JAVA_HOME = /usr/lib/jvm/java-19-coffeelibs + %: dh $@ @@ -16,7 +18,7 @@ override_dh_auto_clean: override_dh_auto_build: mkdir resources ln -s ../common/org.cryptomator.Cryptomator512.png resources/cryptomator.png - jlink \ + $(JAVA_HOME)/bin/jlink \ --output runtime \ --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \ --strip-native-commands \ @@ -24,7 +26,7 @@ override_dh_auto_build: --no-man-pages \ --strip-debug \ --compress=2 - jpackage \ + $(JAVA_HOME)/bin/jpackage \ --type app-image \ --runtime-image runtime \ --input libs \ From 01698d139397797a490b661aa09a931414b8be76 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 14 Oct 2022 13:21:28 +0200 Subject: [PATCH 5/7] install required build-dependency --- .github/workflows/debian.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index e225e7f38..cf5a108f2 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -27,8 +27,9 @@ jobs: fetch-depth: 0 - name: Install build tools run: | + sudo add-apt-repository ppa:coffeelibs/openjdk sudo apt-get update - sudo apt-get install debhelper devscripts dput + sudo apt-get install debhelper devscripts dput java-19-coffeelibs - name: Setup Java uses: actions/setup-java@v3 with: From 687bed6984a5d179a74c185bb4d034b2f99489ac Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 14 Oct 2022 13:24:08 +0200 Subject: [PATCH 6/7] use the correct name of required build-dependency --- .github/workflows/debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index cf5a108f2..088adf87e 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -29,7 +29,7 @@ jobs: run: | sudo add-apt-repository ppa:coffeelibs/openjdk sudo apt-get update - sudo apt-get install debhelper devscripts dput java-19-coffeelibs + sudo apt-get install debhelper devscripts dput coffeelibs-jdk-19 - name: Setup Java uses: actions/setup-java@v3 with: From 1f019231693931ae23f7f59e0179d9bb8d10b03f Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 14 Oct 2022 13:44:50 +0200 Subject: [PATCH 7/7] build on Ubuntu Focal --- dist/linux/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/linux/debian/changelog b/dist/linux/debian/changelog index 2c7606733..84a9756f9 100644 --- a/dist/linux/debian/changelog +++ b/dist/linux/debian/changelog @@ -1,4 +1,4 @@ -cryptomator (${PPA_VERSION}) bionic; urgency=low +cryptomator (${PPA_VERSION}) focal; urgency=low * Full changelog can be found on https://github.com/cryptomator/cryptomator/releases