From aac14eb00691e75e425df50bf6f6ab98811818f4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 12 Aug 2020 13:32:00 -0700 Subject: [PATCH 1/8] chore: release 1.10.1-SNAPSHOT (#168) * chore: updated versions.txt [ci skip] * chore: updated build.gradle 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 277dc137a..779b734e1 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'io.codearte.nexus-staging' group = "com.google.api" archivesBaseName = "api-common" -project.version = "1.10.0" // {x-version-update:api-common:current} +project.version = "1.10.1-SNAPSHOT" // {x-version-update:api-common:current} sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/versions.txt b/versions.txt index ee77bfa7f..ccdf44e52 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -api-common:1.10.0:1.10.0 \ No newline at end of file +api-common:1.10.0:1.10.1-SNAPSHOT \ No newline at end of file From ab98dc9b245180f000433d0634a293b850f89830 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 16 Sep 2020 16:23:33 -0700 Subject: [PATCH 2/8] chore: add CODEOWNERS and repo settings (#177) --- .github/CODEOWNERS | 7 +++++++ .github/sync-repo-settings.yaml | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 .github/CODEOWNERS create mode 100644 .github/sync-repo-settings.yaml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..aec8a7e9a --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,7 @@ +# Code owners file. +# This file controls who is tagged for review for any given pull request. +# +# For syntax help see: +# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax + +* @googleapis/yoshi-java diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml new file mode 100644 index 000000000..a48126be3 --- /dev/null +++ b/.github/sync-repo-settings.yaml @@ -0,0 +1,23 @@ +rebaseMergeAllowed: true +squashMergeAllowed: true +mergeCommitAllowed: false +branchProtectionRules: +- pattern: master + isAdminEnforced: true + requiredStatusCheckContexts: + - 'continuous-integration/travis-ci' + - 'codecov/patch' + - 'codecov/project' + - 'cla/google' + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: true +permissionRules: + - team: Googlers + permission: pull + - team: yoshi-java + permission: push + - team: yoshi-java-admins + permission: admin + - team: yoshi-admins + permission: admin From a26e19fce1b1ac6a63cb59d3331e33c41d1225c2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 12 Oct 2020 20:08:25 +0200 Subject: [PATCH 3/8] chore(deps): update dependency junit:junit to v4.13.1 (#179) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 779b734e1..ca312dca3 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ ext { error_prone_annotations: 'com.google.errorprone:error_prone_annotations:2.3.4', // Testing - junit: 'junit:junit:4.13', + junit: 'junit:junit:4.13.1', truth: 'com.google.truth:truth:1.0.1', ] } From e6f8fef536858c05a2b83404e8b9c774c6506894 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 16 Oct 2020 18:27:04 +0200 Subject: [PATCH 4/8] deps: update dependency com.google.auto.value:auto-value to v1.7.4 (#170) Co-authored-by: Elliotte Rusty Harold Co-authored-by: Jeff Ching --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ca312dca3..aa1bec314 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ ext { libraries = [ javax_annotations: 'javax.annotation:javax.annotation-api:1.3.2', auto_value_annotations: 'com.google.auto.value:auto-value-annotations:1.7.2', - auto_value: 'com.google.auto.value:auto-value:1.7.2', + auto_value: 'com.google.auto.value:auto-value:1.7.4', guava: 'com.google.guava:guava:29.0-android', jsr305: 'com.google.code.findbugs:jsr305:3.0.2', error_prone_annotations: 'com.google.errorprone:error_prone_annotations:2.3.4', From 668d62aac4df147197e011772e916e9e3f35bd40 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 16 Oct 2020 09:50:05 -0700 Subject: [PATCH 5/8] build: make this repo match gax-java's release configuration (#162) This should allow the closeAndReleaseRepository to work for autorelease. --- .kokoro/release/stage.sh | 2 +- build.gradle | 74 ++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 26 deletions(-) diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index f927ce143..c7ba60c16 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -30,7 +30,7 @@ setup_environment_secrets mkdir -p ${HOME}/.gradle create_gradle_properties_file "${HOME}/.gradle/gradle.properties" -./gradlew assemble uploadArchives +./gradlew assemble publish if [[ -n "${AUTORELEASE_PR}" ]] then diff --git a/build.gradle b/build.gradle index aa1bec314..7a0573d77 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,7 @@ apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'jacoco' apply plugin: 'signing' +apply plugin: 'maven-publish' apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'io.codearte.nexus-staging' @@ -198,51 +199,74 @@ signing { } if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) { - uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + nexusStaging { + username = ossrhUsername + password = ossrhPassword + packageGroup = "com.google.api" + } +} - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } +afterEvaluate { + publishing { + publications { + mavenJava(MavenPublication) { + version = project.version - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } + from components.java + + artifact javadocJar + artifact sourcesJar - pom.project { - name 'API Common' - packaging 'jar' - artifactId 'api-common' - description 'Common utilities for Google APIs in Java' - url 'https://github.com/googleapis/api-common-java' + pom { + name = 'API Common' + packaging = 'jar' + artifactId = 'api-common' + description = 'Common utilities for Google APIs in Java' + url = 'https://github.com/googleapis/api-common-java' scm { - url 'https://github.com/googleapis/api-common-java' - connection 'scm:git:https://github.com/googleapis/api-common-java.git' + url = 'https://github.com/googleapis/api-common-java' + connection = 'scm:git:https://github.com/googleapis/api-common-java.git' } licenses { license { - name 'BSD' - url 'https://github.com/googleapis/api-common-java/blob/master/LICENSE' + name = 'BSD' + url = 'https://github.com/googleapis/api-common-java/blob/master/LICENSE' } } developers { developer { - id 'GoogleAPIs' - name 'GoogleAPIs' - email 'googleapis@googlegroups.com' - url 'https://github.com/googleapis' + id = 'GoogleAPIs' + name = 'GoogleAPIs' + email = 'googleapis@googlegroups.com' + url = 'https://github.com/googleapis' organization = 'Google, Inc.' - organizationUrl 'https://www.google.com' + organizationUrl = 'https://www.google.com' } } } } } + repositories { + maven { + url 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' + credentials { + username = project.hasProperty('ossrhUsername') ? project.getProperty('ossrhUsername') : null + password = project.hasProperty('ossrhPassword') ? project.getProperty('ossrhPassword') : null + } + } + } + } + + signing { + if (!project.hasProperty('skip.signing')) { + if (project.hasProperty('signing.gnupg.executable')) { + useGpgCmd() + } + sign publishing.publications.mavenJava + } } } From 00a12b94c44463b8f37b13cedc3a9241ec031f34 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 16 Oct 2020 20:39:19 +0200 Subject: [PATCH 6/8] deps: update dependency com.google.auto.value:auto-value-annotations to v1.7.4 (#171) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7a0573d77..a858570b3 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ ext { // Shortcuts for libraries we are using libraries = [ javax_annotations: 'javax.annotation:javax.annotation-api:1.3.2', - auto_value_annotations: 'com.google.auto.value:auto-value-annotations:1.7.2', + auto_value_annotations: 'com.google.auto.value:auto-value-annotations:1.7.4', auto_value: 'com.google.auto.value:auto-value:1.7.4', guava: 'com.google.guava:guava:29.0-android', jsr305: 'com.google.code.findbugs:jsr305:3.0.2', From 89b2a48ac22043d85c222979599522ca9397849f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 16 Oct 2020 20:43:39 +0200 Subject: [PATCH 7/8] deps: update dependency com.google.errorprone:error_prone_annotations to v2.4.0 (#172) Co-authored-by: Elliotte Rusty Harold Co-authored-by: Jeff Ching --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a858570b3..65d038e70 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ ext { auto_value: 'com.google.auto.value:auto-value:1.7.4', guava: 'com.google.guava:guava:29.0-android', jsr305: 'com.google.code.findbugs:jsr305:3.0.2', - error_prone_annotations: 'com.google.errorprone:error_prone_annotations:2.3.4', + error_prone_annotations: 'com.google.errorprone:error_prone_annotations:2.4.0', // Testing junit: 'junit:junit:4.13.1', From fabfc88fc8547becadb35f9e9c4fb48ad93822f6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 16 Oct 2020 18:48:06 +0000 Subject: [PATCH 8/8] chore: release 1.10.1 (#180) :robot: I have created a release \*beep\* \*boop\* --- ### [1.10.1](https://www.github.com/googleapis/api-common-java/compare/v1.10.0...v1.10.1) (2020-10-16) ### Dependencies * update dependency com.google.auto.value:auto-value to v1.7.4 ([#170](https://www.github.com/googleapis/api-common-java/issues/170)) ([e6f8fef](https://www.github.com/googleapis/api-common-java/commit/e6f8fef536858c05a2b83404e8b9c774c6506894)) * update dependency com.google.auto.value:auto-value-annotations to v1.7.4 ([#171](https://www.github.com/googleapis/api-common-java/issues/171)) ([00a12b9](https://www.github.com/googleapis/api-common-java/commit/00a12b94c44463b8f37b13cedc3a9241ec031f34)) * update dependency com.google.errorprone:error_prone_annotations to v2.4.0 ([#172](https://www.github.com/googleapis/api-common-java/issues/172)) ([89b2a48](https://www.github.com/googleapis/api-common-java/commit/89b2a48ac22043d85c222979599522ca9397849f)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- CHANGELOG.md | 9 +++++++++ build.gradle | 2 +- versions.txt | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9b589af4..8f7a8264a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [1.10.1](https://www.github.com/googleapis/api-common-java/compare/v1.10.0...v1.10.1) (2020-10-16) + + +### Dependencies + +* update dependency com.google.auto.value:auto-value to v1.7.4 ([#170](https://www.github.com/googleapis/api-common-java/issues/170)) ([e6f8fef](https://www.github.com/googleapis/api-common-java/commit/e6f8fef536858c05a2b83404e8b9c774c6506894)) +* update dependency com.google.auto.value:auto-value-annotations to v1.7.4 ([#171](https://www.github.com/googleapis/api-common-java/issues/171)) ([00a12b9](https://www.github.com/googleapis/api-common-java/commit/00a12b94c44463b8f37b13cedc3a9241ec031f34)) +* update dependency com.google.errorprone:error_prone_annotations to v2.4.0 ([#172](https://www.github.com/googleapis/api-common-java/issues/172)) ([89b2a48](https://www.github.com/googleapis/api-common-java/commit/89b2a48ac22043d85c222979599522ca9397849f)) + ## [1.10.0](https://www.github.com/googleapis/api-common-java/compare/v1.9.3...v1.10.0) (2020-07-17) diff --git a/build.gradle b/build.gradle index 65d038e70..917607491 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ apply plugin: 'io.codearte.nexus-staging' group = "com.google.api" archivesBaseName = "api-common" -project.version = "1.10.1-SNAPSHOT" // {x-version-update:api-common:current} +project.version = "1.10.1" // {x-version-update:api-common:current} sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/versions.txt b/versions.txt index ccdf44e52..d70a8693c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -api-common:1.10.0:1.10.1-SNAPSHOT \ No newline at end of file +api-common:1.10.1:1.10.1 \ No newline at end of file