merge main

Author: ZorinAnton

.github/workflows/pr.yml

@@ -12,7 +12,7 @@ jobs:
     name: Check editorconfig
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - uses: editorconfig-checker/action-editorconfig-checker@v2
@@ -21,18 +21,18 @@ jobs:
     name: Lint commits for semantic-release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: "20"
       - run: npx commitlint --from=${{ github.event.pull_request.base.sha }} --to=${{ github.sha }} --verbose
   security:
     name: Security validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: gradle/actions/wrapper-validation@v5
   osv-scanner:
     runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
           - isthmus
           - isthmus-cli
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
           java-version: '17'
@@ -58,7 +58,7 @@ jobs:
     name: Build and Test Java
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Set up JDK 17
@@ -70,15 +70,15 @@ jobs:
         uses: gradle/actions/setup-gradle@v5
       - name: Build with Gradle
         run: |
-          # fetch submodule tags since actions/checkout@v5 does not
+          # fetch submodule tags since actions/checkout@v6 does not
           git submodule foreach 'git fetch --unshallow || true'
 
           ./gradlew build --rerun-tasks
   examples:
     name: Build Examples
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Set up JDK 17
@@ -102,7 +102,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
     - uses: actions/setup-java@v5
@@ -115,7 +115,7 @@ jobs:
       run: java -version
     - name: Build with Gradle
       run: |
-        # fetch submodule tags since actions/checkout@v5 does not
+        # fetch submodule tags since actions/checkout@v6 does not
         git submodule foreach 'git fetch --unshallow || true'
 
         ./gradlew nativeCompile
@@ -128,18 +128,18 @@ jobs:
       run: |
         value=`mv isthmus-cli/build/native/nativeCompile/isthmus isthmus-cli/build/native/nativeCompile/isthmus-${{ matrix.os }}`
     - name: Publish artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: isthmus-${{ matrix.os }}
         path: isthmus-cli/build/native/nativeCompile/isthmus-${{ matrix.os }}
   dry-run-release:
     name: Dry-run release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: "20"
       - name: Check current status before next release

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - uses: actions/setup-java@v5
@@ -32,7 +32,7 @@ jobs:
         run: java -version
       - name: Build with Gradle
         run: |
-          # fetch submodule tags since actions/checkout@v5 does not
+          # fetch submodule tags since actions/checkout@v6 does not
           git submodule foreach 'git fetch --unshallow || true'
 
           ./gradlew nativeCompile
@@ -45,7 +45,7 @@ jobs:
         run: |
           value=`mv isthmus-cli/build/native/nativeCompile/isthmus isthmus-cli/build/native/nativeCompile/isthmus-${{ matrix.os }}`
       - name: Publish artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: isthmus-${{ matrix.os }}
           path: isthmus-cli/build/native/nativeCompile/isthmus-${{ matrix.os }}
@@ -60,7 +60,7 @@ jobs:
           app-id: ${{ secrets.RELEASER_ID }}
           private-key: ${{ secrets.RELEASER_KEY }}
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           token: ${{ steps.app-token.outputs.token }}
           fetch-depth: 0
@@ -71,18 +71,18 @@ jobs:
         with:
           java-version: "17"
           distribution: "temurin"
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: "20"
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
       - name: Download isthmus-ubuntu-latest binary
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: isthmus-ubuntu-latest
           path: native/libs
       - name: Download isthmus-macOS-latest binary
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: isthmus-macOS-latest
           path: native/libs
@@ -101,5 +101,5 @@ jobs:
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USER }}
-          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_KEY }}
+          MAVENCENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USER }}
+          MAVENCENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_KEY }}

.github/workflows/sanity.yml

@@ -8,7 +8,7 @@ jobs:
     name: Sanity Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Validate credentials for Sonatype and Signing

CHANGELOG.md

@@ -1,6 +1,54 @@
 Release Notes
 ---
 
