Merge branch 'develop' into refactoring/centralize-dependency-check

cryptomator · Feb 6, 2024 · d300a96 · d300a96
2 parents 643ca07 + 3df1c42
commit d300a96
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,12 +5,11 @@ jobs:
   build:
     name: Build and Test
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Ensure to use tagged version
@@ -25,7 +24,7 @@ jobs:
         env:
           CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
         continue-on-error: true
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: target/*.jar

diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
@@ -15,7 +15,7 @@ jobs:
           ref: "refs/tags/${{ github.event.inputs.tag }}"
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml

diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
           gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import

diff --git a/pom.xml b/pom.xml
@@ -20,9 +20,9 @@
 
 		<!-- dependencies -->
 		<integrations-api.version>1.3.0</integrations-api.version>
-		<webdavservlet.version>1.2.4</webdavservlet.version>
-		<jetty.version>10.0.18</jetty.version>
-		<slf4j.version>2.0.9</slf4j.version>
+		<webdavservlet.version>1.2.5</webdavservlet.version>
+		<jetty.version>10.0.20</jetty.version>
+		<slf4j.version>2.0.11</slf4j.version>
 
 		<!-- test dependencies -->
 		<junit.jupiter.version>5.10.1</junit.jupiter.version>