Merge pull request #24 from ligangty/main

Update github actions

Author: ligangty

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+
+  - package-ecosystem: "github-actions" # Also update Github actions
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/merge-build.yml

@@ -19,7 +19,11 @@
 
 name: Merge / Push Build
 
-on: [push]
+on:
+  push:
+    branches:
+      - 'main'
+      - '1.1.x'
 
 jobs:
   publish-snapshot:
@@ -31,19 +35,17 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
 
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v5
       with:
-        java-version: '11'
-        distribution: 'adopt'
-        # server-id: sonatype
-        # server-username: SONATYPE_BOT_USERNAME
-        # server-password: SONATYPE_BOT_TOKEN
+        distribution: 'temurin'
+        architecture: x64
+        java-version: 17
 
     - name: maven-settings-xml-action
-      uses: whelk-io/maven-settings-xml-action@v14
+      uses: whelk-io/maven-settings-xml-action@v22
       if: ${{ github.event.repository.fork == false }}
       with:
         repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'

.github/workflows/pr-build.yml

@@ -27,16 +27,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
 
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v5
       with:
-        java-version: '11'
-        distribution: 'adopt'
+        distribution: 'temurin'
+        architecture: x64
+        java-version: 17
 
     - name: maven-settings-xml-action
-      uses: whelk-io/maven-settings-xml-action@v14
+      uses: whelk-io/maven-settings-xml-action@v22
       with:
         repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'