chore: remove enforce-declared-grpc-and-proto-version enforcer check (#…

…1706)
googleapis · Apr 12, 2023 · 6412d73 · 6412d73
1 parent d60c946
commit 6412d73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 29 deletions.
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
@@ -37,11 +37,9 @@
      Also, this property will be augmented by `internal-bigtable-prod-batch-it-prop-helper` profile -->
     <bigtable.cfe-data-batch-endpoint>batch-bigtable.googleapis.com:443</bigtable.cfe-data-batch-endpoint>
 
-    <!-- These are needed to compile the protobuf used by Changestream merging acceptance test. We have enforcer rule
-     below to make sure that the versions here match the ones we pull in via the shared bom. -->
-    <grpc.version>1.54.0</grpc.version>
-    <protobuf.version>3.21.12</protobuf.version>
-    <protoc.version>${protobuf.version}</protoc.version>
+    <!-- These are needed to compile the protobuf used by Changestream merging acceptance test. -->
+    <test-protoc-grpc.version>1.54.0</test-protoc-grpc.version>
+    <test-protoc.version>3.21.12</test-protoc.version>
   </properties>
 
   <dependencyManagement>
@@ -621,11 +619,11 @@
         </executions>
         <configuration>
           <protocArtifact>
-            com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}
+            com.google.protobuf:protoc:${test-protoc.version}:exe:${os.detected.classifier}
           </protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>
-            io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
+            io.grpc:protoc-gen-grpc-java:${test-protoc-grpc.version}:exe:${os.detected.classifier}
           </pluginArtifact>
         </configuration>
       </plugin>
@@ -677,26 +675,6 @@
               <goal>enforce</goal>
             </goals>
           </execution>
-          <execution>
-            <id>enforce-declared-grpc-and-proto-version</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <bannedDependencies>
-                  <includes>
-                    <dependency>io.grpc:*:[${grpc.version}]</dependency>
-                    <dependency>com.google.protobuf:*:[${protobuf.version}]</dependency>
-                  </includes>
-                  <excludes>
-                    <dependency>io.grpc:*</dependency>
-                    <dependency>com.google.protobuf:*</dependency>
-                  </excludes>
-                </bannedDependencies>
-              </rules>
-            </configuration>
-          </execution>
         </executions>
         <!--
           workaround for https://github.com/mojohaus/extra-enforcer-rules/issues/132

diff --git a/renovate.json b/renovate.json
@@ -81,13 +81,13 @@
   "regexManagers": [
     {
       "fileMatch": ["^.*\/pom\\.xml$"],
-      "matchStrings": ["\\<grpc\\.version>(?<currentValue>.*?)\\<\\/grpc\\.version\\>"],
+      "matchStrings": ["\\<test\\-protoc\\-grpc\\.version>(?<currentValue>.*?)\\<\\/test\\-protoc\\-grpc\\.version\\>"],
       "depNameTemplate": "io.grpc:protoc-gen-grpc-java",
       "datasourceTemplate": "maven"
     },
     {
       "fileMatch": ["^.*\/pom\\.xml$"],
-      "matchStrings": ["\\<protobuf\\.version>(?<currentValue>.*?)\\<\\/protobuf\\.version\\>"],
+      "matchStrings": ["\\<test\\-protoc\\.version>(?<currentValue>.*?)\\<\\/test\\-protoc\\.version\\>"],
       "depNameTemplate": "com.google.protobuf:protoc",
       "datasourceTemplate": "maven"
     }