Merge remote-tracking branch 'upstream/main' into fix-10424

JabRef · Dec 4, 2023 · 6e4a677 · 6e4a677
2 parents 4bce5f4 + 1185fda
commit 6e4a677
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.head_ref }}"
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml
@@ -22,7 +22,7 @@ env:
   JAVA_OPTS: -Xmx4g
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -31,7 +31,7 @@ env:
   JDK21: ""
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml
@@ -29,7 +29,7 @@ env:
   BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey_FOR_TESTS}}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 permissions:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ env:
   JAVA_OPTS: -Xmx4g
 
 concurrency:
-  group: tests-${{ github.head_ref }}
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 permissions:

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -8,9 +8,14 @@ on:
 jobs:
   update-gradle-wrapper:
     runs-on: ubuntu-latest
-
+   
     steps:
       - uses: actions/checkout@v4
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: 21.0.1
+          distribution: 'liberica'
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles
+3 −6		associacao-brasileira-de-normas-tecnicas-ufrgs.csl
+5 −1		bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl
+88 −25		haute-ecole-de-gestion-de-geneve-iso-690.csl
+118 −58		iso690-author-date-en.csl
+107 −51		iso690-author-date-fr.csl
+1 −1		iso690-numeric-en.csl
+1 −1		iso690-numeric-fr.csl
+19 −39		universite-de-sherbrooke-histoire.csl
+2 −2		weed-science-society-of-america.csl