diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 88d9b926c1..731a0eb4a6 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:5b8c790f57cca57e6b37ba25f79291265c218cea3e6ba9714b001910ab3f1419
+ digest: sha256:491a007c6bd6e77f9e9b1bebcd6cdf08a4a4ef2c228c123d9696845204cb685d
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 5a4d4fdcc7..2d308bf8e8 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,15 +47,15 @@ set +e
case ${JOB_TYPE} in
test)
- mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+ mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
RETURN_CODE=$?
;;
lint)
- mvn com.coveo:fmt-maven-plugin:check
+ mvn com.coveo:fmt-maven-plugin:check -B -ntp
RETURN_CODE=$?
;;
javadoc)
- mvn javadoc:javadoc javadoc:test-javadoc
+ mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
RETURN_CODE=$?
;;
integration)
@@ -71,7 +71,7 @@ integration)
;;
graalvm)
# Run Unit and Integration Tests with Native Image
- mvn test -Pnative -Penable-integration-tests
+ mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
RETURN_CODE=$?
;;
samples)
@@ -104,7 +104,7 @@ samples)
fi
;;
clirr)
- mvn -B -Denforcer.skip=true clirr:check
+ mvn -B -ntp -Denforcer.skip=true clirr:check
RETURN_CODE=$?
;;
*)
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 6f416a3b18..da601b8f85 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -5,5 +5,6 @@
"language": "java",
"repo": "googleapis/java-core",
"repo_short": "java-core",
+ "library_type": "CORE",
"distribution_name": "com.google.cloud:google-cloud-core"
}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 161ca13c82..12e65c790b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
# Changelog
+### [2.3.4](https://www.github.com/googleapis/java-core/compare/v2.3.3...v2.3.4) (2022-01-06)
+
+
+### Bug Fixes
+
+* fixed compilation warnings from error prone ([e6e7040](https://www.github.com/googleapis/java-core/commit/e6e7040305b19ec9d5468f4cd44d7a29d0d5e470))
+* **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/java-core/issues/1299)) ([#643](https://www.github.com/googleapis/java-core/issues/643)) ([0f4c1db](https://www.github.com/googleapis/java-core/commit/0f4c1dbbd89d82f5cc86c2b684d6645699b835b3))
+* **java:** run Maven in plain console-friendly mode ([#1301](https://www.github.com/googleapis/java-core/issues/1301)) ([#652](https://www.github.com/googleapis/java-core/issues/652)) ([ab2fa93](https://www.github.com/googleapis/java-core/commit/ab2fa93ba0434f593abb063afad44dc923bf462a))
+
+
+### Dependencies
+
+* update dependency com.google.api-client:google-api-client-bom to v1.33.0 ([#658](https://www.github.com/googleapis/java-core/issues/658)) ([d417ebd](https://www.github.com/googleapis/java-core/commit/d417ebd7bedc9d4e983f32c87a8d61163502cf1d))
+* update dependency com.google.api:gax-bom to v2.8.0 ([#659](https://www.github.com/googleapis/java-core/issues/659)) ([91717ab](https://www.github.com/googleapis/java-core/commit/91717ab9361a31976727b26d08837e8b3838bdb4))
+* update dependency com.google.api.grpc:proto-google-common-protos to v2.7.1 ([#656](https://www.github.com/googleapis/java-core/issues/656)) ([ecfbdc1](https://www.github.com/googleapis/java-core/commit/ecfbdc181087d37d38f7911b9962953f5d246434))
+* update dependency com.google.api.grpc:proto-google-iam-v1 to v1.2.0 ([#645](https://www.github.com/googleapis/java-core/issues/645)) ([3926b54](https://www.github.com/googleapis/java-core/commit/3926b5423893635dd709b8fc6037fb896396ff13))
+* update dependency com.google.http-client:google-http-client-bom to v1.41.0 ([#657](https://www.github.com/googleapis/java-core/issues/657)) ([41a5120](https://www.github.com/googleapis/java-core/commit/41a51201a3712f71f6cf3be3c29db68360b2405f))
+* update dependency com.google.protobuf:protobuf-bom to v3.19.2 ([#655](https://www.github.com/googleapis/java-core/issues/655)) ([eb6c037](https://www.github.com/googleapis/java-core/commit/eb6c03729af41e6d7bd9db80644b8ddfd22e78ec))
+* update dependency io.grpc:grpc-bom to v1.43.1 ([#647](https://www.github.com/googleapis/java-core/issues/647)) ([275b882](https://www.github.com/googleapis/java-core/commit/275b882918f7625daeb3e98ab26b7b0a2f2cdb7b))
+
### [2.3.3](https://www.github.com/googleapis/java-core/compare/v2.3.2...v2.3.3) (2021-12-02)
diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml
index 9dbd2a9086..a0cb98e476 100644
--- a/google-cloud-core-bom/pom.xml
+++ b/google-cloud-core-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-core-bom
- 2.3.3
+ 2.3.4
pom
com.google.cloud
google-cloud-shared-config
- 1.2.2
+ 1.2.4
Google Cloud Core
@@ -63,17 +63,17 @@
com.google.cloud
google-cloud-core
- 2.3.3
+ 2.3.4
com.google.cloud
google-cloud-core-grpc
- 2.3.3
+ 2.3.4
com.google.cloud
google-cloud-core-http
- 2.3.3
+ 2.3.4
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml
index 6c706c6144..9a32f0835c 100644
--- a/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-core-grpc/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core-grpc
- 2.3.3
+ 2.3.4
jar
Google Cloud Core gRPC
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.3.3
+ 2.3.4
google-cloud-core-grpc
diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml
index 18761d9db1..1da2b02580 100644
--- a/google-cloud-core-http/pom.xml
+++ b/google-cloud-core-http/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core-http
- 2.3.3
+ 2.3.4
jar
Google Cloud Core HTTP
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.3.3
+ 2.3.4
google-cloud-core-http
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
index 8fb441ec62..38bbb4fa2c 100644
--- a/google-cloud-core/pom.xml
+++ b/google-cloud-core/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core
- 2.3.3
+ 2.3.4
jar
Google Cloud Core
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 2.3.3
+ 2.3.4
google-cloud-core
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
index 7891088d34..8ffb77eaf5 100644
--- a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
+++ b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -697,7 +697,7 @@ protected boolean baseEquals(ServiceOptions other) {
&& Objects.equals(retrySettings, other.retrySettings)
&& Objects.equals(serviceFactoryClassName, other.serviceFactoryClassName)
&& Objects.equals(serviceRpcFactoryClassName, other.serviceRpcFactoryClassName)
- && Objects.equals(clock, clock)
+ && Objects.equals(clock, other.clock)
&& Objects.equals(quotaProjectId, other.quotaProjectId);
}
diff --git a/google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java b/google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java
index 1f6de6007b..4bc5993f7f 100644
--- a/google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java
+++ b/google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java
@@ -140,6 +140,7 @@ public void testTranslateAndThrow() throws Exception {
}
@Test
+ @SuppressWarnings("TruthSelfEquals")
public void testError_Equal() {
BaseServiceException.Error error = new BaseServiceException.Error(0, "reason", true);
assertThat(error).isEqualTo(error);
diff --git a/google-cloud-core/src/test/java/com/google/cloud/DateTest.java b/google-cloud-core/src/test/java/com/google/cloud/DateTest.java
index 14b6a139d0..d95efaf094 100644
--- a/google-cloud-core/src/test/java/com/google/cloud/DateTest.java
+++ b/google-cloud-core/src/test/java/com/google/cloud/DateTest.java
@@ -126,9 +126,7 @@ public void equalAndHashCode() {
Date d1 = Date.fromYearMonthDay(2016, 9, 18);
Date d2 = Date.fromYearMonthDay(2016, 9, 18);
Date d3 = Date.fromYearMonthDay(2016, 9, 19);
- EqualsTester tester = new EqualsTester();
- tester.addEqualityGroup(d1, d2);
- tester.addEqualityGroup(d3);
+ new EqualsTester().addEqualityGroup(d1, d2).addEqualityGroup(d3).testEquals();
}
@Test
diff --git a/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java b/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java
index edef7820cd..781fbb8925 100644
--- a/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java
+++ b/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java
@@ -101,13 +101,12 @@ public void testValueOfStrict() {
@Test
public void testEquals() {
- EqualsTester tester = new EqualsTester();
-
- tester.addEqualityGroup(Letter.A, Letter.valueOf("A"), Letter.valueOfStrict("A"));
- tester.addEqualityGroup(Letter.B, Letter.valueOf("B"), Letter.valueOfStrict("B"));
- tester.addEqualityGroup(Letter.C, Letter.valueOf("C"), Letter.valueOfStrict("C"));
- tester.addEqualityGroup(
- Letter.valueOf("NonExistentLetter"), Letter.valueOf("NonExistentLetter"));
+ new EqualsTester()
+ .addEqualityGroup(Letter.A, Letter.valueOf("A"), Letter.valueOfStrict("A"))
+ .addEqualityGroup(Letter.B, Letter.valueOf("B"), Letter.valueOfStrict("B"))
+ .addEqualityGroup(Letter.C, Letter.valueOf("C"), Letter.valueOfStrict("C"))
+ .addEqualityGroup(Letter.valueOf("NonExistentLetter"), Letter.valueOf("NonExistentLetter"))
+ .testEquals();
}
@Test
@@ -123,6 +122,7 @@ public void testValueOfStrict_invalid() {
@Test
public void testValues() {
assertThat(
- Arrays.asList(Letter.values()).containsAll(Arrays.asList(Letter.A, Letter.B, Letter.C)));
+ Arrays.asList(Letter.values()).containsAll(Arrays.asList(Letter.A, Letter.B, Letter.C)))
+ .isTrue();
}
}
diff --git a/pom.xml b/pom.xml
index ddb1b7bdee..48e7b1fa78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-core-parent
pom
- 2.3.3
+ 2.3.4
Google Cloud Core Parent
https://github.com/googleapis/java-core
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.2.2
+ 1.2.4
@@ -151,15 +151,15 @@
UTF-8
github
google-cloud-core-parent
- 2.7.1
+ 2.8.0
2.1.1
- 2.7.0
- 1.1.7
+ 2.7.1
+ 1.2.0
1.3.0
- 1.32.2
- 1.40.1
- 1.42.1
- 3.19.1
+ 1.33.0
+ 1.41.0
+ 1.43.1
+ 3.19.2
0.28.0
1.3.2
31.0.1-jre
diff --git a/versions.txt b/versions.txt
index baa4aaa9b1..598956c7d4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-core:2.3.3:2.3.3
\ No newline at end of file
+google-cloud-core:2.3.4:2.3.4
\ No newline at end of file