Merge branch 'develop'

intranda · Feb 2, 2024 · 2101622 · 2101622
2 parents a068ba7 + 5a1477e
commit 2101622
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -8,10 +8,10 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       name: Checkout Goobi viewer Indexer
 
     - uses: actions/cache@v1
@@ -22,11 +22,11 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
 
-    - name: Set up Java 11
-      uses: actions/setup-java@v2
+    - name: Set up Java 17
+      uses: actions/setup-java@v4
       with:
-        distribution: 'zulu'
-        java-version: '11'
+        distribution: 'temurin'
+        java-version: '17'
 
     - name: Compile Goobi viewer Indexer
       run: mvn -f goobi-viewer-indexer/pom.xml clean package -U -B

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,10 +8,10 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       name: Checkout Goobi viewer Indexer
 
     - uses: actions/cache@v1
@@ -22,11 +22,11 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
 
-    - name: Set up Java 11
-      uses: actions/setup-java@v2
+    - name: Set up Java 17
+      uses: actions/setup-java@v4
       with:
-        distribution: 'zulu'
-        java-version: '11'
+        distribution: 'temurin'
+        java-version: '17'
 
     - name: Create solrIndexer.jar
       run: mvn -f goobi-viewer-indexer/pom.xml clean package -U -B