From 01e9e5144cfdac766e8e290452767284ace04a63 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Fri, 17 Feb 2023 11:05:39 -0500 Subject: [PATCH 1/7] deps: include grpc and protobuf boms to update versions --- google-cloud-bigtable/pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index d342fa9e43..5a473d7ecf 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -60,6 +60,24 @@ pom import + + + + io.grpc + grpc-bom + ${grpc.version} + pom + import + + + + + com.google.protobuf + protobuf-bom + ${protobuf.version} + pom + import + From 5e96c4bb12165904a136e354b937854ed14e0ede Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Fri, 17 Feb 2023 16:09:15 -0500 Subject: [PATCH 2/7] Revert "deps: include grpc and protobuf boms to update versions" This reverts commit 01e9e5144cfdac766e8e290452767284ace04a63. --- google-cloud-bigtable/pom.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 5a473d7ecf..d342fa9e43 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -60,24 +60,6 @@ pom import - - - - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - - - com.google.protobuf - protobuf-bom - ${protobuf.version} - pom - import - From 4578fee5a9b5a7db2d1200b0e67f9d44f5359ab5 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Fri, 17 Feb 2023 16:09:52 -0500 Subject: [PATCH 3/7] use renovate config instead --- renovate.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/renovate.json b/renovate.json index 2543edb1a8..aa9052e2ed 100644 --- a/renovate.json +++ b/renovate.json @@ -70,6 +70,20 @@ "groupName": "jackson dependencies" } ], + "regexManagers": [ + { + "fileMatch": ["^pom\\.xml$"], + "matchStrings": ["\\\\<\\/grpc\\.version\\>"], + "depNameTemplate": "io.grpc:protoc-gen-grpc-java", + "datasourceTemplate": "maven" + }, + { + "fileMatch": ["^pom\\.xml$"], + "matchStrings": ["\\\\<\\/protobuf\\.version\\>"], + "depNameTemplate": "com.google.protobuf:protoc", + "datasourceTemplate": "maven" + } + ], "semanticCommits": true, "dependencyDashboard": true } From 2066d19f11f175d9448dcc34a3d876e428f8a279 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Fri, 17 Feb 2023 16:10:35 -0500 Subject: [PATCH 4/7] fix regex --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index aa9052e2ed..da3f2e65ef 100644 --- a/renovate.json +++ b/renovate.json @@ -73,13 +73,13 @@ "regexManagers": [ { "fileMatch": ["^pom\\.xml$"], - "matchStrings": ["\\\\<\\/grpc\\.version\\>"], + "matchStrings": ["\\(?.*?)\\<\\/grpc\\.version\\>"], "depNameTemplate": "io.grpc:protoc-gen-grpc-java", "datasourceTemplate": "maven" }, { "fileMatch": ["^pom\\.xml$"], - "matchStrings": ["\\\\<\\/protobuf\\.version\\>"], + "matchStrings": ["\\(?.*?)\\<\\/protobuf\\.version\\>"], "depNameTemplate": "com.google.protobuf:protoc", "datasourceTemplate": "maven" } From aadde91c444c68794eee9270dbb6e3dbb34e8d3f Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Fri, 17 Feb 2023 16:12:06 -0500 Subject: [PATCH 5/7] add renovate to owlbot ignore --- owlbot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/owlbot.py b/owlbot.py index 2daf394127..8b33b41998 100644 --- a/owlbot.py +++ b/owlbot.py @@ -109,4 +109,5 @@ def make_internal_only(sources): 'codecov.yaml' # needed for extraFiles '.github/release-please.yml', + 'renovate.json', ]) From ea51e18fafa61f9544c39f90a1bb5f08bfac63eb Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Wed, 22 Feb 2023 12:02:37 -0500 Subject: [PATCH 6/7] group dependencies together in the same renovate PR --- renovate.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/renovate.json b/renovate.json index da3f2e65ef..7494258c9a 100644 --- a/renovate.json +++ b/renovate.json @@ -68,6 +68,14 @@ "^com.fasterxml.jackson.core" ], "groupName": "jackson dependencies" + }, + { + "packagePatterns": [ + "^com.google.cloud:google-cloud-shared-dependencies", + "^com.google.protobuf:protoc", + "^io.grpc:protoc-gen-grpc-java" + ], + "groupName": "shared dependencies" } ], "regexManagers": [ From f9aef970a2076e3d5440c124621c3e3aa297fc05 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 29 Mar 2023 15:14:26 +0000 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 46e0f520d2..2d8e3e95c7 100644 --- a/README.md +++ b/README.md @@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.8.0') +implementation platform('com.google.cloud:libraries-bom:26.11.0') implementation 'com.google.cloud:google-cloud-bigtable' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigtable:2.19.1' +implementation 'com.google.cloud:google-cloud-bigtable:2.20.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.19.1" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.20.1" ``` ## Authentication