diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 90da5b8..2b2964e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,6 +15,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - uses: gradle/actions/wrapper-validation@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -28,7 +30,7 @@ jobs: password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - name: BuildX and Push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 if: ${{ github.ref_name == 'master' }} env: IMAGE_TAG: ${{ inputs.tag }} @@ -40,7 +42,7 @@ jobs: tags: tabulario/iceberg-rest:latest,tabulario/iceberg-rest:${{ inputs.tag }} - name: BuildX and Push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 if: ${{ github.ref_name != 'master' }} env: IMAGE_TAG: ${{ inputs.tag }} diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index fff3660..ead129f 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -10,5 +10,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - uses: gradle/actions/wrapper-validation@v3 + - name: Build image run: docker build . diff --git a/build.gradle b/build.gradle index 87fd5ba..6085829 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { } ext { - icebergVersion = '1.4.3' + icebergVersion = '1.6.0' hadoopVersion = '3.3.6' } @@ -45,12 +45,12 @@ dependencies { runtimeOnly "org.apache.iceberg:iceberg-gcp-bundle:${icebergVersion}" implementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1' - implementation 'org.apache.httpcomponents.core5:httpcore5:5.2.4' + implementation 'org.apache.httpcomponents.core5:httpcore5:5.2.5' - implementation 'com.google.guava:guava:33.0.0-jre' + implementation 'com.google.guava:guava:33.3.0-jre' - implementation 'org.xerial:sqlite-jdbc:3.45.1.0' - implementation 'org.postgresql:postgresql:42.7.2' + implementation 'org.xerial:sqlite-jdbc:3.46.1.0' + implementation 'org.postgresql:postgresql:42.7.4' } jar { diff --git a/src/main/java/org/apache/iceberg/rest/RESTCatalogServer.java b/src/main/java/org/apache/iceberg/rest/RESTCatalogServer.java index 64862b3..ad2e8e8 100644 --- a/src/main/java/org/apache/iceberg/rest/RESTCatalogServer.java +++ b/src/main/java/org/apache/iceberg/rest/RESTCatalogServer.java @@ -66,6 +66,7 @@ private static CatalogContext backendCatalog() throws IOException { CatalogProperties.CATALOG_IMPL, "org.apache.iceberg.jdbc.JdbcCatalog"); catalogProperties.putIfAbsent( CatalogProperties.URI, "jdbc:sqlite:file:/tmp/iceberg_rest_mode=memory"); + catalogProperties.putIfAbsent("jdbc.schema-version", "V1"); // Configure a default location if one is not specified String warehouseLocation = catalogProperties.get(CatalogProperties.WAREHOUSE_LOCATION);