Merge branch 'nextcloud:master' into Alexander-Ger-Reich-patch-4

Author: Alexander-Ger-Reich

.drone.yml

@@ -113,6 +113,7 @@ services:
       - su www-data -c "php /var/www/html/occ app:enable -f files_downloadlimit"
       - su www-data -c "git clone --depth 1 -b master https://github.com/nextcloud/recommendations.git /var/www/html/apps/recommendations/"
       - su www-data -c "php /var/www/html/occ app:enable -f recommendations"
+      - su www-data -c "php /var/www/html/occ config:system:set ratelimit.protection.enabled --value false --type bool"
       - /usr/local/bin/run.sh
 
 trigger:
@@ -232,6 +233,7 @@ services:
       - su www-data -c "php /var/www/html/occ app:enable -f files_downloadlimit"
       - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/recommendations.git /var/www/html/apps/recommendations/"
       - su www-data -c "php /var/www/html/occ app:enable recommendations"
+      - su www-data -c "php /var/www/html/occ config:system:set ratelimit.protection.enabled --value false --type bool"
       - /usr/local/bin/run.sh
 
 trigger:
@@ -243,6 +245,6 @@ trigger:
     - pull_request
 ---
 kind: signature
-hmac: f9e2219ba5004d6abb6eb04ede0dedf0b9d5f20d8769228c1e48a09451a54b06
+hmac: 4d9e2296a2418db6dae22e94c282a4b356788d99c268d722721dddddd35f43b3
 
 ...

.github/workflows/analysis.yml

@@ -57,7 +57,7 @@ jobs:
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}
             -   name: Set up JDK 17
-                uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+                uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
                 with:
                     distribution: "temurin"
                     java-version: 17

.github/workflows/assemble.yml

@@ -18,7 +18,7 @@ jobs:
         steps:
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
             - name: Set up JDK 17
-              uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+              uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
               with:
                   distribution: "temurin"
                   java-version: 17

.github/workflows/check.yml

@@ -19,7 +19,7 @@ jobs:
         steps:
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
             - name: Set up JDK 17
-              uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+              uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
               with:
                   distribution: "temurin"
                   java-version: 17

.github/workflows/codeql.yml

@@ -43,11 +43,11 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: "temurin"
           java-version: 17
@@ -57,4 +57,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17

.github/workflows/scorecard.yml

@@ -42,6 +42,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           sarif_file: results.sarif

build.gradle

@@ -12,8 +12,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '2.1.20'
-        jacoco_version = '0.8.12'
+        kotlin_version = '2.1.21'
+        jacoco_version = '0.8.13'
     }
 }
 

gradle/verification-keyring.keys

@@ -1568,6 +1568,42 @@ zZsj/fMJ+OIZcAhE7UVae48GpW2kLATxmK01oSzvizIlmN3rVz2EnjOun2iuuEpF
 =nh9O
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    D2151178A123C97F
+uid    Kengo TODA <[email protected]>
+
+sub    A66A7ADB0B51FECF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGfeJOIBDADF0P+wY8d6xbPIOps8ond3glh4u9PXuL3o9TiyC6zopFCwc//L
+GjPqKEgseyEzjgyTwU8HJORt+N0Kohn6N2ln8GTv1neqVf2mBMgRucvFLcRSFhgU
+ILtJ3r5DLHrITu6JFJwiMyVq1fZQg4XWAAyn9ctAcxW+pjC8x4WmyNsUPUHZN4/P
+WEK3kmawx6y4i8+1yH1ebzy16GRVBD5DfAnDzJumyah/HFvr4gXvvUKybIo4pAts
+6i2Hffg5A8GAGBRTrKH6Oj47fbVO/2ojy1rj3gq5sFvB7qsFtdgXS2NelOa6mYEa
+bsYEH9T13Rsk8Si7OQ83psOG39zXR/2FxgenfO6yrRCX3/2edTDE8YV9Tm0oPRaj
+Qlhpx5IUHH9scEqgntG5PPzuT0kG3nsyDkmvensOLOtGgST/VuJduKfSjQbTRJwJ
+YCoQqwVAMGQR8zBieCUqDrnIZO8ZvJ866YNfdh6SJPELx2+JSBFJpdNXSl0Mn8QD
+UYqQ2eehX1FACo0AEQEAAbQgS2VuZ28gVE9EQSA8c2t5cGVuY2lsQGdtYWlsLmNv
+bT65AY0EZ94k4gEMAMUh5TL/MKjm+WAQhyPWk7YeoE0sAUopa19PjpXFfc4Lxo+w
+3yzj5f436+3UBEUjlZLS29LnotuaVzm1/aKQ0X/5Dcb2263NxrcMwChaoUWdNoih
+gQT8M04BdEA32wPfC0q+IOwb4ifjd/z2ynhs7T/zLpgx7bXSnvRltWQLFjBsyL5T
+EusUBwG32srLZ+tGUsi2laF4Al024JIX+5n7OPTHB3lFNd5lSmH/OtXV+Le0LxM4
+R87JgzRpSmizW97ZdLWMcUD+mcEsX+UVvxpO5gV+rbWeo8Ikzwmd9L/kJNfmOSi1
+H22O4xVQQYjSl8DpnO/SS6oXGTe5tcfRD3hWBwwbCmom5kh4Qp4J02mpsV8/Sbeh
+P+Vyx9zyN86HvVEOaR+HhIZrAvCkltY22fhfWO/fJgWGFb9xAaLKKki3VAM63L76
+IuTMh9GWOG8yDeazO6ZMuMOKy+N1frnnfhtTxpMa4aIzWLcTXMkNQ5Na4gRgFSU5
+lpwIu6BtDqVCOnVvYQARAQABiQG8BBgBCAAmFiEE2HjUqCPq5zG3KdGo0hUReKEj
+yX8FAmfeJOICGwwFCQPCZwAACgkQ0hUReKEjyX+VXwwAv/tNnVZKu4FJu3PKZvog
+oh1gJIRvf3PQ9JYdXT9TjChUSgKM/hrzmXBJaYeWLlvcsgutNBxGU+QyvMdmhTjs
+fC8I7R8yzJhe8G/fH55qvsvHH84W+ha2IV9Wlo+KnhHXpsIqt8HDGfUADQpREJ+5
+JoVVqvrzpuucEk86w7//olSl68AhH1E/ANsv1Jgc5YeQTMycoGV/ojYe1h2VokCg
+I9eS6YCUSJSPW3uRK2zI1Mnt4CUVjZOhaXOyqN1VbFIWwsBs+pnWJ/brNEtjlBWi
+L9P66ikq5XtgWD21uwPXacNDrhzKuc3Snsyt344vApQcpuNnMdCY8rlQ54wlpRt6
+OZ0GW4tpzlWxDzDdDWUqYZ8fXUWqLZBqNdfF/faiKWcYLVLxSv+AjXrYBzjsiZRz
+k0pIRi3YiAbICiv3wjqUGt1R8SCO2F8XzDKT8bHhPUQlqf5nujd5xb81cD0SU8tw
+NINnVCD3nc/mh3Vr0dbJRKF6QoekO3w3iQ7YhpdNkX7f
+=+han
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    D364ABAA39A47320
 uid    Liam Miller-Cushon (Error Prone releases) <[email protected]>