diff --git a/.github/workflows/java-publish.yml b/.github/workflows/java-publish.yml index 00516994bf3..4c046593327 100644 --- a/.github/workflows/java-publish.yml +++ b/.github/workflows/java-publish.yml @@ -194,11 +194,11 @@ jobs: with: ref: ${{ inputs.ref }} - uses: Swatinem/rust-cache@v2 - - name: Set up Java 8 + - name: Set up Java 11 uses: actions/setup-java@v4 with: distribution: corretto - java-version: 8 + java-version: 11 cache: "maven" server-id: ossrh server-username: SONATYPE_USER @@ -228,7 +228,7 @@ jobs: working-directory: java run: | mvn --batch-mode -DskipTests -Drust.release.build=true package - - name: Publish with Java 8 + - name: Publish with Java 11 if: | github.event_name == 'release' || inputs.mode == 'release' diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index c702df258f8..a27104d0fd4 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -51,7 +51,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - java-version: [8, 11, 17] + java-version: [11, 17, 21] name: Build and Test with Java ${{ matrix.java-version }} steps: - name: Checkout repository diff --git a/java/AGENTS.md b/java/AGENTS.md index 1f6fd86dfe9..70d35e5e0db 100644 --- a/java/AGENTS.md +++ b/java/AGENTS.md @@ -10,4 +10,4 @@ lint rust: `cargo clippy --tests --manifest-path ./lance-jni/Cargo.toml` compile: `./mvnw compile` test: `./mvnw test` -JDK: pom.xml targets Java 8 (`maven.compiler.release` 8); align Rust toolchain with repository `rust-toolchain.toml`. +JDK: pom.xml targets Java 11 (`maven.compiler.release` 11); align Rust toolchain with repository `rust-toolchain.toml`. diff --git a/java/pom.xml b/java/pom.xml index b23c74b7a66..0b4d8a3c90f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -28,11 +28,11 @@ UTF-8 - 15.0.0 + 18.3.0 0.28.1 false - 2.30.0 - 1.7 + 2.43.0 + 1.22.0 2.12.19 2.12 @@ -419,8 +419,8 @@ [11,) - - 8 + + 11 diff --git a/java/src/main/java/org/lance/Dataset.java b/java/src/main/java/org/lance/Dataset.java index 6124e7f705d..eb66702ddf5 100644 --- a/java/src/main/java/org/lance/Dataset.java +++ b/java/src/main/java/org/lance/Dataset.java @@ -688,7 +688,9 @@ public List listVersions() { private native List nativeListVersions(); - /** @return the latest version of the dataset. */ + /** + * @return the latest version of the dataset. + */ public long latestVersion() { try (LockManager.WriteLock writeLock = lockManager.acquireWriteLock()) { Preconditions.checkArgument(nativeDatasetHandle != 0, "Dataset is closed"); @@ -957,7 +959,9 @@ public Optional readTransaction() { private native Transaction nativeReadTransaction(); - /** @return all the created indexes names */ + /** + * @return all the created indexes names + */ public List listIndexes() { try (LockManager.ReadLock readLock = lockManager.acquireReadLock()) { Preconditions.checkArgument(nativeDatasetHandle != 0, "Dataset is closed"); diff --git a/java/src/main/java/org/lance/Fragment.java b/java/src/main/java/org/lance/Fragment.java index 812fb49548c..62bcabf9bdd 100644 --- a/java/src/main/java/org/lance/Fragment.java +++ b/java/src/main/java/org/lance/Fragment.java @@ -124,7 +124,9 @@ public int getId() { return fragmentMetadata.getId(); } - /** @return row counts in this Fragment */ + /** + * @return row counts in this Fragment + */ public int countRows() { return countRowsNative(dataset, fragmentMetadata.getId()); } diff --git a/java/src/test/java/org/lance/TestUtils.java b/java/src/test/java/org/lance/TestUtils.java index f7cd56a1b0c..b17848ef6fb 100644 --- a/java/src/test/java/org/lance/TestUtils.java +++ b/java/src/test/java/org/lance/TestUtils.java @@ -530,6 +530,7 @@ public List createNewFragment(int rowCount, int maxRowsPerFile } return fragmentMetas; } + /** * Test method to update columns. Note that for simplicity, the updated column rowid is fixed * with [0, updateNum). Please only use this method to test the first fragment. @@ -606,6 +607,7 @@ public static final class BlobTestDataset { /** Lance blob metadata key required by Rust. */ private static final String BLOB_META_KEY = "lance-encoding:blob"; + /** Lance blob metadata value. */ private static final String BLOB_META_TRUE = "true";