Skip to content

Commit 6412d73

Browse files
authored
chore: remove enforce-declared-grpc-and-proto-version enforcer check (#1706)
1 parent d60c946 commit 6412d73

File tree

2 files changed

+7
-29
lines changed

2 files changed

+7
-29
lines changed

google-cloud-bigtable/pom.xml

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@
3737
Also, this property will be augmented by `internal-bigtable-prod-batch-it-prop-helper` profile -->
3838
<bigtable.cfe-data-batch-endpoint>batch-bigtable.googleapis.com:443</bigtable.cfe-data-batch-endpoint>
3939

40-
<!-- These are needed to compile the protobuf used by Changestream merging acceptance test. We have enforcer rule
41-
below to make sure that the versions here match the ones we pull in via the shared bom. -->
42-
<grpc.version>1.54.0</grpc.version>
43-
<protobuf.version>3.21.12</protobuf.version>
44-
<protoc.version>${protobuf.version}</protoc.version>
40+
<!-- These are needed to compile the protobuf used by Changestream merging acceptance test. -->
41+
<test-protoc-grpc.version>1.54.0</test-protoc-grpc.version>
42+
<test-protoc.version>3.21.12</test-protoc.version>
4543
</properties>
4644

4745
<dependencyManagement>
@@ -621,11 +619,11 @@
621619
</executions>
622620
<configuration>
623621
<protocArtifact>
624-
com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}
622+
com.google.protobuf:protoc:${test-protoc.version}:exe:${os.detected.classifier}
625623
</protocArtifact>
626624
<pluginId>grpc-java</pluginId>
627625
<pluginArtifact>
628-
io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
626+
io.grpc:protoc-gen-grpc-java:${test-protoc-grpc.version}:exe:${os.detected.classifier}
629627
</pluginArtifact>
630628
</configuration>
631629
</plugin>
@@ -677,26 +675,6 @@
677675
<goal>enforce</goal>
678676
</goals>
679677
</execution>
680-
<execution>
681-
<id>enforce-declared-grpc-and-proto-version</id>
682-
<goals>
683-
<goal>enforce</goal>
684-
</goals>
685-
<configuration>
686-
<rules>
687-
<bannedDependencies>
688-
<includes>
689-
<dependency>io.grpc:*:[${grpc.version}]</dependency>
690-
<dependency>com.google.protobuf:*:[${protobuf.version}]</dependency>
691-
</includes>
692-
<excludes>
693-
<dependency>io.grpc:*</dependency>
694-
<dependency>com.google.protobuf:*</dependency>
695-
</excludes>
696-
</bannedDependencies>
697-
</rules>
698-
</configuration>
699-
</execution>
700678
</executions>
701679
<!--
702680
workaround for https://github.com/mojohaus/extra-enforcer-rules/issues/132

renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@
8181
"regexManagers": [
8282
{
8383
"fileMatch": ["^.*\/pom\\.xml$"],
84-
"matchStrings": ["\\<grpc\\.version>(?<currentValue>.*?)\\<\\/grpc\\.version\\>"],
84+
"matchStrings": ["\\<test\\-protoc\\-grpc\\.version>(?<currentValue>.*?)\\<\\/test\\-protoc\\-grpc\\.version\\>"],
8585
"depNameTemplate": "io.grpc:protoc-gen-grpc-java",
8686
"datasourceTemplate": "maven"
8787
},
8888
{
8989
"fileMatch": ["^.*\/pom\\.xml$"],
90-
"matchStrings": ["\\<protobuf\\.version>(?<currentValue>.*?)\\<\\/protobuf\\.version\\>"],
90+
"matchStrings": ["\\<test\\-protoc\\.version>(?<currentValue>.*?)\\<\\/test\\-protoc\\.version\\>"],
9191
"depNameTemplate": "com.google.protobuf:protoc",
9292
"datasourceTemplate": "maven"
9393
}

0 commit comments

Comments
 (0)