+## [0.70.0](https://github.com/substrait-io/substrait-java/compare/v0.69.0...v0.70.0) (2025-11-23)
+
+### Features
+
+* **isthmus:** mapping of positional scalar fns ([#610](https://github.com/substrait-io/substrait-java/issues/610)) ([96541a9](https://github.com/substrait-io/substrait-java/commit/96541a9f2cc0cc0c38215b0a31473246732347c3))
+* **isthmus:** support bitwise left shift ([#605](https://github.com/substrait-io/substrait-java/issues/605)) ([22448d1](https://github.com/substrait-io/substrait-java/commit/22448d1bd36c5face8675e31b85d5378d40901a0))
+
+## [0.69.0](https://github.com/substrait-io/substrait-java/compare/v0.68.0...v0.69.0) (2025-11-16)
+
+### Features
+
+* enforce row type consistency with schema in virtual tables ([#601](https://github.com/substrait-io/substrait-java/issues/601)) ([a5322ea](https://github.com/substrait-io/substrait-java/commit/a5322eadfab67bfcdd34453fd94c9a559ccc762c))
+* **isthmus:** log2, greatest and least scalar fn mappings added ([#598](https://github.com/substrait-io/substrait-java/issues/598)) ([848bfcf](https://github.com/substrait-io/substrait-java/commit/848bfcf83f4235574a686a4d48407a8f8ba5d99e))
+* **isthmus:** true, false, distinct comparator scalar fn mappings ([#597](https://github.com/substrait-io/substrait-java/issues/597)) ([f59ecc5](https://github.com/substrait-io/substrait-java/commit/f59ecc5ad78eb8f8e79c664fbb4f81c572bb9aa1))
+
+### Bug Fixes
+
+* handle valid YAML extension types ([#595](https://github.com/substrait-io/substrait-java/issues/595)) ([ed25bed](https://github.com/substrait-io/substrait-java/commit/ed25bed9233b1bd393f128c580cf1ab7fbcca0b9)), closes [#594](https://github.com/substrait-io/substrait-java/issues/594)
+* **isthmus:** support TPC-DS queries 1, 30, 81 ([#593](https://github.com/substrait-io/substrait-java/issues/593)) ([442f1f2](https://github.com/substrait-io/substrait-java/commit/442f1f2b171d8eb691f3dcc01c2d6fe03c6add8a))
+
+## [0.68.0](https://github.com/substrait-io/substrait-java/compare/v0.67.0...v0.68.0) (2025-11-02)
+
+### Features
+
+* **isthmus:** mapping of angular scalar functions ([#586](https://github.com/substrait-io/substrait-java/issues/586)) ([9c4db92](https://github.com/substrait-io/substrait-java/commit/9c4db9207cec12a7cf1625ee29343ba402c864d6))
+* **isthmus:** mapping of bitwise functions from substrait ([#582](https://github.com/substrait-io/substrait-java/issues/582)) ([e1e8689](https://github.com/substrait-io/substrait-java/commit/e1e86891369ee69be302a9c2eb3405395acee9f4))
+* **isthmus:** mapping of factorial function from substrait ([#589](https://github.com/substrait-io/substrait-java/issues/589)) ([4b83666](https://github.com/substrait-io/substrait-java/commit/4b8366675108d506fd29f1cd355bd27712cafe73))
+* **isthmus:** mapping of hyperbolic functions from substrait ([#581](https://github.com/substrait-io/substrait-java/issues/581)) ([ac9ad28](https://github.com/substrait-io/substrait-java/commit/ac9ad2839feb77288bee4d910133f89ef0324a16))
+* **isthmus:** support fully qualified table names in SubstraitCreateStatementParser ([#575](https://github.com/substrait-io/substrait-java/issues/575)) ([ab5943e](https://github.com/substrait-io/substrait-java/commit/ab5943e53f73ed73f816f2c3f59502378b3bf15c))
+
+## [0.67.0](https://github.com/substrait-io/substrait-java/compare/v0.66.0...v0.67.0) (2025-10-28)
+
+### Features
+
+* **core,isthmus:** support grouping set index in Aggregate ([#565](https://github.com/substrait-io/substrait-java/issues/565)) ([a00a811](https://github.com/substrait-io/substrait-java/commit/a00a811bb2043151b242169e92a65969b93bf5a4))
+* **isthmus:** extend Schema collector for dml ([#570](https://github.com/substrait-io/substrait-java/issues/570)) ([3f0f8f1](https://github.com/substrait-io/substrait-java/commit/3f0f8f14cc8483250ced8a4a5293cf21e1ce85dd))
+* **isthmus:** improve extensibility of SubstraitRelVisitor ([#553](https://github.com/substrait-io/substrait-java/issues/553)) ([3c3db23](https://github.com/substrait-io/substrait-java/commit/3c3db23b7c508cd50a6317a9970c1d0fe7b0ec16))
+* **isthmus:** mapping of square root function from substrait to calcite ([#568](https://github.com/substrait-io/substrait-java/issues/568)) ([a140d21](https://github.com/substrait-io/substrait-java/commit/a140d21e88732f377effd61abd8e2a2958ce4d43))
+* **spark:** dialect YAML file for spark converter ([#554](https://github.com/substrait-io/substrait-java/issues/554)) ([c4c6153](https://github.com/substrait-io/substrait-java/commit/c4c6153958182941a83b96beade193fd62652d81))
+
+### Bug Fixes
+
+* **core:** close AdvancedExtension serde gaps ([#569](https://github.com/substrait-io/substrait-java/issues/569)) ([2ba50cb](https://github.com/substrait-io/substrait-java/commit/2ba50cbf5f063817de6501e27346db6ea7a2b90c))
+* **core:** disable @Generated annotations for immutables ([#560](https://github.com/substrait-io/substrait-java/issues/560)) ([7222906](https://github.com/substrait-io/substrait-java/commit/7222906351ecec1e8cf06085529fb4c53c1d25d0))
+* prevents exception on construction of `FunctionConverter` with duplicate functions ([#564](https://github.com/substrait-io/substrait-java/issues/564)) ([1b1dc73](https://github.com/substrait-io/substrait-java/commit/1b1dc73f6bab54abfdb41f810b77eaa01ebb7b01)), closes [#562](https://github.com/substrait-io/substrait-java/issues/562)
+* **spark:** add versions for jackson dependencies ([#576](https://github.com/substrait-io/substrait-java/issues/576)) ([3605322](https://github.com/substrait-io/substrait-java/commit/36053226839f3943faa7e4c5a704c3b35574a0bd))
+* **spark:** convert UnsafeArrayData literal to substrait ([#557](https://github.com/substrait-io/substrait-java/issues/557)) ([a6b2187](https://github.com/substrait-io/substrait-java/commit/a6b21874b24431699d75d9b22d528d7b02e3fd9a))
+
 ## [0.66.0](https://github.com/substrait-io/substrait-java/compare/v0.65.0...v0.66.0) (2025-10-09)
 
 ### ⚠ BREAKING CHANGES

build-logic/src/main/resources/substrait-pmd.xml

@@ -13,6 +13,7 @@
   <rule ref="category/java/codestyle.xml/UnnecessaryModifier" />
   <rule ref="category/java/codestyle.xml/FieldDeclarationsShouldBeAtStartOfClass" />
   <rule ref="category/java/codestyle.xml/UseExplicitTypes" />
+  <rule ref="category/java/bestpractices.xml/JUnit5TestShouldBePackagePrivate" />
   <rule ref="category/java/bestpractices.xml/MissingOverride" />
   <rule ref="category/java/bestpractices.xml/UnusedAssignment" />
   <rule ref="category/java/bestpractices.xml/UnusedLocalVariable" />

build.gradle.kts

@@ -9,20 +9,37 @@ plugins {
   id("idea")
   alias(libs.plugins.gradle.extensions)
   alias(libs.plugins.spotless)
-  alias(libs.plugins.jreleaser) apply false
+  alias(libs.plugins.nmcp).apply(false)
+  alias(libs.plugins.nmcp.aggregation)
 }
 
 repositories { mavenCentral() }
 
 java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }
 
+nmcpAggregation {
+  centralPortal {
+    username =
+      System.getenv("MAVENCENTRAL_USERNAME").takeUnless { it.isNullOrEmpty() }
+        ?: extra["MAVENCENTRAL_USERNAME"].toString()
+    password =
+      System.getenv("MAVENCENTRAL_PASSWORD").takeUnless { it.isNullOrEmpty() }
+        ?: extra["MAVENCENTRAL_PASSWORD"].toString()
+    publishingType = "AUTOMATIC"
+  }
+}
+
 dependencies {
   testImplementation(platform(libs.junit.bom))
   testImplementation(libs.junit.jupiter.api)
   testImplementation(libs.junit.jupiter.engine)
   implementation(libs.slf4j.api)
   annotationProcessor(libs.immutables.value)
   compileOnly(libs.immutables.annotations)
+
+  nmcpAggregation(project(":core"))
+  nmcpAggregation(project(":spark"))
+  nmcpAggregation(project(":isthmus"))
 }
 
 allprojects {
@@ -44,7 +61,7 @@ allprojects {
         googleJavaFormat()
         removeUnusedImports()
         trimTrailingWhitespace()
-        removeWildcardImports()
+        forbidWildcardImports()
       }
     }
   }

ci/release/publish.sh

@@ -7,5 +7,4 @@ set -euo pipefail
 git submodule foreach 'git fetch --unshallow || true'
 
 ./gradlew clean
-./gradlew publishAllPublicationsToStagingRepository
-./gradlew jreleaserDeploy
+./gradlew publishAggregationToCentralPortal

ci/release/sanity.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 export GPG_TTY=$(tty)
 
 echo "Validate Central Publisher API credentials."
-BEARER=$(printf "%s:%s" "${SONATYPE_USER}" "${SONATYPE_PASSWORD}" | base64)
+BEARER=$(printf "%s:%s" "${MAVENCENTRAL_USERNAME}" "${MAVENCENTRAL_PASSWORD}" | base64)
 CODE=$(curl --request GET 'https://central.sonatype.com/api/v1/publisher/published?namespace=io.substrait&name=core&version=0.1.0' --header 'accept: application/json' --header "Authorization: Bearer ${BEARER}" -sSL -w '%{http_code}' -o /dev/null)
 if [[ "$CODE" =~ ^2 ]]; then
     echo "Central Publisher API credentials configured successfully."

core/build.gradle.kts

@@ -1,7 +1,5 @@
 import java.io.ByteArrayOutputStream
 import java.nio.charset.StandardCharsets
-import org.gradle.api.provider.ValueSource
-import org.gradle.api.provider.ValueSourceParameters
 import org.gradle.plugins.ide.idea.model.IdeaModel
 import org.slf4j.LoggerFactory
 
@@ -14,7 +12,7 @@ plugins {
   alias(libs.plugins.protobuf)
   alias(libs.plugins.spotless)
   alias(libs.plugins.shadow)
-  alias(libs.plugins.jreleaser)
+  alias(libs.plugins.nmcp)
   id("substrait.java-conventions")
 }
 
@@ -58,16 +56,12 @@ publishing {
       val snapshotsRepoUrl = layout.buildDirectory.dir("repos/snapshots")
       url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
     }
-    maven {
-      name = "staging"
-      url = stagingRepositoryUrl
-    }
   }
 }
 
 signing {
   setRequired({
-    gradle.taskGraph.hasTask(":${project.name}:publishMaven-publishPublicationToStagingRepository")
+    gradle.taskGraph.hasTask(":${project.name}:publishMaven-publishPublicationToNmcpRepository")
   })
   val signingKeyId =
     System.getenv("SIGNING_KEY_ID").takeUnless { it.isNullOrEmpty() }
@@ -82,23 +76,6 @@ signing {
   sign(publishing.publications["maven-publish"])
 }
 
-jreleaser {
-  gitRootSearch = true
-  deploy {
-    maven {
-      mavenCentral {
-        register("sonatype") {
-          active = org.jreleaser.model.Active.ALWAYS
-          url = "https://central.sonatype.com/api/v1/publisher"
-          sign = false
-          stagingRepository(file(stagingRepositoryUrl).toString())
-        }
-      }
-    }
-  }
-  release { github { enabled = false } }
-}
-
 // This allows specifying deps to be shadowed so that they don't get included in the POM file
 val shadowImplementation by configurations.creating
 
@@ -213,8 +190,6 @@ tasks.register("writeManifest") {
   }
 }
 
-tasks.named("compileJava") { dependsOn("writeManifest") }
-
 tasks {
   shadowJar {
     archiveClassifier.set("") // to override ".jar" instead of producing "-all.jar"
@@ -226,12 +201,17 @@ tasks {
   }
 
   jar { manifest { from("build/generated/sources/manifest/META-INF/MANIFEST.MF") } }
-}
 
-// Set the release instead of using a Java 8 toolchain since ANTLR requires Java 11+ to run
-tasks.withType<JavaCompile>().configureEach { options.release = 8 }
+  // Set the release instead of using a Java 8 toolchain since ANTLR requires Java 11+ to run.
+  // Only set the compile release since JUnit 6 requires Java 17 to run tests.
+  compileJava {
+    options.release = 8
+    dependsOn("writeManifest")
+  }
+}
 
 java {
+  toolchain { languageVersion = JavaLanguageVersion.of(17) }
   withJavadocJar()
   withSourcesJar()
 }