diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 47a70ea40c..258389d1aa 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7 -# created: 2023-06-22T15:06:52.039318836Z + digest: sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9 +# created: 2023-06-27T18:51:58.922150125Z diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65436cde41..e27b2c5756 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -45,7 +45,7 @@ jobs: - uses: actions/setup-java@v3 with: java-version: 8 - distribution: zulu + distribution: temurin - name: "Set jvm system property environment variable for surefire plugin (unit tests)" # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests. # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm @@ -54,7 +54,7 @@ jobs: - uses: actions/setup-java@v3 with: java-version: 17 - distribution: zulu + distribution: temurin - run: .kokoro/build.sh env: JOB_TYPE: test @@ -66,7 +66,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -81,17 +81,29 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh + javadoc: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 17 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: javadoc lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 11 - run: java -version - run: .kokoro/build.sh @@ -103,7 +115,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index 912ed8b2b0..10d252d775 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 8 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check diff --git a/CHANGELOG.md b/CHANGELOG.md index a3738124e8..9b758bd213 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.24.1](https://github.com/googleapis/java-bigtable/compare/v2.24.0...v2.24.1) (2023-06-27) + + +### Bug Fixes + +* Remove javadoc external link configuration ([#1815](https://github.com/googleapis/java-bigtable/issues/1815)) ([9c71a93](https://github.com/googleapis/java-bigtable/commit/9c71a934f8354477b0e229b83047c8203d4ab978)) + ## [2.24.0](https://github.com/googleapis/java-bigtable/compare/v2.23.3...v2.24.0) (2023-06-27) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 6e970cecc4..b007d8f4f7 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 2.24.0 + 2.24.1 pom com.google.cloud @@ -63,42 +63,42 @@ com.google.cloud google-cloud-bigtable - 2.24.0 + 2.24.1 com.google.cloud google-cloud-bigtable-emulator - 0.161.0 + 0.161.1 com.google.cloud google-cloud-bigtable-emulator-core - 0.161.0 + 0.161.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.24.0 + 2.24.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.24.0 + 2.24.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.24.0 + 2.24.1 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.24.0 + 2.24.1 com.google.cloud google-cloud-bigtable-stats - 2.24.0 + 2.24.1 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index f6b522720f..21eefe5d36 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -13,7 +13,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.24.0 + 2.24.1 pom diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml index aca38cdb73..0e5d4b4e80 100644 --- a/google-cloud-bigtable-emulator-core/pom.xml +++ b/google-cloud-bigtable-emulator-core/pom.xml @@ -7,11 +7,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.24.0 + 2.24.1 google-cloud-bigtable-emulator-core - 0.161.0 + 0.161.1 A Java wrapper for the Cloud Bigtable emulator. diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index c088d6e389..744bbeb160 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.161.0 + 0.161.1 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.24.0 + 2.24.1 scm:git:git@github.com:googleapis/java-bigtable.git @@ -81,14 +81,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.24.0 + 2.24.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.24.0 + 2.24.1 pom import @@ -99,7 +99,7 @@ com.google.cloud google-cloud-bigtable-emulator-core - 0.161.0 + 0.161.1 diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index 3fec7add75..0eaa82c74e 100644 --- a/google-cloud-bigtable-stats/pom.xml +++ b/google-cloud-bigtable-stats/pom.xml @@ -5,7 +5,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.24.0 + 2.24.1 4.0.0 @@ -13,7 +13,7 @@ through Stackdriver. Built-in metrics will be implemented with shaded OpenCensus so it won't interfere with customer's application metrics. --> google-cloud-bigtable-stats - 2.24.0 + 2.24.1 Experimental project to shade OpenCensus dependencies. @@ -21,7 +21,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.24.0 + 2.24.1 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 677befc8f9..bca053fe46 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.24.0 + 2.24.1 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.24.0 + 2.24.1 - 2.24.0 + 2.24.1 google-cloud-bigtable @@ -47,14 +47,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.24.0 + 2.24.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.24.0 + 2.24.1 pom import diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java index de624476c2..6d87c1b3a2 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java @@ -20,6 +20,6 @@ @InternalApi("For internal use only") public final class Version { // {x-version-update-start:google-cloud-bigtable:current} - public static String VERSION = "2.24.0"; + public static String VERSION = "2.24.1"; // {x-version-update-end} } diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 187f7f64a9..78096aeab5 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.24.0 + 2.24.1 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.24.0 + 2.24.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.24.0 + 2.24.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.24.0 + 2.24.1 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index da8b4075eb..a9be74a224 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.24.0 + 2.24.1 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.24.0 + 2.24.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.24.0 + 2.24.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.24.0 + 2.24.1 pom import diff --git a/pom.xml b/pom.xml index b3c0737de1..ff472c8fc6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.24.0 + 2.24.1 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable @@ -153,27 +153,27 @@ com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.24.0 + 2.24.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.24.0 + 2.24.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.24.0 + 2.24.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.24.0 + 2.24.1 com.google.cloud google-cloud-bigtable - 2.24.0 + 2.24.1 @@ -286,12 +286,6 @@ **/com/google/cloud/bigtable/data/v2/stub/readrows/** **/com/google/cloud/bigtable/data/v2/stub/metrics/** - - - - https://googleapis.dev/java/gax/${gax.version}/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index c22d972769..4b55dd19ff 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.24.0 + 2.24.1 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.24.0 + 2.24.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.24.0 + 2.24.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.24.0 + 2.24.1 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index c59f340b55..2e3187c395 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.24.0 + 2.24.1 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.24.0 + 2.24.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.24.0 + 2.24.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.24.0 + 2.24.1 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5c59bf2339..67a692197f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.24.0 + 2.24.1 diff --git a/samples/snippets/src/main/java/com/example/bigtable/Reads.java b/samples/snippets/src/main/java/com/example/bigtable/Reads.java index 1bd5609f96..90bc847bd5 100644 --- a/samples/snippets/src/main/java/com/example/bigtable/Reads.java +++ b/samples/snippets/src/main/java/com/example/bigtable/Reads.java @@ -217,7 +217,7 @@ public static void readRowsReversed(String projectId, String instanceId, String Query query = Query.create(tableId) .reversed(true) - .limit(2) + .limit(3) .prefix("phone#4c410523") .range("phone#5c10102", "phone#5c10103"); ServerStream rows = dataClient.readRows(query); diff --git a/samples/snippets/src/test/java/com/example/bigtable/ReadsTest.java b/samples/snippets/src/test/java/com/example/bigtable/ReadsTest.java index 1af117d638..a895594979 100644 --- a/samples/snippets/src/test/java/com/example/bigtable/ReadsTest.java +++ b/samples/snippets/src/test/java/com/example/bigtable/ReadsTest.java @@ -198,7 +198,7 @@ public void testReadRowsReversed() { + "Column Family stats_summary\n" + "\tconnected_cell: \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001 @%1$s\n" + "\tconnected_wifi: \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 @%1$s\n" - + "\tos_build: PQ2A.190406.000 @%1$s" + + "\tos_build: PQ2A.190406.000 @%1$s\n\n" + "Reading data for phone#5c10102#20190501\n" + "Column Family stats_summary\n" + "\tconnected_cell: \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001 @%1$s\n" @@ -208,12 +208,7 @@ public void testReadRowsReversed() { + "Column Family stats_summary\n" + "\tconnected_cell: \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 @%1$s\n" + "\tconnected_wifi: \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001 @%1$s\n" - + "\tos_build: PQ2A.190406.000 @%1$s\n\n" - + "Reading data for phone#4c410523#20190502\n" - + "Column Family stats_summary\n" - + "\tconnected_cell: \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001 @%1$s\n" - + "\tconnected_wifi: \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001 @%1$s\n" - + "\tos_build: PQ2A.190405.004 @%1$s\n\n", + + "\tos_build: PQ2A.190406.000 @%1$s\n\n", TIMESTAMP)); } diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml index 871d47b076..ba06bde3d4 100644 --- a/test-proxy/pom.xml +++ b/test-proxy/pom.xml @@ -12,11 +12,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.24.0 + 2.24.1 - 2.24.0 + 2.24.1 diff --git a/versions.txt b/versions.txt index f11eff7f13..7471e42ac8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.24.0:2.24.0 -grpc-google-cloud-bigtable-admin-v2:2.24.0:2.24.0 -grpc-google-cloud-bigtable-v2:2.24.0:2.24.0 -proto-google-cloud-bigtable-admin-v2:2.24.0:2.24.0 -proto-google-cloud-bigtable-v2:2.24.0:2.24.0 -google-cloud-bigtable-emulator:0.161.0:0.161.0 -google-cloud-bigtable-emulator-core:2.24.0:2.24.0 +google-cloud-bigtable:2.24.1:2.24.1 +grpc-google-cloud-bigtable-admin-v2:2.24.1:2.24.1 +grpc-google-cloud-bigtable-v2:2.24.1:2.24.1 +proto-google-cloud-bigtable-admin-v2:2.24.1:2.24.1 +proto-google-cloud-bigtable-v2:2.24.1:2.24.1 +google-cloud-bigtable-emulator:0.161.1:0.161.1 +google-cloud-bigtable-emulator-core:2.24.1:2.24.1