Merge branch 'main' into new-cli-site-updates

.github/actions/ci-incr-build-cache-prepare/action.yml

@@ -29,7 +29,7 @@ runs:
         fi
 
     - name: Gradle / Setup
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
       with:
         cache-read-only: ${{ inputs.cache-read-only }}
 
@@ -38,7 +38,7 @@ runs:
       run: ./gradlew -h
 
     - name: Download existing workflow artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4
       # Just in case, don't know the exact inner workings of Gradle's build cache and whether
       # the download-action complains about duplicate files.
       continue-on-error: true

.github/actions/ci-incr-build-cache-save/action.yml

@@ -46,7 +46,7 @@ runs:
           echo "::endgroup::"
         fi
     - name: Archive code-checks incremental
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
       with:
         name: ci-gradle-caches-${{ inputs.job-name }}-${{ inputs.java-version }}
         path: ~/ci-gradle-caches-${{ inputs.job-name }}-${{ inputs.java-version }}.tar

.github/actions/dev-tool-java/action.yml

@@ -13,7 +13,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up JDK ${{ inputs.java-version }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
       with:
         distribution: 'temurin'
         java-version: |

.github/actions/dev-tool-python/action.yml

@@ -9,7 +9,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up Python ${{ inputs.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
       with:
         python-version: ${{ inputs.python-version }}
     - name: Install dependencies

.github/renovate.json5

@@ -43,6 +43,14 @@
       platformAutomerge: true
     },
 
+    // Dockerfile pin/digest updates
+    {
+      matchManagers: ["dockerfile"],
+      matchUpdateTypes: ["pin", "pinDigest", "digest"],
+      automerge: true,
+      platformAutomerge: true
+    },
+
     // Check for updates, merge automatically
     {
       matchManagers: ["maven", "gradle", "gradle-wrapper", "pip_requirements", "pip_setup", "dockerfile"],

.github/workflows/bump-version.yml

@@ -64,7 +64,7 @@ jobs:
       run: echo "PREVIOUS_VERSION=$(cat version.txt)" >> ${GITHUB_ENV}
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
       env:
         # Same as for ci.yml
         GRADLE_BUILD_ACTION_CACHE_KEY_ENVIRONMENT: java-17

.github/workflows/ci-mac.yml

@@ -51,7 +51,7 @@ jobs:
       uses: ./.github/actions/dev-tool-java
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
       env:
         # Same as for ci.yml
         GRADLE_BUILD_ACTION_CACHE_KEY_ENVIRONMENT: java-17
@@ -69,7 +69,7 @@ jobs:
       run: ./gradlew test --scan
 
     - name: Capture Test Reports
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
       if: ${{ failure() }}
       with:
         name: test-results

.github/workflows/ci-win.yml

@@ -63,7 +63,7 @@ jobs:
       uses: ./.github/actions/dev-tool-java
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
       env:
         # Same as for ci.yml
         GRADLE_BUILD_ACTION_CACHE_KEY_ENVIRONMENT: java-17

.github/workflows/ci.yml

@@ -144,7 +144,7 @@ jobs:
         run: ./gradlew test :nessie-client:check -x :nessie-client:intTest -x :nessie-quarkus:test -x :nessie-server-admin-tool:test -x :nessie-events-quarkus:test --scan
 
       - name: Capture Test Reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
         if: ${{ failure() }}
         with:
           name: ci-test-reports
@@ -206,7 +206,7 @@ jobs:
           done
 
       - name: Capture Test Reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
         if: ${{ failure() }}
         with:
           name: ci-test-quarkus-reports
@@ -269,7 +269,7 @@ jobs:
             --scan
 
       - name: Capture Test Reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
         if: ${{ failure() }}
         with:
           name: ci-inttest-reports
@@ -320,7 +320,7 @@ jobs:
           ./gradlew $(cat ../persist-prjs.txt) $(cat ../storage-prjs.txt) --scan
 
       - name: Capture Test Reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
         if: ${{ failure() }}
         with:
           name: ci-inttest-stores-reports
@@ -361,7 +361,7 @@ jobs:
           ./gradlew $(cat ../spark-prjs.txt) --scan
 
       - name: Capture Test Reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
         if: ${{ failure() }}
         with:
           name: ci-inttest-integrations-reports
@@ -429,7 +429,7 @@ jobs:
           done
 
       - name: Capture Test Reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
         if: ${{ failure() }}
         with:
           name: ci-inttest-quarkus-reports
@@ -461,7 +461,7 @@ jobs:
         run: npm install minimatch@"^7.4.3"
       - name: Determine conditional jobs to run
         id: determine
-        uses: actions/github-script@v7
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             const {Minimatch} = require("minimatch");
@@ -581,21 +581,21 @@ jobs:
         uses: ./.github/actions/free-disk-space
 
       - name: Setup Helm
-        uses: azure/setup-helm@v4
+        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4
         with:
           # https://helm.sh/docs/topics/version_skew/
           version: 'v3.11.3'
 
       - name: Setup chart-testing
-        uses: helm/chart-testing-action@v2.6.1
+        uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
         with:
           python-version: '3.11'
 
       - name: Setup & Start Minikube
-        uses: medyagh/setup-minikube@v0.0.16
+        uses: medyagh/setup-minikube@317d92317e473a10540357f1f4b2878b80ee7b95 # v0.0.16
         with:
           # If required, use the matrix strategy against this option to test against multiple Kubernetes versions:
           kubernetes-version: stable
@@ -841,7 +841,7 @@ jobs:
           work-branch: iceberg-integration-patched
 
       - name: Setup JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
         with:
           distribution: 'temurin'
           # Java 17 required for Nessie build, Java 11 required for Flink & Presto
@@ -850,7 +850,7 @@ jobs:
             17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
         with:
           cache-read-only: true
 
@@ -914,7 +914,7 @@ jobs:
         working-directory: ./site
       - name: Deploy Static Site to GitHub
         if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'projectnessie/nessie'
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
         with:
           external_repository: projectnessie/projectnessie.github.io
           publish_branch: main

.github/workflows/newer-java.yml

@@ -44,7 +44,7 @@ jobs:
         java-version: ${{ matrix.java-version }}
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
       env:
         # Same as for ci.yml
         GRADLE_BUILD_ACTION_CACHE_KEY_ENVIRONMENT: java-17
@@ -84,7 +84,7 @@ jobs:
       run: ./gradlew buildToolsIntegrationTest
 
     - name: Capture Test Reports
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
       if: ${{ failure() }}
       with:
         name: test-results

.github/workflows/release-create.yml

@@ -66,7 +66,7 @@ jobs:
     - name: Setup Java, Gradle
       uses: ./.github/actions/dev-tool-java
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5
     ### END runner setup
 
     - name: Configure release-bot-user in git config
@@ -75,7 +75,7 @@ jobs:
         git config --global user.name "Nessie Release Workflow [bot]"
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
       with:
         cache-disabled: true
 

.github/workflows/release-publish.yml

@@ -91,7 +91,7 @@ jobs:
       with:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
     - name: Install Helm
-      uses: azure/setup-helm@v4
+      uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4
       with:
         version: v3.6.3
     ### END runner setup
@@ -268,7 +268,7 @@ jobs:
           "${LICENSE_REPORTS}"
 
     - name: Update SwaggerHub
-      uses: smartbear/swaggerhub-cli@v0.9.0
+      uses: smartbear/swaggerhub-cli@20e5eaf4866bbbc44d72e9eb8a48a942c0d9e43b # v0.9.0
       env:
         XDG_CONFIG_HOME: "/tmp"
         SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}

.github/workflows/snapshot-publish.yml

@@ -29,7 +29,7 @@ jobs:
         uses: ./.github/actions/dev-tool-java
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
         with:
           cache-disabled: true
 

CHANGELOG.md

@@ -11,9 +11,22 @@ as necessary. Empty sections will not end in the release notes.
 - New Nessie CLI tool + REPL, replacing the old Python based CLI, based on Java.
   SQL-ish syntax, built-in online `HELP` command, auto-completion of commands, keywords
   and reference names, syntax highlighting, paging of long results, command history.
+- Nessie now includes built-in support for MariaDB, with full compatibility with MySQL servers. New
+  users wishing to try MariaDB (or MySQL) should:
+  1. Specify the new configuration property: `nessie.version.store.persist.jdbc.datasource=mariadb`;
+  2. Provide all the MariaDB (or MySQL) connection details using `quarkus.datasource.mariadb.*`
+     configuration properties.
+- The Nessie GC tool is now also compatible with MariaDB and MySQL (using the MariaDB connector).
 
 ### Upgrade notes
 
+- Due to the newly-introduced support for MariaDB, existing PostgreSQL users can continue to use
+  their current JDBC configuration, but are encouraged to update it as follows:
+  1. Specify the new configuration property: 
+     `nessie.version.store.persist.jdbc.datasource=postgresql`;
+  2. Migrate any property under `quarkus.datasource.*` to `quarkus.datasource.postgresql.*`. Support
+     for the old `quarkus.datasource.*` properties will be removed in a future release.
+
 ### Breaking changes
 
 - `nessie-quarkus-cli`, the low-level tool to for example export/import Nessie repositories, has been renamed

NOTICE

@@ -52,6 +52,32 @@ com.github.jnr:jnr-x86asm
  OTHER DEALINGS IN THE SOFTWARE.
 
 
+---
+com.github.waffle:waffle-jna
+
+MIT License
+
+Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ---
 com.google.protobuf:protobuf-java
 
@@ -1786,6 +1812,14 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
 
+---
+org.mariadb.jdbc:mariadb-java-client
+
+GNU LESSER GENERAL PUBLIC LICENSE (LGPL) v. 2.1
+
+Copyright (c) 2012-2014 Monty Program Ab
+Copyright (c) 2015-2024 MariaDB Corporation Ab
+
 ---
 postcss
 

api/client/build.gradle.kts

@@ -95,6 +95,8 @@ dependencies {
   intTestImplementation(libs.testcontainers.keycloak) {
     exclude(group = "org.slf4j") // uses SLF4J 2.x, we are not ready yet
   }
+  intTestImplementation(project(":nessie-container-spec-helper"))
+  intTestCompileOnly(libs.immutables.value.annotations)
 }
 
 jandex { skipDefaultProcessing() }