From 3965b13ea832cefe4aa58f4f2ecfd0423686c0f9 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 8 Oct 2021 14:48:05 -0700 Subject: [PATCH 1/5] feat: next release from main branch is 2.1.0 (#308) --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index f35b7ebdb..701b57ed2 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -10,3 +10,7 @@ branches: handleGHRelease: true releaseType: java-yoshi branch: java7 + - releaseType: java-backport + bumpMinorPreMajor: true + handleGHRelease: true + branch: 2.0.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index e6f6bb9c8..bf50572e9 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -29,6 +29,15 @@ branchProtectionRules: requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true requiresStrictStatusChecks: true + - pattern: 2.0.x + isAdminEnforced: true + requiredStatusCheckContexts: + - units + - format + - cla/google + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: true permissionRules: - team: Googlers permission: pull From 36467871be15a2ebd63477a293d6d33c68a6c9b0 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Thu, 14 Oct 2021 08:35:49 -0700 Subject: [PATCH 2/5] chore: update doclet version (#312) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3361a3dec..a197a0b88 100644 --- a/build.gradle +++ b/build.gradle @@ -354,7 +354,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.2.1.jar")] + options.docletpath = [file(System.getenv('KOKORO_GFILE_DIR') + "/java-docfx-doclet-1.3.0.jar")] } clean { From c82fe8aaaf8566381e7f7c5d4c8d362736c088fc Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Thu, 14 Oct 2021 15:36:43 -0400 Subject: [PATCH 3/5] chore: remove deprecated `maven` plugin (#313) * Update ci.yaml * Remove deprecated `maven` plugin --- .github/workflows/ci.yaml | 4 ++-- build.gradle | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f14a3e444..89788f258 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,7 @@ jobs: - name: Gradle Test run: ./gradlew test - name: Gradle Build - run: ./gradlew build install + run: ./gradlew build publishToMavenLocal format: runs-on: ubuntu-latest steps: @@ -31,4 +31,4 @@ jobs: with: java-version: 8 - name: Java Linter - run: ./gradlew googleJavaFormat \ No newline at end of file + run: ./gradlew googleJavaFormat diff --git a/build.gradle b/build.gradle index a197a0b88..8cd039a43 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,6 @@ apply plugin: 'idea' apply plugin: 'jacoco' apply plugin: 'signing' apply plugin: 'maven-publish' -apply plugin: 'maven' apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'io.github.gradle-nexus.publish-plugin' From 0b59836b359f651baa12f3c9c9fa01ec9b7bf4a9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 20 Oct 2021 15:12:48 -0400 Subject: [PATCH 4/5] chore: release 2.0.6-SNAPSHOT (#311) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Neenu Shaji --- build.gradle | 2 +- versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8cd039a43..53ef45239 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.0.5" // {x-version-update:api-common:current} +project.version = "2.0.6-SNAPSHOT" // {x-version-update:api-common:current} sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/versions.txt b/versions.txt index fbd3c8618..dd4972cec 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -api-common:2.0.5:2.0.5 +api-common:2.0.5:2.0.6-SNAPSHOT From 222396beba176b4c6e2c288fbbfda2692e4e265a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:08:26 -0700 Subject: [PATCH 5/5] chore: release 2.1.0 (#314) 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 3240b5bbc..f53bb2ac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.1.0](https://www.github.com/googleapis/api-common-java/compare/v2.0.5...v2.1.0) (2021-10-20) + + +### Features + +* next release from main branch is 2.1.0 ([#308](https://www.github.com/googleapis/api-common-java/issues/308)) ([3965b13](https://www.github.com/googleapis/api-common-java/commit/3965b13ea832cefe4aa58f4f2ecfd0423686c0f9)) + ### [2.0.5](https://www.github.com/googleapis/api-common-java/compare/v2.0.4...v2.0.5) (2021-10-08) diff --git a/build.gradle b/build.gradle index 53ef45239..04f955686 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.0.6-SNAPSHOT" // {x-version-update:api-common:current} +project.version = "2.1.0" // {x-version-update:api-common:current} sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/versions.txt b/versions.txt index dd4972cec..a338d9794 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -api-common:2.0.5:2.0.6-SNAPSHOT +api-common:2.1.0:2.1.0