diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 7649651c..459487d3 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:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8 + digest: sha256:ae72564aa9c368b9ccd96f4af21f87889fd83b9e60635b80844deb5a2ccd08aa diff --git a/.kokoro/build.sh b/.kokoro/build.sh index a4d13e42..f26974a4 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -70,6 +70,16 @@ integration) verify RETURN_CODE=$? ;; +graalvm) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + RETURN_CODE=$? + ;; +graalvm17) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index d7476cfe..bd896024 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -57,54 +57,3 @@ retry_with_backoff 3 10 \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true - -echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************" -## Run dependency list completeness check -function completenessCheck() { - # Output dep list with compile scope generated using the original pom - # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency. - # This is stripped from the output as it is not present in the flattened pom. - # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. - msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt - - # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) - msg "Generating dependency list using flattened pom..." - mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt - - # Compare two dependency lists - msg "Comparing dependency lists..." - diff .org-list.txt .new-list.txt >.diff.txt - if [[ $? == 0 ]] - then - msg "Success. No diff!" - else - msg "Diff found. See below: " - msg "You can also check .diff.txt file located in $1." - cat .diff.txt - return 1 - fi -} - -# Allow failures to continue running the script -set +e - -error_count=0 -for path in **/.flattened-pom.xml -do - # Check flattened pom in each dir that contains it for completeness - dir=$(dirname "$path") - pushd "$dir" - completenessCheck "$dir" - error_count=$(($error_count + $?)) - popd -done - -if [[ $error_count == 0 ]] -then - msg "All checks passed." - exit 0 -else - msg "Errors found. See log statements above." - exit 1 -fi diff --git a/CHANGELOG.md b/CHANGELOG.md index e1b068f9..f922cf5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.124.19](https://github.com/googleapis/java-storage-nio/compare/v0.124.18...v0.124.19) (2022-10-26) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-storage to v2.14.0 ([#1039](https://github.com/googleapis/java-storage-nio/issues/1039)) ([26ef9be](https://github.com/googleapis/java-storage-nio/commit/26ef9beee22a380a810ab6a6b9f2e3e67b03fd40)) + ## [0.124.18](https://github.com/googleapis/java-storage-nio/compare/v0.124.17...v0.124.18) (2022-10-21) diff --git a/google-cloud-nio-examples/pom.xml b/google-cloud-nio-examples/pom.xml index f05aa3d1..b98601ee 100644 --- a/google-cloud-nio-examples/pom.xml +++ b/google-cloud-nio-examples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio-examples - 0.124.18 + 0.124.19 jar Google Cloud NIO Examples https://github.com/googleapis/java-storage-nio @@ -13,7 +13,7 @@ com.google.cloud google-cloud-nio-parent - 0.124.18 + 0.124.19 diff --git a/google-cloud-nio-retrofit/pom.xml b/google-cloud-nio-retrofit/pom.xml index a7ba41a0..ba6e8af3 100644 --- a/google-cloud-nio-retrofit/pom.xml +++ b/google-cloud-nio-retrofit/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio-retrofit - 0.124.18 + 0.124.19 jar Google Cloud NIO Retrofit Example https://github.com/googleapis/java-storage-nio @@ -12,7 +12,7 @@ com.google.cloud google-cloud-nio-parent - 0.124.18 + 0.124.19 google-cloud-nio-retrofit diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml index 650c56c5..025f28db 100644 --- a/google-cloud-nio/pom.xml +++ b/google-cloud-nio/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio - 0.124.18 + 0.124.19 jar Google Cloud NIO https://github.com/googleapis/java-storage-nio @@ -12,7 +12,7 @@ com.google.cloud google-cloud-nio-parent - 0.124.18 + 0.124.19 google-cloud-nio @@ -80,7 +80,7 @@ org.mockito mockito-core - 4.8.0 + 4.8.1 test diff --git a/google-cloud-nio/src/main/resources/META-INF/native-image/com/google/cloud/google-cloud-nio/native-image.properties b/google-cloud-nio/src/main/resources/META-INF/native-image/com/google/cloud/google-cloud-nio/native-image.properties index 538e25bb..59caa80a 100644 --- a/google-cloud-nio/src/main/resources/META-INF/native-image/com/google/cloud/google-cloud-nio/native-image.properties +++ b/google-cloud-nio/src/main/resources/META-INF/native-image/com/google/cloud/google-cloud-nio/native-image.properties @@ -40,4 +40,5 @@ Args = --initialize-at-build-time=com.google.cloud.storage.contrib.nio.CloudStor com.google.common.io.BaseEncoding$Base64Encoding,\ com.google.common.io.BaseEncoding,\ com.google.common.io.BaseEncoding$StandardBaseEncoding,\ - com.google.api.client.util.PemReader + com.google.api.client.util.PemReader,\ + com.google.common.base.Charsets diff --git a/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java b/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java index 9914e8e1..57d698b9 100644 --- a/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java +++ b/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java @@ -26,6 +26,7 @@ import com.google.api.gax.rpc.internal.QuotaProjectIdHidingCredentials; import com.google.auth.Credentials; import com.google.cloud.NoCredentials; +import com.google.cloud.ServiceOptions; import com.google.cloud.storage.StorageOptions; import com.google.cloud.storage.contrib.nio.testing.LocalStorageHelper; import com.google.cloud.testing.junit4.MultipleAttemptsRule; @@ -462,8 +463,7 @@ private static Credentials credentialsForPath(Path p) storageOptionsField.setAccessible(true); StorageOptions storageOptions = (StorageOptions) storageOptionsField.get(cloudFilesystemProvider); - Field credentialsField = - storageOptions.getClass().getSuperclass().getDeclaredField("credentials"); + Field credentialsField = ServiceOptions.class.getDeclaredField("credentials"); credentialsField.setAccessible(true); return (Credentials) credentialsField.get(storageOptions); } diff --git a/pom.xml b/pom.xml index 9027be60..75462089 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-nio-parent pom - 0.124.18 + 0.124.19 Storage Parent https://github.com/googleapis/java-storage-nio @@ -78,7 +78,7 @@ com.google.cloud google-cloud-storage - 2.13.1 + 2.14.0 com.google.apis diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index efa55065..dbcdafc9 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-nio - 0.124.17 + 0.124.18 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4b475c38..6034726c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-nio - 0.124.18 + 0.124.19 diff --git a/versions.txt b/versions.txt index 79a2d2d9..521c0ae9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-nio:0.124.18:0.124.18 \ No newline at end of file +google-cloud-nio:0.124.19:0.124.19 \ No newline at end of file