diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index 47c2ba132..c644a24e1 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -9,3 +9,4 @@ ignoreAuthors: - 'renovate-bot' - 'yoshi-automation' - 'release-please[bot]' +- 'gcf-owl-bot[bot]' diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index e47892f10..3e031e246 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-logging.git", - "sha": "6632ceea05f67e44f546be4bc307aef7339ba257" + "sha": "3044f761d15379a08a021b07fb3d754d22536da3" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6726988c677bb78385868bfc48dbfa2fe981d44a" + "sha": "a2de127f90799cd5bace653b1dcc5dd2ca8b19c9" } } ] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index def8b3a2c..0195b32f0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,10 +19,6 @@ jobs: - run: .kokoro/build.sh env: JOB_TYPE: test - - name: coverage - uses: codecov/codecov-action@v1 - with: - name: actions ${{matrix.java}} windows: runs-on: windows-latest steps: @@ -80,4 +76,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..3ab2448e0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "env-tests-logging"] + path = env-tests-logging + url = https://github.com/googleapis/env-tests-logging diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 3242be3c4..4d0c5bff6 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -23,8 +23,8 @@ cd ${scriptDir}/.. # include common functions source ${scriptDir}/common.sh -# Print out Java version -java -version +# Print out Maven & Java version +mvn -version echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 7c487c702..7e8702741 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -42,6 +42,8 @@ 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 +# copy CHANGELOG to docfx-yml dir and rename history.md +cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 410db449a..1a91b2a45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.3.0](https://www.github.com/googleapis/java-logging/compare/v2.2.3...v2.3.0) (2021-05-26) + + +### Features + +* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#534](https://www.github.com/googleapis/java-logging/issues/534)) ([5e8a13f](https://www.github.com/googleapis/java-logging/commit/5e8a13f64ef29f2541aa246771ac1659c9f29e97)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#532](https://www.github.com/googleapis/java-logging/issues/532)) ([8a30a36](https://www.github.com/googleapis/java-logging/commit/8a30a365310f07378e65e8e75e70b4fcbb920e17)) + ### [2.2.3](https://www.github.com/googleapis/java-logging/compare/v2.2.2...v2.2.3) (2021-05-11) diff --git a/README.md b/README.md index e73b33f14..4999c49c3 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 - 20.2.0 + 20.5.0 pom import @@ -39,25 +39,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-logging - 2.2.2 + 2.2.3 ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.3.0') +implementation platform('com.google.cloud:libraries-bom:20.5.0') compile 'com.google.cloud:google-cloud-logging' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-logging:2.2.2' +compile 'com.google.cloud:google-cloud-logging:2.2.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "2.2.2" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "2.2.3" ``` ## Authentication diff --git a/env-tests-logging b/env-tests-logging new file mode 160000 index 000000000..06f6c9219 --- /dev/null +++ b/env-tests-logging @@ -0,0 +1 @@ +Subproject commit 06f6c921949621a878f3a47ec294b7ce25a39ddf diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 1d25a2f34..af1caaf8a 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 2.2.3 + 2.3.0 pom com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 Google Cloud logging BOM @@ -64,17 +64,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.87.3 + 0.88.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.87.3 + 0.88.0 com.google.cloud google-cloud-logging - 2.2.3 + 2.3.0 diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 3f6eb86e8..7abce3d25 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 2.2.3 + 2.3.0 jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 2.2.3 + 2.3.0 google-cloud-logging diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index 420d6e3a6..e6f0de93a 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.87.3 + 0.88.0 grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 2.2.3 + 2.3.0 diff --git a/pom.xml b/pom.xml index 2bc530477..c1445ac48 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 2.2.3 + 2.3.0 Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 @@ -70,23 +70,23 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.87.3 + 0.88.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.87.3 + 0.88.0 com.google.cloud google-cloud-logging - 2.2.3 + 2.3.0 com.google.cloud google-cloud-shared-dependencies - 1.1.0 + 1.2.0 pom import @@ -117,7 +117,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 html diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index a9439246b..f3f9854ad 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.87.3 + 0.88.0 proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 2.2.3 + 2.3.0 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 9ecfdaf6d..cecb2d276 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 2.2.2 + 2.2.3 @@ -41,7 +41,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/pom.xml b/samples/pom.xml index 3638bb74f..75d3ca836 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -64,7 +64,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b8d82ab69..c7cf530a9 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 2.2.3 + 2.3.0 @@ -40,7 +40,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index e3fbcb9f9..794e2170b 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 20.2.0 + 20.5.0 pom import @@ -51,7 +51,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/synth.metadata b/synth.metadata index 4379af3d1..2a7de734d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-logging.git", - "sha": "df47c5e65f3d13f441e3804d482f854c8d5d7387" + "sha": "09731014f530674e7ace811ae7bf0f1851731fd6" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "046994f491c02806aea60118e214a9edd67f5ab7" + "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" } } ], diff --git a/versions.txt b/versions.txt index 43ccc6f8b..3c796d47a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -proto-google-cloud-logging-v2:0.87.3:0.87.3 -grpc-google-cloud-logging-v2:0.87.3:0.87.3 -google-cloud-logging:2.2.3:2.2.3 \ No newline at end of file +proto-google-cloud-logging-v2:0.88.0:0.88.0 +grpc-google-cloud-logging-v2:0.88.0:0.88.0 +google-cloud-logging:2.3.0:2.3.0 \ No newline at end of file