diff --git a/.gitignore b/.gitignore index fadd6afc2..5a29d6904 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ target/ .classpath .project .settings +.checkstyle # Intellij *.iml @@ -13,3 +14,6 @@ target/ # python utilities *.pyc __pycache__ + +.flattened-pom.xml + diff --git a/CHANGELOG.md b/CHANGELOG.md index caa0aed59..89a64936b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [1.111.1](https://www.github.com/googleapis/java-storage/compare/v1.111.0...v1.111.1) (2020-07-01) + + +### Dependencies + +* update dependency com.google.apis:google-api-services-storage to v1-rev20200611-1.30.9 ([#406](https://www.github.com/googleapis/java-storage/issues/406)) ([b2ebea7](https://www.github.com/googleapis/java-storage/commit/b2ebea7a8fa0a2b2a2696c33da5f54a94b0f3d62)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.8.2 ([#414](https://www.github.com/googleapis/java-storage/issues/414)) ([4451887](https://www.github.com/googleapis/java-storage/commit/4451887bc58cdfa14488efcba6ad4040819ab71c)) +* update dependency google-cloud-shared-config to v0.9.0 ([#417](https://www.github.com/googleapis/java-storage/issues/417)) +* update dependency grpc-google-cloud-kms-v1 to v0.86.0 ([#417](https://www.github.com/googleapis/java-storage/issues/417)) +* update dependency proto-google-cloud-kms-v1 to v0.86.0 ([#417](https://www.github.com/googleapis/java-storage/issues/417)) + + ## [1.111.0](https://www.github.com/googleapis/java-storage/compare/v1.110.0...v1.111.0) (2020-06-25) diff --git a/README.md b/README.md index 740c0e163..6730b0268 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-storage - 1.109.1 + 1.111.0 ``` @@ -47,11 +47,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-storage:1.111.0' +compile 'com.google.cloud:google-cloud-storage:1.111.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.111.0" +libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.111.1" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index efdf55a8d..52477c7e2 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-storage - 1.111.0 + 1.111.1 jar Google Cloud Storage https://github.com/googleapis/java-storage @@ -12,11 +12,10 @@ com.google.cloud google-cloud-storage-parent - 1.111.0 + 1.111.1 google-cloud-storage - 2.2 @@ -95,18 +94,6 @@ junit test - - org.hamcrest - hamcrest - ${hamcrest.version} - test - - - org.hamcrest - hamcrest-core - ${hamcrest.version} - test - io.grpc grpc-api @@ -130,13 +117,13 @@ com.google.api.grpc grpc-google-cloud-kms-v1 - 0.85.1 + 0.86.0 test com.google.api.grpc proto-google-cloud-kms-v1 - 0.85.1 + 0.86.0 test @@ -165,11 +152,6 @@ mockito-core test - - org.objenesis - objenesis - test - com.google.cloud google-cloud-conformance-tests @@ -203,7 +185,7 @@ grpc-netty-shaded is needed for integration tests hamcrest-core is used for test mocks --> - io.grpc:grpc-netty-shaded,org.hamcrest:hamcrest-core + io.grpc:grpc-netty-shaded diff --git a/pom.xml b/pom.xml index 86f026e5e..f9ebead29 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-storage-parent pom - 1.111.0 + 1.111.1 Storage Parent https://github.com/googleapis/java-storage @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.8.1 + 0.9.0 @@ -70,7 +70,7 @@ com.google.cloud google-cloud-shared-dependencies - 0.8.1 + 0.8.2 pom import @@ -78,7 +78,7 @@ com.google.apis google-api-services-storage - v1-rev20200430-1.30.9 + v1-rev20200611-1.30.9 org.easymock @@ -145,12 +145,6 @@ org.apache.maven.plugins maven-dependency-plugin - - - org.hamcrest:hamcrest - org.objenesis:objenesis - - diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index bbee6546f..94483b729 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-storage - 1.109.1 + 1.111.0 @@ -53,7 +53,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d65df7e81..30e614a1a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-storage - 1.109.1 + 1.111.0 @@ -52,7 +52,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index c912560c2..320dca505 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 7.0.0 + 8.0.0 pom import diff --git a/synth.metadata b/synth.metadata index 79e7a4fed..f4837d0f4 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-storage.git", - "sha": "37f00ebc84ff4069f14e1cfa0f0a5f9552f08282" + "sha": "a5773d4c43127e808ee56b7185e58af6c3cdb8a2" } }, { diff --git a/versions.txt b/versions.txt index e98012626..55f2e90e1 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-storage:1.111.0:1.111.0 \ No newline at end of file +google-cloud-storage:1.111.1:1.111.1 \ No newline at end of file