diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 2d4774d4..add0530f 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-errorreporting.git", - "sha": "6188c8fd86808e720cd5770fcb919d16e9b0eee4" + "sha": "a384172bdec1224a3eaa5bf02df6ee021e3bf3fa" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "16ec872dd898d7de6e1822badfac32484b5d9031" + "sha": "2414b817065726eae0bc525346c7e874f969369d" } } ] diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 2b6cdbc9..7c8816a7 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 68302207..98a472e1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -54,7 +54,18 @@ jobs: with: java-version: 8 - run: java -version - - run: .kokoro/linkage-monitor.sh + - name: Install artifacts to local Maven repository + run: | + source .kokoro/common.sh + retry_with_backoff 3 10 \ + mvn install -B -V \ + -Dmaven.test.skip -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true + shell: bash + - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 61b2ce55..512bcd67 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -110,8 +110,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/java-errorreporting + chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot + ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-errorreporting fi echo "exiting with ${RETURN_CODE}" diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh deleted file mode 100755 index 759ab4e2..00000000 --- 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 31c2d4b8..e29c3363 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -26,4 +26,4 @@ before_action { keyname: "docuploader_service_account" } } -} +} \ No newline at end of file diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg new file mode 100644 index 00000000..c82f9a5b --- /dev/null +++ b/.kokoro/release/publish_javadoc11.cfg @@ -0,0 +1,30 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "STAGING_BUCKET_V2" + value: "docs-staging-v2" + # Production will be at: 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/java-errorreporting/.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 00000000..3695879a --- /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-cloud-errorreporting +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 +python3 -m docuploader upload . \ + --credentials ${CREDENTIALS} \ + --staging-bucket ${STAGING_BUCKET_V2} \ + --destination-prefix docfx- diff --git a/CHANGELOG.md b/CHANGELOG.md index bde03a8d..c72d5e93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.120.14](https://www.github.com/googleapis/java-errorreporting/compare/v0.120.13...v0.120.14) (2021-02-16) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-core to v1.94.1 ([#382](https://www.github.com/googleapis/java-errorreporting/issues/382)) ([5509341](https://www.github.com/googleapis/java-errorreporting/commit/5509341f7359da2279500873d4b8b2c9aa8ad33f)) + ### [0.120.13](https://www.github.com/googleapis/java-errorreporting/compare/v0.120.12...v0.120.13) (2021-01-14) diff --git a/LICENSE b/LICENSE index d6456956..261eeb9e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/README.md b/README.md index 2dfdd9ed..0eae8bec 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 16.2.1 + 16.4.0 pom import @@ -46,7 +46,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.truth truth - 1.1 + 1.1.2 test @@ -67,18 +67,18 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:16.2.1') +implementation platform('com.google.cloud:libraries-bom:16.4.0') compile 'com.google.cloud:google-cloud-errorreporting' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-errorreporting:0.120.12-beta' +compile 'com.google.cloud:google-cloud-errorreporting:0.120.13-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.120.12-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.120.13-beta" ``` ## Authentication diff --git a/google-cloud-errorreporting-bom/pom.xml b/google-cloud-errorreporting-bom/pom.xml index 5809f76f..2ecb689c 100644 --- a/google-cloud-errorreporting-bom/pom.xml +++ b/google-cloud-errorreporting-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-errorreporting-bom - 0.120.13-beta + 0.120.14-beta pom com.google.cloud google-cloud-shared-config - 0.9.4 + 0.10.0 Google Cloud errorreporting BOM @@ -63,17 +63,17 @@ com.google.cloud google-cloud-errorreporting - 0.120.13-beta + 0.120.14-beta com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.86.13 + 0.86.14 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.86.13 + 0.86.14 diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index f34dfc74..23a57758 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-errorreporting - 0.120.13-beta + 0.120.14-beta jar Google Cloud Error Reporting https://github.com/googleapis/java-errorreporting @@ -11,7 +11,7 @@ com.google.cloud google-cloud-errorreporting-parent - 0.120.13-beta + 0.120.14-beta google-cloud-errorreporting diff --git a/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/grpc-google-cloud-error-reporting-v1beta1/pom.xml index 063663d6..4c45550e 100644 --- a/grpc-google-cloud-error-reporting-v1beta1/pom.xml +++ b/grpc-google-cloud-error-reporting-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.86.13 + 0.86.14 grpc-google-cloud-error-reporting-v1beta1 GRPC library for grpc-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.120.13-beta + 0.120.14-beta diff --git a/pom.xml b/pom.xml index 7ca38fc5..f999bd57 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-errorreporting-parent pom - 0.120.13-beta + 0.120.14-beta Google Cloud Error Reporting Parent https://github.com/googleapis/java-errorreporting @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.9.4 + 0.10.0 @@ -70,17 +70,17 @@ com.google.cloud google-cloud-errorreporting - 0.120.13-beta + 0.120.14-beta com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.86.13 + 0.86.14 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.86.13 + 0.86.14 @@ -94,7 +94,7 @@ junit junit - 4.13.1 + 4.13.2 test diff --git a/proto-google-cloud-error-reporting-v1beta1/pom.xml b/proto-google-cloud-error-reporting-v1beta1/pom.xml index 9268d7b4..a8dc468a 100644 --- a/proto-google-cloud-error-reporting-v1beta1/pom.xml +++ b/proto-google-cloud-error-reporting-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.86.13 + 0.86.14 proto-google-cloud-error-reporting-v1beta1 PROTO library for proto-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.120.13-beta + 0.120.14-beta diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 411cd2ff..7b5990bd 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -36,18 +36,18 @@ com.google.cloud google-cloud-core - 1.94.0 + 1.94.1 junit junit - 4.13.1 + 4.13.2 test com.google.truth truth - 1.1 + 1.1.2 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 0a06502b..57b1379b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,25 +28,25 @@ com.google.cloud google-cloud-errorreporting - 0.120.13-beta + 0.120.14-beta com.google.cloud google-cloud-core - 1.94.0 + 1.94.1 junit junit - 4.13.1 + 4.13.2 test com.google.truth truth - 1.1 + 1.1.2 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 98561fae..ce9e33f2 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 16.2.1 + 16.4.0 pom import @@ -50,13 +50,13 @@ junit junit - 4.13.1 + 4.13.2 test com.google.truth truth - 1.1 + 1.1.2 test diff --git a/synth.metadata b/synth.metadata index 5765fa6f..3dc1994e 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-errorreporting.git", - "sha": "777d8d849f19ff202161d8cbf643ffde9a585de4" + "sha": "5509341f7359da2279500873d4b8b2c9aa8ad33f" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6133907dbb3ddab204a17a15d5c53ec0aae9b033" + "sha": "2414b817065726eae0bc525346c7e874f969369d" } } ], @@ -59,7 +59,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", @@ -91,6 +90,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/versions.txt b/versions.txt index f8d3de86..1ac4ad42 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -grpc-google-cloud-errorreporting-v1beta1:0.86.13:0.86.13 -proto-google-cloud-errorreporting-v1beta1:0.86.13:0.86.13 -google-cloud-errorreporting:0.120.13-beta:0.120.13-beta \ No newline at end of file +grpc-google-cloud-errorreporting-v1beta1:0.86.14:0.86.14 +proto-google-cloud-errorreporting-v1beta1:0.86.14:0.86.14 +google-cloud-errorreporting:0.120.14-beta:0.120.14-beta \ No newline at end of file