diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index af5dd3bd5..6afe2d1bc 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -28,11 +28,15 @@ branchProtectionRules: requiresStrictStatusChecks: false # List of required status check contexts that must pass for commits to be accepted to matching branches. requiredStatusCheckContexts: - - "Kokoro - Test: Binary Compatibility" - - "Kokoro - Test: Java 11" - - "Kokoro - Test: Java 7" - - "Kokoro - Test: Java 8" - - "Kokoro - Test: Linkage Monitor" + - "units (7)" + - "units (8)" + - "units (11)" + - "windows" + - "dependencies (8)" + - "dependencies (11)" + - "linkage-monitor" + - "lint" + - "clirr" - "cla/google" # List of explicit permissions to add (additive only) diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 2b6cdbc97..7c8816a7d 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -4,7 +4,7 @@ name: auto-release jobs: approve: runs-on: ubuntu-latest - if: contains(github.head_ref, 'release-v') + if: contains(github.head_ref, 'release-please') steps: - uses: actions/github-script@v3 with: @@ -16,8 +16,8 @@ jobs: return; } - // only approve PRs like "chore: release " - if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + // only approve PRs like "chore(master): release " + if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { return; } diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 683022075..def8b3a2c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -54,7 +54,11 @@ jobs: with: java-version: 8 - run: java -version - - run: .kokoro/linkage-monitor.sh + - name: Install artifacts to local Maven repository + run: .kokoro/build.sh + shell: bash + - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) + uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml deleted file mode 100644 index c46230a78..000000000 --- a/.github/workflows/samples.yaml +++ /dev/null @@ -1,14 +0,0 @@ -on: - pull_request: -name: samples -jobs: - checkstyle: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Run checkstyle - run: mvn -P lint --quiet --batch-mode checkstyle:check - working-directory: samples/snippets diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 4ef0f0e85..67856029b 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -29,7 +29,7 @@ echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true \ -Denforcer.skip=true \ @@ -60,6 +60,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -ntp \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -81,6 +82,7 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ + -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ @@ -110,8 +112,8 @@ bash .kokoro/coerce_logs.sh if [[ "${ENABLE_BUILD_COP}" == "true" ]] then - chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop - ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/google-http-java-client + chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot + ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/google-http-java-client fi echo "exiting with ${RETURN_CODE}" diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index c91e5a569..0fb8c8436 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true @@ -86,4 +86,4 @@ then else msg "Errors found. See log statements above." exit 1 -fi \ No newline at end of file +fi diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh deleted file mode 100755 index 759ab4e2c..000000000 --- a/.kokoro/linkage-monitor.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -eo pipefail -# Display commands being run. -set -x - -## Get the directory of the build script -scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) -## cd to the parent directory, i.e. the root of the git repo -cd ${scriptDir}/.. - -# include common functions -source ${scriptDir}/common.sh - -# Print out Java version -java -version -echo ${JOB_TYPE} - -# attempt to install 3 times with exponential backoff (starting with 10 seconds) -retry_with_backoff 3 10 \ - mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true - -# Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR -JAR=linkage-monitor-latest-all-deps.jar -curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/${JAR}" - -# Fails if there's new linkage errors compared with baseline -java -jar ${JAR} com.google.cloud:libraries-bom diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index 25e6405f6..8bb77da13 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -7,10 +7,10 @@ env_vars: { value: "docs-staging" } +# cloud-rad staging env_vars: { key: "STAGING_BUCKET_V2" - value: "docs-staging-v2" - # Production will be at: docs-staging-v2 + value: "docs-staging-v2-staging" } env_vars: { @@ -26,4 +26,4 @@ before_action { keyname: "docuploader_service_account" } } -} +} \ No newline at end of file diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index b17f6fa7e..afe768251 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \ --version ${VERSION} \ --language java -# upload docs +# upload docs to staging bucket python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg new file mode 100644 index 000000000..7ee197247 --- /dev/null +++ b/.kokoro/release/publish_javadoc11.cfg @@ -0,0 +1,30 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# cloud-rad production +env_vars: { + key: "STAGING_BUCKET_V2" + value: "docs-staging-v2" +} + +# Configure the docker image for kokoro-trampoline +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-http-java-client/.kokoro/release/publish_javadoc11.sh" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "docuploader_service_account" + } + } +} + +# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh new file mode 100755 index 000000000..c43e56341 --- /dev/null +++ b/.kokoro/release/publish_javadoc11.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Copyright 2021 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +if [[ -z "${CREDENTIALS}" ]]; then + CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account +fi + +if [[ -z "${STAGING_BUCKET_V2}" ]]; then + echo "Need to set STAGING_BUCKET_V2 environment variable" + exit 1 +fi + +# work from the git root directory +pushd $(dirname "$0")/../../ + +# install docuploader package +python3 -m pip install gcp-docuploader + +# compile all packages +mvn clean install -B -q -DskipTests=true + +export NAME=google-http-client +export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) + +# V3 generates docfx yml from javadoc +# generate yml +mvn clean site -B -q -P docFX + +pushd target/docfx-yml + +# create metadata +python3 -m docuploader create-metadata \ + --name ${NAME} \ + --version ${VERSION} \ + --language java + +# upload yml to production bucket +python3 -m docuploader upload . \ + --credentials ${CREDENTIALS} \ + --staging-bucket ${STAGING_BUCKET_V2} \ + --destination-prefix docfx- diff --git a/CHANGELOG.md b/CHANGELOG.md index 62757901a..d9f8a5284 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog +## [1.39.0](https://www.github.com/googleapis/google-http-java-client/compare/v1.38.1...v1.39.0) (2021-02-24) + + +### Features + +* add http.status_code attribute to all Spans that have at least a low level http response ([#986](https://www.github.com/googleapis/google-http-java-client/issues/986)) ([fb02042](https://www.github.com/googleapis/google-http-java-client/commit/fb02042ac216379820950879cea45d06eec5278c)) + + +### Bug Fixes + +* deprecate obsolete utility methods ([#1231](https://www.github.com/googleapis/google-http-java-client/issues/1231)) ([8f95371](https://www.github.com/googleapis/google-http-java-client/commit/8f95371cf5681fbc67bd598d74089f38742a1177)) +* fix buildRequest setUrl order ([#1255](https://www.github.com/googleapis/google-http-java-client/issues/1255)) ([97ffee1](https://www.github.com/googleapis/google-http-java-client/commit/97ffee1a68af6637dd5d53fcd70e2ce02c9c9604)) +* refactor to use StandardCharsets ([#1243](https://www.github.com/googleapis/google-http-java-client/issues/1243)) ([03ec798](https://www.github.com/googleapis/google-http-java-client/commit/03ec798d7637ff454614415be7b324cd8dc7c77c)) +* remove old broken link ([#1275](https://www.github.com/googleapis/google-http-java-client/issues/1275)) ([12f80e0](https://www.github.com/googleapis/google-http-java-client/commit/12f80e09e71a41b967db548ab93cab2e3f4e549c)), closes [#1278](https://www.github.com/googleapis/google-http-java-client/issues/1278) +* remove unused logger ([#1228](https://www.github.com/googleapis/google-http-java-client/issues/1228)) ([779d383](https://www.github.com/googleapis/google-http-java-client/commit/779d3832ffce741b7c4055a14855ce8755695fce)) + + +### Documentation + +* Jackson is unable to maintain stable Javadocs ([#1265](https://www.github.com/googleapis/google-http-java-client/issues/1265)) ([9e8fcff](https://www.github.com/googleapis/google-http-java-client/commit/9e8fcfffc6d92505528aff0a89c169bf3e812c41)) + + +### Dependencies + +* update dependency com.google.protobuf:protobuf-java to v3.15.1 ([#1270](https://www.github.com/googleapis/google-http-java-client/issues/1270)) ([213726a](https://www.github.com/googleapis/google-http-java-client/commit/213726a0b65f35fdc65713027833d22b553bbc20)) +* update dependency com.google.protobuf:protobuf-java to v3.15.2 ([#1284](https://www.github.com/googleapis/google-http-java-client/issues/1284)) ([dfa06bc](https://www.github.com/googleapis/google-http-java-client/commit/dfa06bca432f644a7146e3987555f19c5d1be7c5)) +* update OpenCensus to 0.28.0 for consistency with gRPC ([#1242](https://www.github.com/googleapis/google-http-java-client/issues/1242)) ([b810d53](https://www.github.com/googleapis/google-http-java-client/commit/b810d53c8f63380c1b4f398408cfb47c6ab134cc)) +* version manage error_prone_annotations to 2.5.1 ([#1268](https://www.github.com/googleapis/google-http-java-client/issues/1268)) ([6a95f6f](https://www.github.com/googleapis/google-http-java-client/commit/6a95f6f2494a9dafd968d212b15c9b329416864f)) + ### [1.38.1](https://www.github.com/googleapis/google-http-java-client/compare/v1.38.0...v1.38.1) (2021-01-12) diff --git a/LICENSE b/LICENSE index d64569567..261eeb9e9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/docs/setup.md b/docs/setup.md index 28a746f8c..987ce3de6 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`: com.google.cloud libraries-bom - 16.2.1 + 17.0.0 pom import diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index b3ac37cb2..51d6e3a53 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -4,7 +4,7 @@ google-http-client google-http-client-android-test Test project for google-http-client-android. - 1.38.1 + 1.39.0 apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.38.1 + 1.39.0 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.38.1 + 1.39.0 junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 24ffa7df3..9ab015c03 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-android - 1.38.1 + 1.39.0 Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index 9449ab9a1..2022ba827 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-apache-v2 - 1.38.1 + 1.39.0 Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index 8b765d995..8bfeb7f6c 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-appengine - 1.38.1 + 1.39.0 Google App Engine extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index 6f651b71f..6db98d1ed 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -4,12 +4,12 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml com.google.http-client google-http-client-assembly - 1.38.1 + 1.39.0 pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index fb6806f35..3b1cd4d3d 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.http-client google-http-client-bom - 1.38.1 + 1.39.0 pom Google HTTP Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.http-client google-http-client - 1.38.1 + 1.39.0 com.google.http-client google-http-client-android - 1.38.1 + 1.39.0 com.google.http-client google-http-client-apache-v2 - 1.38.1 + 1.39.0 com.google.http-client google-http-client-appengine - 1.38.1 + 1.39.0 com.google.http-client google-http-client-findbugs - 1.38.1 + 1.39.0 com.google.http-client google-http-client-gson - 1.38.1 + 1.39.0 com.google.http-client google-http-client-jackson2 - 1.38.1 + 1.39.0 com.google.http-client google-http-client-protobuf - 1.38.1 + 1.39.0 com.google.http-client google-http-client-test - 1.38.1 + 1.39.0 com.google.http-client google-http-client-xml - 1.38.1 + 1.39.0 diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index e3781775f..ce9ea5d06 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-findbugs - 1.38.1 + 1.39.0 Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 4528ef2a8..669c08c51 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-gson - 1.38.1 + 1.39.0 GSON extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index 95bfac0c7..9f52689f7 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-jackson2 - 1.38.1 + 1.39.0 Jackson 2 extensions to the Google HTTP Client Library for Java. @@ -17,8 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/7/docs/api/ - http://fasterxml.github.com/jackson-core/javadoc/${project.jackson-core2.version}/ + https://download.oracle.com/javase/7/docs/api/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java index 3c1bc0c3f..e7fe19f76 100644 --- a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java +++ b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java @@ -13,8 +13,7 @@ */ /** - * Low-level implementation of the JSON parser library based on the Jackson 2 JSON library. + * Low-level implementation of the JSON parser library based on the Jackson 2 JSON library. * * @since 1.11 * @author Yaniv Inbar diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index 0b4943878..cb0d459bc 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-protobuf - 1.38.1 + 1.39.0 Protocol Buffer extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index 814bda2a6..56b668fac 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-test - 1.38.1 + 1.39.0 Shared classes used for testing of artifacts in the Google HTTP Client Library for Java. diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index 3b89d2b9a..2c1caabf2 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client-xml - 1.38.1 + 1.39.0 XML extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 59b592c29..dc71150bf 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../pom.xml google-http-client - 1.38.1 + 1.39.0 Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, diff --git a/google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java b/google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java index fdd9a768e..9384c4470 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java +++ b/google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java @@ -14,11 +14,11 @@ package com.google.api.client.http; -import com.google.api.client.util.Charsets; import com.google.api.client.util.IOUtils; import com.google.api.client.util.StreamingContent; import java.io.IOException; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * Abstract implementation of an HTTP content with typical options. @@ -87,13 +87,13 @@ public AbstractHttpContent setMediaType(HttpMediaType mediaType) { } /** - * Returns the charset specified in the media type or {@code Charsets#UTF_8} if not specified. + * Returns the charset specified in the media type or ISO_8859_1 if not specified. * * @since 1.10 */ protected final Charset getCharset() { return mediaType == null || mediaType.getCharsetParameter() == null - ? Charsets.ISO_8859_1 + ? StandardCharsets.ISO_8859_1 : mediaType.getCharsetParameter(); } diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java index 0b9b2abbb..312702b9a 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java @@ -1012,6 +1012,9 @@ public HttpResponse execute() throws IOException { LowLevelHttpResponse lowLevelHttpResponse = lowLevelHttpRequest.execute(); if (lowLevelHttpResponse != null) { OpenCensusUtils.recordReceivedMessageEvent(span, lowLevelHttpResponse.getContentLength()); + span.putAttribute( + HttpTraceAttributeConstants.HTTP_STATUS_CODE, + AttributeValue.longAttributeValue(lowLevelHttpResponse.getStatusCode())); } // Flag used to indicate if an exception is thrown before the response is constructed. boolean responseConstructed = false; diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java index a14058c8b..7a92a03bf 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java @@ -84,13 +84,13 @@ public HttpRequestInitializer getInitializer() { public HttpRequest buildRequest(String requestMethod, GenericUrl url, HttpContent content) throws IOException { HttpRequest request = transport.buildRequest(); + if (url != null) { + request.setUrl(url); + } if (initializer != null) { initializer.initialize(request); } request.setRequestMethod(requestMethod); - if (url != null) { - request.setUrl(url); - } if (content != null) { request.setContent(content); } diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java b/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java index 2df92d4c4..efc3d1e58 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java @@ -14,7 +14,6 @@ package com.google.api.client.http; -import com.google.api.client.util.Charsets; import com.google.api.client.util.IOUtils; import com.google.api.client.util.LoggingInputStream; import com.google.api.client.util.Preconditions; @@ -26,6 +25,7 @@ import java.io.OutputStream; import java.lang.reflect.Type; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; @@ -506,14 +506,14 @@ public String parseAsString() throws IOException { } /** - * Returns the {@link Charset} specified in the Content-Type of this response or the {@code - * "ISO-8859-1"} charset as a default. + * Returns the {@link Charset} specified in the Content-Type of this response or the ISO-8859-1 + * charset as a default. * * @since 1.10 */ public Charset getContentCharset() { return mediaType == null || mediaType.getCharsetParameter() == null - ? Charsets.ISO_8859_1 + ? StandardCharsets.ISO_8859_1 : mediaType.getCharsetParameter(); } } diff --git a/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java b/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java index 6c432e672..2be6d9b24 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java +++ b/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java @@ -15,7 +15,6 @@ package com.google.api.client.http; import com.google.api.client.util.ArrayValueMap; -import com.google.api.client.util.Charsets; import com.google.api.client.util.ClassInfo; import com.google.api.client.util.Data; import com.google.api.client.util.FieldInfo; @@ -34,6 +33,7 @@ import java.io.StringWriter; import java.lang.reflect.Type; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -72,7 +72,10 @@ public class UrlEncodedParser implements ObjectParser { * @since 1.13 */ public static final String MEDIA_TYPE = - new HttpMediaType(UrlEncodedParser.CONTENT_TYPE).setCharsetParameter(Charsets.UTF_8).build(); + new HttpMediaType(UrlEncodedParser.CONTENT_TYPE) + .setCharsetParameter(StandardCharsets.UTF_8) + .build(); + /** * Parses the given URL-encoded content into the given data object of data key name/value pairs * using {@link #parse(Reader, Object)}. diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java b/google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java index b92a55a9c..22825f5f0 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java +++ b/google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java @@ -14,7 +14,6 @@ package com.google.api.client.json; -import com.google.api.client.util.Charsets; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -22,6 +21,7 @@ import java.io.Reader; import java.io.Writer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * Abstract low-level JSON factory. @@ -159,7 +159,7 @@ private String toString(Object item, boolean pretty) throws IOException { */ private ByteArrayOutputStream toByteStream(Object item, boolean pretty) throws IOException { ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); - JsonGenerator generator = createJsonGenerator(byteStream, Charsets.UTF_8); + JsonGenerator generator = createJsonGenerator(byteStream, StandardCharsets.UTF_8); if (pretty) { generator.enablePrettyPrint(); } diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java index a85759138..115cdd7d1 100644 --- a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java @@ -18,13 +18,13 @@ import com.google.api.client.http.LowLevelHttpRequest; import com.google.api.client.http.LowLevelHttpResponse; import com.google.api.client.util.Beta; -import com.google.api.client.util.Charsets; import com.google.api.client.util.IOUtils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -164,7 +164,7 @@ public String getContentAsString() throws IOException { HttpMediaType mediaType = contentType != null ? new HttpMediaType(contentType) : null; Charset charset = mediaType == null || mediaType.getCharsetParameter() == null - ? Charsets.ISO_8859_1 + ? StandardCharsets.ISO_8859_1 : mediaType.getCharsetParameter(); return out.toString(charset.name()); } diff --git a/google-http-client/src/main/java/com/google/api/client/util/Base64.java b/google-http-client/src/main/java/com/google/api/client/util/Base64.java index 038156390..9225cd5dd 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/Base64.java +++ b/google-http-client/src/main/java/com/google/api/client/util/Base64.java @@ -22,7 +22,9 @@ * * @since 1.8 * @author Yaniv Inbar + * @deprecated use com.google.common.io.BaseEncoding#base64 */ +@Deprecated public class Base64 { /** diff --git a/google-http-client/src/main/java/com/google/api/client/util/Beta.java b/google-http-client/src/main/java/com/google/api/client/util/Beta.java index c5f6e3d1b..87e4f710f 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/Beta.java +++ b/google-http-client/src/main/java/com/google/api/client/util/Beta.java @@ -41,6 +41,7 @@ * * @since 1.15 * @author Eyal Peled + * @deprecated use com.google.common.annotations.Beta */ @Target( value = { @@ -52,4 +53,5 @@ ElementType.PACKAGE }) @Documented +@Deprecated public @interface Beta {} diff --git a/google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java b/google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java index 24939307d..bb4820c4d 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java +++ b/google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java @@ -24,7 +24,9 @@ * * @since 1.14 * @author Yaniv Inbar + * @deprecated use com.google.common.io.ByteSource */ +@Deprecated public class ByteArrayStreamingContent implements StreamingContent { /** Byte array content. */ diff --git a/google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java b/google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java index 00f7702cb..6443214cf 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java +++ b/google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java @@ -22,12 +22,11 @@ /** * Provides utility methods for working with byte arrays and I/O streams. * - *

