File tree Expand file tree Collapse file tree 2 files changed +7
-29
lines changed Expand file tree Collapse file tree 2 files changed +7
-29
lines changed Original file line number Diff line number Diff line change 37
37
Also, this property will be augmented by `internal-bigtable-prod-batch-it-prop-helper` profile -->
38
38
<bigtable .cfe-data-batch-endpoint>batch-bigtable.googleapis.com:443</bigtable .cfe-data-batch-endpoint>
39
39
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>
45
43
</properties >
46
44
47
45
<dependencyManagement >
621
619
</executions >
622
620
<configuration >
623
621
<protocArtifact >
624
- com.google.protobuf:protoc:${protoc.version} :exe:${os.detected.classifier}
622
+ com.google.protobuf:protoc:${test- protoc.version} :exe:${os.detected.classifier}
625
623
</protocArtifact >
626
624
<pluginId >grpc-java</pluginId >
627
625
<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}
629
627
</pluginArtifact >
630
628
</configuration >
631
629
</plugin >
677
675
<goal >enforce</goal >
678
676
</goals >
679
677
</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 >
700
678
</executions >
701
679
<!--
702
680
workaround for https://github.com/mojohaus/extra-enforcer-rules/issues/132
Original file line number Diff line number Diff line change 81
81
"regexManagers" : [
82
82
{
83
83
"fileMatch" : [" ^.*\/ pom\\ .xml$" ],
84
- "matchStrings" : [" \\ <grpc\\ .version>(?<currentValue>.*?)\\ <\\ /grpc\\ .version\\ >" ],
84
+ "matchStrings" : [" \\ <test \\ -protoc \\ - grpc\\ .version>(?<currentValue>.*?)\\ <\\ /test \\ -protoc \\ - grpc\\ .version\\ >" ],
85
85
"depNameTemplate" : " io.grpc:protoc-gen-grpc-java" ,
86
86
"datasourceTemplate" : " maven"
87
87
},
88
88
{
89
89
"fileMatch" : [" ^.*\/ pom\\ .xml$" ],
90
- "matchStrings" : [" \\ <protobuf \\ .version>(?<currentValue>.*?)\\ <\\ /protobuf \\ .version\\ >" ],
90
+ "matchStrings" : [" \\ <test \\ -protoc \\ .version>(?<currentValue>.*?)\\ <\\ /test \\ -protoc \\ .version\\ >" ],
91
91
"depNameTemplate" : " com.google.protobuf:protoc" ,
92
92
"datasourceTemplate" : " maven"
93
93
}
You can’t perform that action at this time.
0 commit comments