diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 0d6b73e7..0f7ecfaf 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": "44d553634e0f15341a5bc5610988ebe31b1a4dba" + "sha": "391946b74b48f6aa5e3a200b1936d41f0e644c0d" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8c5628b86cfa8386de7b8fc1675e6b528b552d57" + "sha": "2e7bd5cc66a3f0b90ce1c150eb35c89eeb9872d6" } } ] diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 7c8816a7..9b4fd4d8 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -16,8 +16,8 @@ jobs: return; } - // only approve PRs like "chore(master): release " - if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { + // only approve PRs like "chore: release " + if ( !context.payload.pull_request.title.startsWith("chore: release") ) { return; } diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index 20b960b0..43d7920b 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -7,12 +7,6 @@ env_vars: { value: "docs-staging" } -# cloud-rad staging -env_vars: { - key: "STAGING_BUCKET_V2" - value: "docs-staging-v2-staging" -} - env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-errorreporting/.kokoro/release/publish_javadoc.sh" @@ -26,4 +20,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 5d09edfc..ebfbd7dd 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -56,22 +56,3 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET} - -popd - -# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required. Beware of accidental updates. - -mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" - -pushd target/devsite/reference - -# create metadata -python3 -m docuploader create-metadata \ - --name ${NAME} \ - --version ${VERSION} \ - --language java - -# upload docs to staging bucket -python3 -m docuploader upload . \ - --credentials ${CREDENTIALS} \ - --staging-bucket ${STAGING_BUCKET_V2} diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 7308aafa..4d6257ca 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -40,6 +40,9 @@ export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # generate yml mvn clean site -B -q -P docFX +# copy README to docfx-yml dir and rename index.md +cp README.md target/docfx-yml/index.md + pushd target/docfx-yml # create metadata @@ -52,4 +55,4 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} \ - --destination-prefix docfx- + --destination-prefix docfx diff --git a/CHANGELOG.md b/CHANGELOG.md index fd2993fb..4c873bce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.120.18](https://www.github.com/googleapis/java-errorreporting/compare/v0.120.17...v0.120.18) (2021-03-11) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-core to v1.94.3 ([#458](https://www.github.com/googleapis/java-errorreporting/issues/458)) ([3dc7ed7](https://www.github.com/googleapis/java-errorreporting/commit/3dc7ed79de354e24715a41cf57ea949a350dec22)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.1 ([#464](https://www.github.com/googleapis/java-errorreporting/issues/464)) ([56dd0d8](https://www.github.com/googleapis/java-errorreporting/commit/56dd0d8937c01c96b3fd0bd3827365f6607043fa)) + ### [0.120.17](https://www.github.com/googleapis/java-errorreporting/compare/v0.120.16...v0.120.17) (2021-03-02) diff --git a/README.md b/README.md index 0bcf2815..fc16618c 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 - 18.0.0 + 19.0.0 pom import @@ -60,25 +60,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-errorreporting - 0.120.33-beta + 0.120.34-beta ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:18.0.0') +implementation platform('com.google.cloud:libraries-bom:19.0.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.33-beta' +compile 'com.google.cloud:google-cloud-errorreporting:0.120.34-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.120.33-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.120.34-beta" ``` ## Authentication diff --git a/google-cloud-errorreporting-bom/pom.xml b/google-cloud-errorreporting-bom/pom.xml index 5ddd49d0..ea8f0300 100644 --- a/google-cloud-errorreporting-bom/pom.xml +++ b/google-cloud-errorreporting-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-errorreporting-bom - 0.120.34-beta + 0.120.35-beta pom com.google.cloud @@ -63,17 +63,17 @@ com.google.cloud google-cloud-errorreporting - 0.120.34-beta + 0.120.35-beta com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.86.34 + 0.86.35 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.86.34 + 0.86.35 diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index 68067368..2a325818 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.34-beta + 0.120.35-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.34-beta + 0.120.35-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 279d977c..de820d02 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.34 + 0.86.35 grpc-google-cloud-error-reporting-v1beta1 GRPC library for grpc-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.120.34-beta + 0.120.35-beta diff --git a/pom.xml b/pom.xml index ee59d6c9..4f001a23 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-errorreporting-parent pom - 0.120.34-beta + 0.120.35-beta Google Cloud Error Reporting Parent https://github.com/googleapis/java-errorreporting @@ -70,23 +70,23 @@ com.google.cloud google-cloud-errorreporting - 0.120.34-beta + 0.120.35-beta com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.86.34 + 0.86.35 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.86.34 + 0.86.35 com.google.cloud google-cloud-shared-dependencies - 0.20.0 + 0.20.1 pom import diff --git a/proto-google-cloud-error-reporting-v1beta1/pom.xml b/proto-google-cloud-error-reporting-v1beta1/pom.xml index b2519677..86699c0f 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.34 + 0.86.35 proto-google-cloud-error-reporting-v1beta1 PROTO library for proto-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.120.34-beta + 0.120.35-beta diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 3bdfe36f..ea2e8b2a 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,14 +29,14 @@ com.google.cloud google-cloud-errorreporting - 0.120.33-beta + 0.120.34-beta com.google.cloud google-cloud-core - 1.94.2 + 1.94.3 junit diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d0f1dd5d..a090efe4 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,14 +28,14 @@ com.google.cloud google-cloud-errorreporting - 0.120.34-beta + 0.120.35-beta com.google.cloud google-cloud-core - 1.94.2 + 1.94.3 junit diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index b63bd05a..a70bf007 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 18.0.0 + 19.0.0 pom import diff --git a/synth.metadata b/synth.metadata index 01161cd3..c30a8332 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-errorreporting.git", - "sha": "822cee27664c9169305e6a7ec2634c06ec914eed" + "sha": "56dd0d8937c01c96b3fd0bd3827365f6607043fa" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" + "sha": "0b064d767537e0675fc053e53fca473c5c701fb8" } } ], diff --git a/versions.txt b/versions.txt index 70914691..138eaad9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -grpc-google-cloud-errorreporting-v1beta1:0.86.34:0.86.34 -proto-google-cloud-errorreporting-v1beta1:0.86.34:0.86.34 -google-cloud-errorreporting:0.120.34-beta:0.120.34-beta \ No newline at end of file +grpc-google-cloud-errorreporting-v1beta1:0.86.35:0.86.35 +proto-google-cloud-errorreporting-v1beta1:0.86.35:0.86.35 +google-cloud-errorreporting:0.120.35-beta:0.120.35-beta \ No newline at end of file