NOTE: this is a copy of a subset of Guava's {@link com.google.common.io.ByteStreams}. The - * implementation must match as closely as possible to Guava's implementation. - * * @since 1.14 * @author Yaniv Inbar + * @deprecated use Guava's com.google.common.io.ByteStreams */ +@Deprecated public final class ByteStreams { private static final int BUF_SIZE = 0x1000; // 4K diff --git a/google-http-client/src/main/java/com/google/api/client/util/Charsets.java b/google-http-client/src/main/java/com/google/api/client/util/Charsets.java index ecc460dec..7546cceb8 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/Charsets.java +++ b/google-http-client/src/main/java/com/google/api/client/util/Charsets.java @@ -15,6 +15,7 @@ package com.google.api.client.util; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * Contains constant definitions for some standard {@link Charset} instances that are guaranteed to @@ -25,14 +26,16 @@ * * @since 1.14 * @author Yaniv Inbar + * @deprecated use java.nio.charset.StandardCharsets */ +@Deprecated public final class Charsets { /** UTF-8 charset. */ - public static final Charset UTF_8 = Charset.forName("UTF-8"); + public static final Charset UTF_8 = StandardCharsets.UTF_8; /** ISO-8859-1 charset. */ - public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1"); + public static final Charset ISO_8859_1 = StandardCharsets.ISO_8859_1; private Charsets() {} } diff --git a/google-http-client/src/main/java/com/google/api/client/util/Collections2.java b/google-http-client/src/main/java/com/google/api/client/util/Collections2.java index 5cd920446..7c609496b 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/Collections2.java +++ b/google-http-client/src/main/java/com/google/api/client/util/Collections2.java @@ -19,12 +19,11 @@ /** * Static utility methods pertaining to {@link Collection} instances. * - *

NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Collections2}. - * The implementation must match as closely as possible to Guava's implementation. - * * @since 1.14 * @author Yaniv Inbar + * @deprecated use Guava's {@link com.google.common.collect.Collections2} */ +@Deprecated public final class Collections2 { /** Used to avoid http://bugs.sun.com/view_bug.do?bug_id=6558557. */ diff --git a/google-http-client/src/main/java/com/google/api/client/util/IOUtils.java b/google-http-client/src/main/java/com/google/api/client/util/IOUtils.java index 9ccad9886..6d7ff929e 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/IOUtils.java +++ b/google-http-client/src/main/java/com/google/api/client/util/IOUtils.java @@ -54,7 +54,9 @@ public class IOUtils { * * @param inputStream source input stream * @param outputStream destination output stream + * @deprecated use {@link com.google.common.io.ByteStreams#copy(InputStream, OutputStream)} */ + @Deprecated public static void copy(InputStream inputStream, OutputStream outputStream) throws IOException { copy(inputStream, outputStream, true); } @@ -79,7 +81,9 @@ public static void copy(InputStream inputStream, OutputStream outputStream) thro * @param inputStream source input stream * @param outputStream destination output stream * @param closeInputStream whether the input stream should be closed at the end of this method + * @deprecated use {@link com.google.common.io.ByteStreams#copy(InputStream, OutputStream)} */ + @Deprecated public static void copy( InputStream inputStream, OutputStream outputStream, boolean closeInputStream) throws IOException { @@ -173,6 +177,7 @@ public static S deserialize(InputStream inputStream) th * Returns whether the given file is a symbolic link. * * @since 1.16 + * @deprecated use java.nio.file.Path#isSymbolicLink */ public static boolean isSymbolicLink(File file) throws IOException { // first try using Java 7 diff --git a/google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java b/google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java index 8ae55bbf6..27347bafb 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java +++ b/google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java @@ -24,7 +24,9 @@ * * @since 1.14 * @author Yaniv Inbar + * @deprecated use com.google.common.io.ByteSink */ +@Deprecated public interface StreamingContent { /** diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java b/google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java index 5bcab8679..98c5003ef 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java +++ b/google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java @@ -37,7 +37,6 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import java.util.logging.Logger; /** * Thread-safe file implementation of a credential store. @@ -55,8 +54,6 @@ */ public class FileDataStoreFactory extends AbstractDataStoreFactory { - private static final Logger LOGGER = Logger.getLogger(FileDataStoreFactory.class.getName()); - private static final boolean IS_WINDOWS = StandardSystemProperty.OS_NAME.value().toLowerCase(Locale.ENGLISH).startsWith("windows"); diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestFactoryTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestFactoryTest.java new file mode 100644 index 000000000..568eb201c --- /dev/null +++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestFactoryTest.java @@ -0,0 +1,41 @@ +/* + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package com.google.api.client.http; + +import com.google.api.client.http.javanet.NetHttpTransport; +import java.io.IOException; +import junit.framework.TestCase; + +/** Tests {@link HttpRequestFactory}. */ +public class HttpRequestFactoryTest extends TestCase { + + public void testBuildRequest_urlShouldBeSet() throws IllegalArgumentException, IOException { + HttpRequestFactory requestFactory = + new NetHttpTransport() + .createRequestFactory( + new HttpRequestInitializer() { + @Override + public void initialize(HttpRequest request) { + // Url should be set by buildRequest method before calling initialize. + if (request.getUrl() == null) { + throw new IllegalArgumentException("url is not set in request"); + } + } + }); + GenericUrl url = new GenericUrl("https://foo.googleapis.com/"); + HttpRequest request = requestFactory.buildRequest("GET", url, null); + assertEquals(url, request.getUrl()); + } +} diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java index d2d2df5d1..6fc9cb37d 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java @@ -80,6 +80,7 @@ public void executeCreatesSpan() throws IOException { assertAttributeEquals(span, "http.host", "google.com"); assertAttributeEquals(span, "http.url", "https://google.com/"); assertAttributeEquals(span, "http.method", "GET"); + assertAttributeEquals(span, "http.status_code", "200"); // Ensure we have a single annotation for starting the first attempt assertEquals(1, span.getAnnotations().getEvents().size()); diff --git a/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java b/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java index ed3ec5e53..8b286a983 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java @@ -15,9 +15,9 @@ package com.google.api.client.http; import com.google.api.client.json.Json; -import com.google.api.client.util.Charsets; import com.google.api.client.util.StringUtils; import java.io.ByteArrayOutputStream; +import java.nio.charset.StandardCharsets; import junit.framework.TestCase; /** @@ -77,7 +77,7 @@ public void testRandomContent() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); content.writeTo(out); String expectedContent = expectedStringBuilder.toString(); - assertEquals(expectedContent, out.toString(Charsets.UTF_8.name())); + assertEquals(expectedContent, out.toString(StandardCharsets.UTF_8.name())); assertEquals(StringUtils.getBytesUtf8(expectedContent).length, content.getLength()); } @@ -128,7 +128,7 @@ private void subtestContent(String expectedContent, String boundaryString, Strin // write to string ByteArrayOutputStream out = new ByteArrayOutputStream(); content.writeTo(out); - assertEquals(expectedContent, out.toString(Charsets.UTF_8.name())); + assertEquals(expectedContent, out.toString(StandardCharsets.UTF_8.name())); assertEquals(StringUtils.getBytesUtf8(expectedContent).length, content.getLength()); assertEquals( boundaryString == null diff --git a/pom.xml b/pom.xml index 4c44d5c30..5a82bb623 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -118,14 +118,19 @@ junit junit - 4.13.1 + 4.13.2 com.google.truth truth - 1.0.1 + 1.1.2 test + + com.google.errorprone + error_prone_annotations + 2.5.1 + com.google.appengine appengine-api-1.0-sdk @@ -339,7 +344,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.1.2 org.codehaus.mojo @@ -422,9 +427,8 @@ site - http://download.oracle.com/javase/7/docs/api/ - http://cloud.google.com/appengine/docs/java/javadoc - http://fasterxml.github.com/jackson-core/javadoc/${project.jackson-core2.version}/ + https://download.oracle.com/javase/7/docs/api/ + https://cloud.google.com/appengine/docs/java/javadoc https://static.javadoc.io/doc/com.google.code.gson/gson/${project.gson.version} https://google.github.io/guava/releases/${project.guava.version}/api/docs/ @@ -573,18 +577,18 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.38.1 + 1.39.0 1.9.71 UTF-8 3.0.2 2.8.6 2.12.1 - 3.14.0 + 3.15.2 30.1-android 1.1.4c 4.5.13 4.4.14 - 0.24.0 + 0.28.0 .. false diff --git a/renovate.json b/renovate.json index 37b5f62da..c37889d49 100644 --- a/renovate.json +++ b/renovate.json @@ -1,19 +1,73 @@ { "extends": [ - "config:base" + ":separateMajorReleases", + ":combinePatchMinorReleases", + ":ignoreUnstable", + ":prImmediately", + ":updateNotScheduled", + ":automergeDisabled", + ":ignoreModulesAndTests", + ":maintainLockFilesDisabled", + ":autodetectPinVersions" ], "packageRules": [ { - "packagePatterns": ["^com.google.guava:guava"], - "groupName": "Guava packages" + "packagePatterns": [ + "^com.google.guava:" + ], + "versionScheme": "docker" }, { - "packagePatterns": ["^com.google.appengine:appengine-"], - "groupName": "AppEngine packages" + "packagePatterns": [ + "*" + ], + "semanticCommitType": "deps", + "semanticCommitScope": null }, { - "packagePatterns": ["^io.opencensus:opencensus-"], - "groupName": "OpenCensus packages" + "packagePatterns": [ + "^org.apache.maven", + "^org.jacoco:", + "^org.codehaus.mojo:", + "^org.sonatype.plugins:", + "^com.coveo:", + "^com.google.cloud:google-cloud-shared-config" + ], + "semanticCommitType": "build", + "semanticCommitScope": "deps" + }, + { + "packagePatterns": [ + "^com.google.http-client:google-http-client", + "^com.google.cloud:libraries-bom", + "^com.google.cloud.samples:shared-configuration" + ], + "semanticCommitType": "chore", + "semanticCommitScope": "deps" + }, + { + "packagePatterns": [ + "^junit:junit", + "^com.google.truth:truth", + "^org.mockito:mockito-core", + "^org.objenesis:objenesis" + ], + "semanticCommitType": "test", + "semanticCommitScope": "deps" + }, + { + "packagePatterns": [ + "^com.google.cloud:google-cloud-" + ], + "ignoreUnstable": false + }, + { + "packagePatterns": [ + "^com.fasterxml.jackson.core" + ], + "groupName": "jackson dependencies" } - ] + ], + "semanticCommits": true, + "masterIssue": true } diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 03394282f..50e340ee1 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.38.1 + 1.39.0 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 4074dc1ce..bcabd581b 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -36,13 +36,13 @@ junit junit - 4.13.1 + 4.13.2 test com.google.truth truth - 1.0.1 + 1.1.2 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4ce2f9b5e..aff3bc4c1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -34,13 +34,13 @@ junit junit - 4.13.1 + 4.13.2 test com.google.truth truth - 1.0.1 + 1.1.2 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 9aa97cc57..8a13dbdc1 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 16.2.1 + 17.0.0 pom import @@ -51,19 +51,19 @@ junit junit - 4.13.1 + 4.13.2 test com.google.truth truth - 1.0.1 + 1.1.2 test com.google.http-client google-http-client-gson - 1.38.0 + 1.38.1 test diff --git a/synth.metadata b/synth.metadata index 0b022eb0c..3b2ac37d7 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-http-java-client.git", - "sha": "c71e1fa6b6d31d7b5a5a0df6db86e66a5ebd8614" + "sha": "213726a0b65f35fdc65713027833d22b553bbc20" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6133907dbb3ddab204a17a15d5c53ec0aae9b033" + "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" } } ], @@ -40,7 +40,6 @@ ".kokoro/continuous/java8.cfg", ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", - ".kokoro/linkage-monitor.sh", ".kokoro/nightly/common.cfg", ".kokoro/nightly/integration.cfg", ".kokoro/nightly/java11.cfg", @@ -72,6 +71,8 @@ ".kokoro/release/promote.sh", ".kokoro/release/publish_javadoc.cfg", ".kokoro/release/publish_javadoc.sh", + ".kokoro/release/publish_javadoc11.cfg", + ".kokoro/release/publish_javadoc11.sh", ".kokoro/release/snapshot.cfg", ".kokoro/release/snapshot.sh", ".kokoro/release/stage.cfg", diff --git a/synth.py b/synth.py index a22e87e05..cb1a283f1 100644 --- a/synth.py +++ b/synth.py @@ -19,6 +19,6 @@ "README.md", "java.header", "checkstyle.xml", - "renovate.json", "license-checks.xml", + ".github/workflows/samples.yaml", ]) diff --git a/versions.txt b/versions.txt index b27ffb944..9e0415d13 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.38.1:1.38.1 -google-http-client-bom:1.38.1:1.38.1 -google-http-client-parent:1.38.1:1.38.1 -google-http-client-android:1.38.1:1.38.1 -google-http-client-android-test:1.38.1:1.38.1 -google-http-client-apache-v2:1.38.1:1.38.1 -google-http-client-appengine:1.38.1:1.38.1 -google-http-client-assembly:1.38.1:1.38.1 -google-http-client-findbugs:1.38.1:1.38.1 -google-http-client-gson:1.38.1:1.38.1 -google-http-client-jackson2:1.38.1:1.38.1 -google-http-client-protobuf:1.38.1:1.38.1 -google-http-client-test:1.38.1:1.38.1 -google-http-client-xml:1.38.1:1.38.1 +google-http-client:1.39.0:1.39.0 +google-http-client-bom:1.39.0:1.39.0 +google-http-client-parent:1.39.0:1.39.0 +google-http-client-android:1.39.0:1.39.0 +google-http-client-android-test:1.39.0:1.39.0 +google-http-client-apache-v2:1.39.0:1.39.0 +google-http-client-appengine:1.39.0:1.39.0 +google-http-client-assembly:1.39.0:1.39.0 +google-http-client-findbugs:1.39.0:1.39.0 +google-http-client-gson:1.39.0:1.39.0 +google-http-client-jackson2:1.39.0:1.39.0 +google-http-client-protobuf:1.39.0:1.39.0 +google-http-client-test:1.39.0:1.39.0 +google-http-client-xml:1.39.0:1.39.0