diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 0f0647b00e..288e394897 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb + digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in index 924f94ae6f..a5010f77d4 100644 --- a/.kokoro/requirements.in +++ b/.kokoro/requirements.in @@ -17,7 +17,7 @@ pycparser==2.21 pyperclip==1.8.2 python-dateutil==2.8.2 requests==2.27.1 -certifi==2022.9.24 +certifi==2022.12.7 importlib-metadata==4.8.3 zipp==3.6.0 google_api_core==2.8.2 diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 71fcafc703..15c404aa5a 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -16,9 +16,9 @@ cachetools==4.2.4 \ # via # -r requirements.in # google-auth -certifi==2022.9.24 \ - --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \ - --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 +certifi==2022.12.7 \ + --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ + --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 # via # -r requirements.in # requests diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c07611802..d1eb0eaf14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.17.1](https://github.com/googleapis/java-bigtable/compare/v2.17.0...v2.17.1) (2022-12-13) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-monitoring-bom to v3.8.0 ([#1548](https://github.com/googleapis/java-bigtable/issues/1548)) ([48f136d](https://github.com/googleapis/java-bigtable/commit/48f136dc1422d601d5470a33763e37514cf620de)) + ## [2.17.0](https://github.com/googleapis/java-bigtable/compare/v2.16.0...v2.17.0) (2022-12-07) diff --git a/README.md b/README.md index 59f306a32a..be062c7f26 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-bigtable - 2.16.0 + 2.17.0 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigtable' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigtable:2.16.0' +implementation 'com.google.cloud:google-cloud-bigtable:2.17.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.16.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.17.0" ``` ## Authentication diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 80a42e631d..699bba9f85 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.17.0 + 2.17.1 pom com.google.cloud @@ -63,42 +63,42 @@ com.google.cloud google-cloud-bigtable - 2.17.0 + 2.17.1 com.google.cloud google-cloud-bigtable-emulator - 0.154.0 + 0.154.1 com.google.cloud google-cloud-bigtable-emulator-core - 0.154.0 + 0.154.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.17.0 + 2.17.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.17.0 + 2.17.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.17.0 + 2.17.1 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.17.0 + 2.17.1 com.google.cloud google-cloud-bigtable-stats - 2.17.0 + 2.17.1 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 7ab661d388..a3b5235899 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.17.0 + 2.17.1 pom @@ -73,7 +73,7 @@ com.google.cloud google-cloud-monitoring-bom - 3.7.0 + 3.8.0 diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml index 99cd4fa506..65376f3054 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.17.0 + 2.17.1 google-cloud-bigtable-emulator-core - 0.154.0 + 0.154.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 6cdcefa664..7e4c290b32 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.154.0 + 0.154.1 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.17.0 + 2.17.1 scm:git:git@github.com:googleapis/java-bigtable.git @@ -81,14 +81,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.17.0 + 2.17.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.17.0 + 2.17.1 pom import @@ -99,7 +99,7 @@ com.google.cloud google-cloud-bigtable-emulator-core - 0.154.0 + 0.154.1 diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index daf21a5f1e..2718b17260 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.17.0 + 2.17.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.17.0 + 2.17.1 Experimental project to shade OpenCensus dependencies. @@ -21,7 +21,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.17.0 + 2.17.1 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index b1bc0683db..cb1a188c2f 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.17.0 + 2.17.1 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.17.0 + 2.17.1 - 2.17.0 + 2.17.1 google-cloud-bigtable @@ -43,14 +43,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.17.0 + 2.17.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.17.0 + 2.17.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 019e3a671b..ac7d3bd20c 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.17.0"; + public static String VERSION = "2.17.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 c2f3e0dbac..8a842f6959 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.17.0 + 2.17.1 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.17.0 + 2.17.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.17.0 + 2.17.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.17.0 + 2.17.1 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index dc0ce10e7d..3f2b256609 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.17.0 + 2.17.1 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.17.0 + 2.17.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.17.0 + 2.17.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.17.0 + 2.17.1 pom import diff --git a/pom.xml b/pom.xml index 51e19cdb85..afeee0d024 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.17.0 + 2.17.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.17.0 + 2.17.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.17.0 + 2.17.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.17.0 + 2.17.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.17.0 + 2.17.1 com.google.cloud google-cloud-bigtable - 2.17.0 + 2.17.1 diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 03c9d7176c..76825ef41a 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.17.0 + 2.17.1 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.17.0 + 2.17.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.17.0 + 2.17.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.17.0 + 2.17.1 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 54fd909ddf..99ae44e02a 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.17.0 + 2.17.1 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.17.0 + 2.17.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.17.0 + 2.17.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.17.0 + 2.17.1 pom import diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index b35f503d64..656b7cf8ed 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigtable - 2.16.0 + 2.17.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 279ff34eb5..69a5bf97aa 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.17.0 + 2.17.1 diff --git a/test-proxy/README.md b/test-proxy/README.md index a97f40094e..287c3a0f13 100644 --- a/test-proxy/README.md +++ b/test-proxy/README.md @@ -2,7 +2,7 @@ The CBT test proxy is intended for running confromance tests for Cloug Bigtable Java Client. -## Set up +## Set up If you have not already done so, [install golang](https://go.dev/doc/install), then clone the go test library: @@ -12,7 +12,7 @@ git clone https://github.com/googleapis/cloud-bigtable-clients-test.git ## Start test proxy -Build the proxy with the latest version of the client +Build the proxy with the latest/head version of the client ``` cd java-bigtable @@ -24,20 +24,13 @@ mvn clean install Start the proxy on default port 9999 ``` -mvn exec:java -Dexec.mainClass=com.google.cloud.bigtable.testproxy.CbtTestProxyMain +java -jar target/google-cloud-bigtable-test-proxy-.jar ``` Start the proxy on a different port ``` -mvn exec:java -Dexec.mainClass=com.google.cloud.bigtable.testproxy.CbtTestProxyMain -Dport=1 -``` - -Build and start the proxy with an older version of the client - -``` -mvn clean install -Dbigtable.client.version= -Denforcer.skip -mvn exec:java -Dexec.mainClass=com.google.cloud.bigtable.testproxy.CbtTestProxyMain +java -Dport=1 -jar target/google-cloud-bigtable-test-proxy-.jar ``` ## Run the test cases @@ -46,3 +39,12 @@ mvn exec:java -Dexec.mainClass=com.google.cloud.bigtable.testproxy.CbtTestProxyM cd cloud-bigtable-clients-test/tests go test -v -proxy_addr=:9999 ``` + +## Test a released client + +To do so, you need to build the proxy with the released version of the client. +Please download the source code +[here](https://github.com/googleapis/java-bigtable/releases), and repeat the +above steps. + +Note that Kokoro presubmit test doesn't use this route. diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml index d0ce5a4795..23b3f8fe1e 100644 --- a/test-proxy/pom.xml +++ b/test-proxy/pom.xml @@ -12,11 +12,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.17.0 + 2.17.1 - 2.17.0 + 2.17.1 @@ -134,6 +134,38 @@ true + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + com.google.cloud.bigtable.testproxy.CbtTestProxyMain + + + + + + + diff --git a/versions.txt b/versions.txt index d7585f93f5..057baba7fa 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.17.0:2.17.0 -grpc-google-cloud-bigtable-admin-v2:2.17.0:2.17.0 -grpc-google-cloud-bigtable-v2:2.17.0:2.17.0 -proto-google-cloud-bigtable-admin-v2:2.17.0:2.17.0 -proto-google-cloud-bigtable-v2:2.17.0:2.17.0 -google-cloud-bigtable-emulator:0.154.0:0.154.0 -google-cloud-bigtable-emulator-core:2.17.0:2.17.0 +google-cloud-bigtable:2.17.1:2.17.1 +grpc-google-cloud-bigtable-admin-v2:2.17.1:2.17.1 +grpc-google-cloud-bigtable-v2:2.17.1:2.17.1 +proto-google-cloud-bigtable-admin-v2:2.17.1:2.17.1 +proto-google-cloud-bigtable-v2:2.17.1:2.17.1 +google-cloud-bigtable-emulator:0.154.1:0.154.1 +google-cloud-bigtable-emulator-core:2.17.1:2.17.1