Skip to content

Commit 392fc69

Browse files
authored
deps: upgrade maven-enforcer-plugin to 3.3.0, remove duplicate entry in pom (#1702)
1 parent 1fd13ba commit 392fc69

File tree

1 file changed

+21
-28
lines changed

1 file changed

+21
-28
lines changed

google-cloud-bigtable/pom.xml

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -607,33 +607,6 @@
607607
</extension>
608608
</extensions>
609609
<plugins>
610-
<plugin>
611-
<groupId>org.apache.maven.plugins</groupId>
612-
<artifactId>maven-enforcer-plugin</artifactId>
613-
<version>3.1.0</version>
614-
<executions>
615-
<execution>
616-
<id>enforce-declared-grpc-and-proto-version</id>
617-
<goals>
618-
<goal>enforce</goal>
619-
</goals>
620-
<configuration>
621-
<rules>
622-
<bannedDependencies>
623-
<includes>
624-
<dependency>io.grpc:*:[${grpc.version}]</dependency>
625-
<dependency>com.google.protobuf:*:[${protobuf.version}]</dependency>
626-
</includes>
627-
<excludes>
628-
<dependency>io.grpc:*</dependency>
629-
<dependency>com.google.protobuf:*</dependency>
630-
</excludes>
631-
</bannedDependencies>
632-
</rules>
633-
</configuration>
634-
</execution>
635-
</executions>
636-
</plugin>
637610
<plugin>
638611
<groupId>org.xolstice.maven.plugins</groupId>
639612
<artifactId>protobuf-maven-plugin</artifactId>
@@ -678,7 +651,7 @@
678651
<plugin>
679652
<groupId>org.apache.maven.plugins</groupId>
680653
<artifactId>maven-enforcer-plugin</artifactId>
681-
<version>3.2.1</version>
654+
<version>3.3.0</version>
682655
<executions>
683656
<!-- Prevent users from mistyping a profile name -->
684657
<execution>
@@ -704,6 +677,26 @@
704677
<goal>enforce</goal>
705678
</goals>
706679
</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>
707700
</executions>
708701
<!--
709702
workaround for https://github.com/mojohaus/extra-enforcer-rules/issues/132

0 commit comments

Comments
 (0)