From 31ac97989f5e46c5fb219b0709f28536051789da Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 19 Jan 2022 11:52:20 -0800 Subject: [PATCH 1/5] chore: update cloud rad doclet (#329) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 15dfc7210..ce976fdc2 100644 --- a/build.gradle +++ b/build.gradle @@ -353,7 +353,7 @@ task javadocCombinedV3(type: Javadoc) { options.addStringOption('encoding', 'UTF-8') options.addStringOption("doclet", "com.microsoft.doclet.DocFxDoclet") options.addStringOption("projectname", "api-common") - options.docletpath = [file(System.getenv('KOKORO_GFILE_DIR') + "/java-docfx-doclet-1.4.0.jar")] + options.docletpath = [file(System.getenv('KOKORO_GFILE_DIR') + "/java-docfx-doclet-1.5.0.jar")] // Newer Gradle 6 passes -notimestamp by default, which the doclet above doesn't understand: // https://github.com/gradle/gradle/issues/11898 options.noTimestamp false From cb2accd13a00e9e30bd2d9c0360078999912b46c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 12:45:53 -0800 Subject: [PATCH 2/5] chore(main): release 2.1.3-SNAPSHOT (#330) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- build.gradle | 2 +- versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ce976fdc2..49c8cacbb 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin' group = "com.google.api" archivesBaseName = "api-common" -project.version = "2.1.2" // {x-version-update:api-common:current} +project.version = "2.1.3-SNAPSHOT" // {x-version-update:api-common:current} sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/versions.txt b/versions.txt index 410bce4f4..3969aebea 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -api-common:2.1.2:2.1.2 +api-common:2.1.2:2.1.3-SNAPSHOT From e37fbee96b2946e2101f313f87b5427833471ea2 Mon Sep 17 00:00:00 2001 From: Daniel Gazineu Date: Wed, 19 Jan 2022 15:51:57 -0500 Subject: [PATCH 3/5] chore: fixed test assertion (#326) Co-authored-by: Emily Ball --- src/test/java/com/google/api/pathtemplate/PathTemplateTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/google/api/pathtemplate/PathTemplateTest.java b/src/test/java/com/google/api/pathtemplate/PathTemplateTest.java index 5c6a83858..49b64e6d4 100644 --- a/src/test/java/com/google/api/pathtemplate/PathTemplateTest.java +++ b/src/test/java/com/google/api/pathtemplate/PathTemplateTest.java @@ -714,7 +714,7 @@ public void instantiateWithCustomVerbs() { PathTemplate template = PathTemplate.create("/v1/{name=operations/**}:cancel"); String templateInstance = template.instantiate("name", "operations/3373707"); Truth.assertThat(templateInstance).isEqualTo("v1/operations/3373707:cancel"); - Truth.assertThat(template.matches(templateInstance)); + Truth.assertThat(template.matches(templateInstance)).isTrue(); } // Other From 1a1910c1812375c98212d761034ed300a952f604 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 Jan 2022 00:10:16 +0100 Subject: [PATCH 4/5] deps: update dependency com.google.errorprone:error_prone_annotations to v2.11.0 (#331) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.errorprone:error_prone_annotations](https://errorprone.info) ([source](https://togithub.com/google/error-prone)) | `2.10.0` -> `2.11.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_annotations/2.11.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_annotations/2.11.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_annotations/2.11.0/compatibility-slim/2.10.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_annotations/2.11.0/confidence-slim/2.10.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/error-prone ### [`v2.11.0`](https://togithub.com/google/error-prone/releases/v2.11.0) Error Prone now requires JDK 11 or newer ([https://github.com/google/error-prone/issues/2730](https://togithub.com/google/error-prone/issues/2730)). New checks - [`AutoValueBuilderDefaultsInConstructor`](http://errorprone.info/bugpattern/AutoValueBuilderDefaultsInConstructor) - [`FloggerLogString`](http://errorprone.info/bugpattern/FloggerLogString) - [`UnicodeDirectionalityCharacters`](http://errorprone.info/bugpattern/UnicodeDirectionalityCharacters) - [`UnicodeInCode`](http://errorprone.info/bugpattern/UnicodeInCode) - [`AlreadyChecked`](http://errorprone.info/bugpattern/AlreadyChecked) - [`BugPatternNaming`](http://errorprone.info/bugpattern/BugPatternNaming) - [`MissingImplementsComparable`](http://errorprone.info/bugpattern/MissingImplementsComparable) - [`NegativeCharLiteral`](http://errorprone.info/bugpattern/NegativeCharLiteral) - [`PreferredInterfaceType`](http://errorprone.info/bugpattern/PreferredInterfaceType) - [`StronglyTypeByteString`](http://errorprone.info/bugpattern/StronglyTypeByteString) - [`UsingJsr305CheckReturnValue`](http://errorprone.info/bugpattern/UsingJsr305CheckReturnValue) Fixed issues: [#​2641](https://togithub.com/google/error-prone/issues/2641), [#​2705](https://togithub.com/google/error-prone/issues/2705), [#​2776](https://togithub.com/google/error-prone/issues/2776), [#​2798](https://togithub.com/google/error-prone/issues/2798), [#​2799](https://togithub.com/google/error-prone/issues/2799), [#​2819](https://togithub.com/google/error-prone/issues/2819), [#​2820](https://togithub.com/google/error-prone/issues/2820), [#​2831](https://togithub.com/google/error-prone/issues/2831), [#​2833](https://togithub.com/google/error-prone/issues/2833), [#​2834](https://togithub.com/google/error-prone/issues/2834), [#​2835](https://togithub.com/google/error-prone/issues/2835), [#​2861](https://togithub.com/google/error-prone/issues/2861), [#​2873](https://togithub.com/google/error-prone/issues/2873), [#​2889](https://togithub.com/google/error-prone/issues/2889), [#​2892](https://togithub.com/google/error-prone/issues/2892), [#​2901](https://togithub.com/google/error-prone/issues/2901) **Full Changelog**: https://github.com/google/error-prone/compare/v2.10.0...v2.11.0
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/api-common-java). --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 49c8cacbb..aa4d4be73 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ ext { auto_value_annotations: 'com.google.auto.value:auto-value-annotations:1.9', guava: 'com.google.guava:guava:31.0.1-jre', jsr305: 'com.google.code.findbugs:jsr305:3.0.2', - error_prone_annotations: 'com.google.errorprone:error_prone_annotations:2.10.0', + error_prone_annotations: 'com.google.errorprone:error_prone_annotations:2.11.0', // Testing junit: 'junit:junit:4.13.2', From 19f33ababeac1ba0667a3a39ee06c0b67c6647ad Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 12:12:05 -0500 Subject: [PATCH 5/5] chore(main): release 2.1.3 (#332) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ build.gradle | 2 +- versions.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bf2600ed..dd8e11a66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.1.3](https://github.com/googleapis/api-common-java/compare/v2.1.2...v2.1.3) (2022-01-25) + + +### Dependencies + +* update dependency com.google.errorprone:error_prone_annotations to v2.11.0 ([#331](https://github.com/googleapis/api-common-java/issues/331)) ([1a1910c](https://github.com/googleapis/api-common-java/commit/1a1910c1812375c98212d761034ed300a952f604)) + ### [2.1.2](https://www.github.com/googleapis/api-common-java/compare/v2.1.1...v2.1.2) (2022-01-06) diff --git a/build.gradle b/build.gradle index aa4d4be73..2af47fe51 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin' group = "com.google.api" archivesBaseName = "api-common" -project.version = "2.1.3-SNAPSHOT" // {x-version-update:api-common:current} +project.version = "2.1.3" // {x-version-update:api-common:current} sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/versions.txt b/versions.txt index 3969aebea..dfce69814 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -api-common:2.1.2:2.1.3-SNAPSHOT +api-common:2.1.3:2.1.3