diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml new file mode 100644 index 00000000..20f3acc2 --- /dev/null +++ b/.github/generated-files-bot.yml @@ -0,0 +1,7 @@ +externalManifests: +- type: json + file: 'synth.metadata' + jsonpath: '$.generatedFiles[*]' +- type: json + file: '.github/readme/synth.metadata/synth.metadata' + jsonpath: '$.generatedFiles[*]' diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 3c4f8b26..41376e96 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-trace.git", - "sha": "000f8ce743c57b0cdd72b4b83c3b07c44248c6ca" + "sha": "0dc7d9702c91498ff342b4c65addd22151b2534a" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6abb59097be84599a1d6091fe534a49e5c5cf948" + "sha": "b19b401571e77192f8dd38eab5fb2300a0de9324" } } ] diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 28496c78..196ffeca 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -78,7 +78,7 @@ samples) if [[ -f ${SAMPLES_DIR}/pom.xml ]] then - pushd {SAMPLES_DIR} + pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ -DtrimStackTrace=false \ diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 4b28c4d8..bc3de464 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -62,7 +62,7 @@ popd # V2 mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" -pushd target/devsite +pushd target/devsite/reference # create metadata python3 -m docuploader create-metadata \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed60a66..f796f3f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.6](https://www.github.com/googleapis/java-trace/compare/v1.2.5...v1.2.6) (2020-11-02) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.14.1 ([#336](https://www.github.com/googleapis/java-trace/issues/336)) ([93847cf](https://www.github.com/googleapis/java-trace/commit/93847cf59601140dd66257855fa445a14560003f)) + ### [1.2.5](https://www.github.com/googleapis/java-trace/compare/v1.2.4...v1.2.5) (2020-10-22) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6b2238bb..2add2547 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,4 @@ + # Code of Conduct ## Our Pledge @@ -69,12 +70,12 @@ dispute. If you are unable to resolve the matter for any reason, or if the behavior is threatening or harassing, report it. We are dedicated to providing an environment where participants feel welcome and safe. -Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the -Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to +Reports should be directed to *googleapis-stewards@google.com*, the +Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the Open Source Programs Office and the Google Open Source Strategy team. If for any reason you -are uncomfortable reaching out the Project Steward, please email +are uncomfortable reaching out to the Project Steward, please email opensource@google.com. We will investigate every complaint, but you may not receive a direct response. diff --git a/README.md b/README.md index d5bc5202..4e555668 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 13.1.0 + 13.4.0 pom import @@ -38,18 +38,18 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-trace - 1.2.3 + 1.2.5 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-trace:1.2.4' +compile 'com.google.cloud:google-cloud-trace:1.2.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "1.2.4" +libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "1.2.5" ``` ## Authentication diff --git a/google-cloud-trace-bom/pom.xml b/google-cloud-trace-bom/pom.xml index 429896ec..05513f18 100644 --- a/google-cloud-trace-bom/pom.xml +++ b/google-cloud-trace-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-trace-bom - 1.2.5 + 1.2.6 pom com.google.cloud google-cloud-shared-config - 0.9.3 + 0.9.4 Google Cloud Trace BOM @@ -63,32 +63,32 @@ com.google.api.grpc proto-google-cloud-trace-v1 - 1.2.5 + 1.2.6 com.google.api.grpc grpc-google-cloud-trace-v1 - 1.2.5 + 1.2.6 com.google.api.grpc grpc-google-cloud-trace-v2 - 1.2.5 + 1.2.6 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.5 + 1.2.6 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.5 + 1.2.6 com.google.cloud google-cloud-trace - 1.2.5 + 1.2.6 diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml index 06c72cf9..9f554c58 100644 --- a/google-cloud-trace/pom.xml +++ b/google-cloud-trace/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-trace - 1.2.5 + 1.2.6 jar Google Cloud Trace https://github.com/googleapis/java-trace @@ -13,7 +13,7 @@ com.google.cloud google-cloud-trace-parent - 1.2.5 + 1.2.6 google-cloud-trace diff --git a/grpc-google-cloud-trace-v1/pom.xml b/grpc-google-cloud-trace-v1/pom.xml index 19ffb160..1013bbe7 100644 --- a/grpc-google-cloud-trace-v1/pom.xml +++ b/grpc-google-cloud-trace-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-trace-v1 - 1.2.5 + 1.2.6 grpc-google-cloud-trace-v1 GRPC library for grpc-google-cloud-trace-v1 com.google.cloud google-cloud-trace-parent - 1.2.5 + 1.2.6 diff --git a/grpc-google-cloud-trace-v2/pom.xml b/grpc-google-cloud-trace-v2/pom.xml index c9ed4835..9c6048a2 100644 --- a/grpc-google-cloud-trace-v2/pom.xml +++ b/grpc-google-cloud-trace-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-trace-v2 - 1.2.5 + 1.2.6 grpc-google-cloud-trace-v2 GRPC library for grpc-google-cloud-trace-v2 com.google.cloud google-cloud-trace-parent - 1.2.5 + 1.2.6 diff --git a/pom.xml b/pom.xml index b40510d1..7f26219a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-trace-parent pom - 1.2.5 + 1.2.6 Google Cloud Trace Parent https://github.com/googleapis/java-core @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.9.3 + 0.9.4 @@ -158,28 +158,28 @@ com.google.api.grpc proto-google-cloud-trace-v1 - 1.2.5 + 1.2.6 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.5 + 1.2.6 com.google.api.grpc grpc-google-cloud-trace-v1 - 1.2.5 + 1.2.6 com.google.api.grpc grpc-google-cloud-trace-v2 - 1.2.5 + 1.2.6 com.google.cloud google-cloud-shared-dependencies - 0.13.0 + 0.14.1 pom import diff --git a/proto-google-cloud-trace-v1/pom.xml b/proto-google-cloud-trace-v1/pom.xml index a6c6dbd8..ad1cb514 100644 --- a/proto-google-cloud-trace-v1/pom.xml +++ b/proto-google-cloud-trace-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-trace-v1 - 1.2.5 + 1.2.6 proto-google-cloud-trace-v1 PROTO library for proto-google-cloud-trace-v1 com.google.cloud google-cloud-trace-parent - 1.2.5 + 1.2.6 diff --git a/proto-google-cloud-trace-v2/pom.xml b/proto-google-cloud-trace-v2/pom.xml index eff0d1a1..84e4ccc6 100644 --- a/proto-google-cloud-trace-v2/pom.xml +++ b/proto-google-cloud-trace-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.5 + 1.2.6 proto-google-cloud-trace-v2 PROTO library for proto-google-cloud-trace-v2 com.google.cloud google-cloud-trace-parent - 1.2.5 + 1.2.6 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index fcc32a4d..38e18a31 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-trace - 1.2.3 + 1.2.5 @@ -42,7 +42,7 @@ com.google.truth truth - 1.0.1 + 1.1 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 29c4191b..b5930e1a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,19 +28,19 @@ com.google.cloud google-cloud-trace - 1.2.5 + 1.2.6 junit junit - 1.2.5 + 1.2.6 test com.google.truth truth - 1.2.5 + 1.2.6 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 825820d3..b5c40037 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 13.1.0 + 13.4.0 pom import @@ -53,7 +53,7 @@ com.google.truth truth - 1.0.1 + 1.1 test diff --git a/synth.metadata b/synth.metadata index 4137a5ec..099ab9cc 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-trace.git", - "sha": "a199e8fb8073deacc0de7a4be8460ae91b59e00f" + "sha": "5ebeb3fbb3243f6fe1fbd335e42fc213b594bd5f" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6abb59097be84599a1d6091fe534a49e5c5cf948" + "sha": "f68649c5f26bcff6817c6d21e90dac0fc71fef8e" } } ], diff --git a/versions.txt b/versions.txt index 4ffb8d6f..73c7adbb 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-trace:1.2.5:1.2.5 -grpc-google-cloud-trace-v1:1.2.5:1.2.5 -grpc-google-cloud-trace-v2:1.2.5:1.2.5 -proto-google-cloud-trace-v1:1.2.5:1.2.5 -proto-google-cloud-trace-v2:1.2.5:1.2.5 +google-cloud-trace:1.2.6:1.2.6 +grpc-google-cloud-trace-v1:1.2.6:1.2.6 +grpc-google-cloud-trace-v2:1.2.6:1.2.6 +proto-google-cloud-trace-v1:1.2.6:1.2.6 +proto-google-cloud-trace-v2:1.2.6:1.2.6