diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 47a70ea40..258389d1a 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 65436cde4..e27b2c575 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 912ed8b2b..10d252d77 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 40959a880..a819d868b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.16.1](https://github.com/googleapis/java-datastore/compare/v2.16.0...v2.16.1) (2023-07-10) + + +### Documentation + +* Fix javadoc errors ([#1126](https://github.com/googleapis/java-datastore/issues/1126)) ([d4b11bb](https://github.com/googleapis/java-datastore/commit/d4b11bbf9198b446365b25617614434865d7e285)) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.13.0 ([#1130](https://github.com/googleapis/java-datastore/issues/1130)) ([2181847](https://github.com/googleapis/java-datastore/commit/2181847666bce403743677b06f90b34e5ae180a3)) + ## [2.16.0](https://github.com/googleapis/java-datastore/compare/v2.15.0...v2.16.0) (2023-06-22) diff --git a/README.md b/README.md index 88f3ba650..5a642a9e1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.17.0 + 26.18.0 pom import @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.15.0 + 2.16.0 ``` @@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.17.0') +implementation platform('com.google.cloud:libraries-bom:26.18.0') implementation 'com.google.cloud:google-cloud-datastore' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.15.0' +implementation 'com.google.cloud:google-cloud-datastore:2.16.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.15.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.16.0" ``` @@ -370,7 +370,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.15.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.16.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index aea9b3942..af8040ba2 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.16.0 + 2.16.1 com.google.cloud google-cloud-datastore-parent - 2.16.0 + 2.16.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f8717e8a5..848f8172c 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.16.0 + 2.16.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.16.0 + 2.16.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.16.0 + 2.16.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.107.0 + 0.107.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.16.0 + 2.16.1 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index de1ddba01..7fbe0be27 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.16.0 + 2.16.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.16.0 + 2.16.1 google-cloud-datastore diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java index 8e7e7cdc9..210889b1e 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java @@ -45,7 +45,7 @@ * } * } * - *

{@link GqlQuery} example:

+ *

{@link GqlQuery} example: * *

{@code
  * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
index f0106886a..d85e8f8ae 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
@@ -24,10 +24,10 @@
 import java.util.Objects;
 
 /**
- * The result of an {@link AggregationQuery} query submission. Contains a {@link
- * List} and readTime {@link Timestamp} in it.
+ * The result of an {@link AggregationQuery} query submission. Contains a List<{@link
+ * AggregationResult}> and readTime {@link Timestamp} in it.
  *
- * 

This can be used to iterate over an underlying {@link List} directly. + *

This can be used to iterate over an underlying List<{@link AggregationResult}> directly. */ public class AggregationResults implements Iterable { @@ -41,7 +41,7 @@ public AggregationResults(List aggregationResults, Timestamp this.readTime = readTime; } - /** Returns {@link Iterator} for underlying {@link List}. */ + /** Returns {@link Iterator} for underlying List<{@link AggregationResult}>. */ @Override public Iterator iterator() { return this.aggregationResults.iterator(); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java index d58c001b1..d78bea9a2 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java @@ -484,7 +484,7 @@ interface TransactionCallable { * } * }

* - *

{@link GqlQuery} example:

+ *

{@link GqlQuery} example: * *

{@code
    * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index d4f9f3534..de86a24a5 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -41,7 +41,7 @@
 /**
  * A Google Cloud Datastore GQL query.
  *
- * 

A usage example:

+ *

A usage example: * *

When the type of the results is known the preferred usage would be: * diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java index 8870cf520..89b8d8807 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java @@ -274,7 +274,7 @@ public static ProjectionEntityQuery.Builder newProjectionEntityQueryBuilder() { * // Use aggregationResults * }

* - *

{@link GqlQuery} example:

+ *

{@link GqlQuery} example: * *

{@code
    * GqlQuery selectAllGqlQuery = Query.newGqlQueryBuilder(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
index 9b98f063f..30cd05759 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -46,7 +46,7 @@
  * An implementation of a Google Cloud Datastore Query that can be constructed by providing all the
  * specific query elements.
  *
- * 

A usage example:

+ *

A usage example: * *

A simple query that returns all entities for a specific kind * diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 28f6a7759..021d7aad5 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.16.0 + 2.16.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.16.0 + 2.16.1 diff --git a/pom.xml b/pom.xml index 65a723136..1b15be62f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.16.0 + 2.16.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -151,7 +151,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.12.0 + 3.13.0 pom import @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.16.0 + 2.16.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.16.0 + 2.16.1 com.google.cloud google-cloud-datastore - 2.16.0 + 2.16.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.107.0 + 0.107.1 com.google.cloud.datastore datastore-v1-proto-client - 2.16.0 + 2.16.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index fd4b448e8..53c74534b 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.16.0 + 2.16.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.16.0 + 2.16.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index d448c6aaa..4dc8df080 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.107.0 + 0.107.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.16.0 + 2.16.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 9b1d24d36..4e91142a4 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.15.0 + 2.16.0 diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 114504b37..f67b8be6d 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -28,7 +28,7 @@ com.google.cloud libraries-bom - 26.17.0 + 26.18.0 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index dc95534d5..b912ba568 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.15.0 + 2.16.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index c4711a9e0..b50c00084 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.17.0 + 26.18.0 pom import diff --git a/versions.txt b/versions.txt index 79047fac0..e747b5914 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.16.0:2.16.0 -google-cloud-datastore-bom:2.16.0:2.16.0 -proto-google-cloud-datastore-v1:0.107.0:0.107.0 -datastore-v1-proto-client:2.16.0:2.16.0 -proto-google-cloud-datastore-admin-v1:2.16.0:2.16.0 -grpc-google-cloud-datastore-admin-v1:2.16.0:2.16.0 +google-cloud-datastore:2.16.1:2.16.1 +google-cloud-datastore-bom:2.16.1:2.16.1 +proto-google-cloud-datastore-v1:0.107.1:0.107.1 +datastore-v1-proto-client:2.16.1:2.16.1 +proto-google-cloud-datastore-admin-v1:2.16.1:2.16.1 +grpc-google-cloud-datastore-admin-v1:2.16.1:2.16.1