diff --git a/CHANGELOG.md b/CHANGELOG.md index 08897730c..a67e99388 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [2.14.4](https://github.com/googleapis/java-datastore/compare/v2.14.3...v2.14.4) (2023-04-26) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.8.0 ([#1052](https://github.com/googleapis/java-datastore/issues/1052)) ([412be61](https://github.com/googleapis/java-datastore/commit/412be617db28a97d38883bd6e26ddbc7d1c434fa)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 ([#1056](https://github.com/googleapis/java-datastore/issues/1056)) ([2a871e2](https://github.com/googleapis/java-datastore/commit/2a871e25436a8812bc2f691c6462675b88976afc)) + + +### Documentation + +* Remove `@BetaApi` annotations for count aggregations ([#1051](https://github.com/googleapis/java-datastore/issues/1051)) ([b8bdaa2](https://github.com/googleapis/java-datastore/commit/b8bdaa23f165f6bcb5a891ef2437ffdd7ce8aa4c)) + ## [2.14.3](https://github.com/googleapis/java-datastore/compare/v2.14.2...v2.14.3) (2023-04-13) diff --git a/README.md b/README.md index 8a3a3bbb2..6b61cb06f 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.12.0 + 26.13.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.14.2 + 2.14.3 ``` @@ -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.12.0') +implementation platform('com.google.cloud:libraries-bom:26.13.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.14.2' +implementation 'com.google.cloud:google-cloud-datastore:2.14.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.3" ``` @@ -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.14.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.3 [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 dee3c1d61..e2dd4f8c8 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.14.3 + 2.14.4 com.google.cloud google-cloud-datastore-parent - 2.14.3 + 2.14.4 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 48a2bcda8..0a3870c06 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.14.3 + 2.14.4 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.14.3 + 2.14.4 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.14.3 + 2.14.4 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.105.3 + 0.105.4 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.14.3 + 2.14.4 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 3836dd150..9727c3f75 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.14.3 + 2.14.4 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.14.3 + 2.14.4 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 05f48a6c6..8e7e7cdc9 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 @@ -19,7 +19,6 @@ import static com.google.cloud.datastore.AggregationQuery.Mode.STRUCTURED; import static com.google.common.base.Preconditions.checkArgument; -import com.google.api.core.BetaApi; import com.google.cloud.datastore.aggregation.Aggregation; import com.google.cloud.datastore.aggregation.AggregationBuilder; import java.util.HashSet; @@ -67,7 +66,6 @@ * @see Datastore * queries */ -@BetaApi public class AggregationQuery extends Query { private Set aggregations; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java index 928997ee7..6e086c30b 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java @@ -15,7 +15,6 @@ */ package com.google.cloud.datastore; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import java.util.Map; @@ -23,7 +22,6 @@ import java.util.Objects; /** Represents a result of an {@link AggregationQuery} query submission. */ -@BetaApi public class AggregationResult { private final Map properties; 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 feff5b805..f0106886a 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 @@ -17,7 +17,6 @@ import static com.google.api.client.util.Preconditions.checkNotNull; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.cloud.Timestamp; import java.util.Iterator; @@ -30,7 +29,6 @@ * *

This can be used to iterate over an underlying {@link List} directly. */ -@BetaApi public class AggregationResults implements Iterable { private final List aggregationResults; 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 9d0a21b8d..d58c001b1 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 @@ -16,7 +16,6 @@ package com.google.cloud.datastore; -import com.google.api.core.BetaApi; import com.google.cloud.Service; import com.google.datastore.v1.TransactionOptions; import java.util.Iterator; @@ -506,7 +505,6 @@ interface TransactionCallable { * @throws DatastoreException upon failure * @return {@link AggregationResults} */ - @BetaApi default AggregationResults runAggregation(AggregationQuery query, ReadOption... options) { throw new UnsupportedOperationException("Not implemented."); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java index 4f6533eca..248323150 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java @@ -16,7 +16,6 @@ package com.google.cloud.datastore; -import com.google.api.core.BetaApi; import com.google.api.gax.retrying.RetrySettings; import com.google.cloud.BaseService; import com.google.cloud.ExceptionHandler; @@ -198,13 +197,11 @@ QueryResults run(Optional readOptionsPb, Query query) { } @Override - @BetaApi public AggregationResults runAggregation(AggregationQuery query) { return aggregationQueryExecutor.execute(query); } @Override - @BetaApi public AggregationResults runAggregation(AggregationQuery query, ReadOption... options) { return aggregationQueryExecutor.execute(query, options); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java index 751f99566..2a3071f3c 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java @@ -16,7 +16,6 @@ package com.google.cloud.datastore; -import com.google.api.core.BetaApi; import java.util.Iterator; import java.util.List; @@ -60,7 +59,6 @@ public interface DatastoreReader { * * @throws DatastoreException upon failure */ - @BetaApi default AggregationResults runAggregation(AggregationQuery query) { throw new UnsupportedOperationException("Not implemented."); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java index 8a8e8cc18..7bd2bbb38 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java @@ -16,14 +16,12 @@ package com.google.cloud.datastore.aggregation; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.datastore.v1.AggregationQuery; /** * Represents a Google Cloud Datastore Aggregation which is used with an {@link AggregationQuery}. */ -@BetaApi public abstract class Aggregation { private final String alias; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java index 5e90b86aa..ce23edcf0 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java @@ -16,8 +16,6 @@ package com.google.cloud.datastore.aggregation; -import com.google.api.core.BetaApi; - /** * An interface to represent the builders which build and customize {@link Aggregation} for {@link * com.google.cloud.datastore.AggregationQuery}. @@ -25,7 +23,6 @@ *

Used by {@link * com.google.cloud.datastore.AggregationQuery.Builder#addAggregation(AggregationBuilder)}. */ -@BetaApi public interface AggregationBuilder { A build(); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java index a5295addf..4f7eb23d6 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java @@ -16,13 +16,11 @@ package com.google.cloud.datastore.aggregation; -import com.google.api.core.BetaApi; import com.google.datastore.v1.AggregationQuery; import com.google.datastore.v1.AggregationQuery.Aggregation.Count; import java.util.Objects; /** Represents an {@link Aggregation} which returns count. */ -@BetaApi public class CountAggregation extends Aggregation { /** @param alias Alias to used when running this aggregation. */ diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 82d730665..8ef18c2d1 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.14.3 + 2.14.4 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.14.3 + 2.14.4 diff --git a/pom.xml b/pom.xml index 5065cd8fa..1239c79e4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.14.3 + 2.14.4 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -151,7 +151,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.7.0 + 3.8.0 pom import @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.14.3 + 2.14.4 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.14.3 + 2.14.4 com.google.cloud google-cloud-datastore - 2.14.3 + 2.14.4 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.105.3 + 0.105.4 com.google.cloud.datastore datastore-v1-proto-client - 2.14.3 + 2.14.4 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 9ece63352..2a7e48bed 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.14.3 + 2.14.4 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.14.3 + 2.14.4 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 360a6b787..442dea975 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.105.3 + 0.105.4 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.14.3 + 2.14.4 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index f9765fca2..f2714fa75 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.14.2 + 2.14.3 diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index fd10cea23..b5f8bad75 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.12.0 + 26.13.0 pom import @@ -80,7 +80,7 @@ org.junit.vintage junit-vintage-engine - 5.9.2 + 5.9.3 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 3afc0f2c9..21bcd42bd 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.14.2 + 2.14.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 4872e3fcc..be2faf6de 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.12.0 + 26.13.0 pom import diff --git a/versions.txt b/versions.txt index 5a7314922..92b496b15 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.14.3:2.14.3 -google-cloud-datastore-bom:2.14.3:2.14.3 -proto-google-cloud-datastore-v1:0.105.3:0.105.3 -datastore-v1-proto-client:2.14.3:2.14.3 -proto-google-cloud-datastore-admin-v1:2.14.3:2.14.3 -grpc-google-cloud-datastore-admin-v1:2.14.3:2.14.3 +google-cloud-datastore:2.14.4:2.14.4 +google-cloud-datastore-bom:2.14.4:2.14.4 +proto-google-cloud-datastore-v1:0.105.4:0.105.4 +datastore-v1-proto-client:2.14.4:2.14.4 +proto-google-cloud-datastore-admin-v1:2.14.4:2.14.4 +grpc-google-cloud-datastore-admin-v1:2.14.4:2.14.4