Skip to content

Commit 9c3cff8

Browse files
igorbernstein2igorbernstein2
authored
chore: pull up dependency & clirr disablement to root pom (#4198)
bigtable-hbase lives exclusively in the either hbase or google-cloud-bigtable classpath. Tracking which of the transitive dependencies the code touches is unmaintainable. The dependency analyzer and clirr is already disabled in most modules. This PR just pulls up that policy to the root pom Change-Id: Ic1af573bd6475cc9606e3a48cf5826ebae604e87
1 parent 000208c commit 9c3cff8

File tree

29 files changed

+16
-384
lines changed
  • bigtable-client-core-parent/bigtable-hbase-integration-tests-common
  • bigtable-dataflow-parent
  • bigtable-hbase-1.x-parent
  • bigtable-hbase-2.x-parent
  • bigtable-test
  • hbase-migration-tools
    • bigtable-hbase-replication
      • bigtable-hbase-1.x-replication
      • bigtable-hbase-2.x-replication
      • bigtable-hbase-replication-core
    • mirroring-client
      • bigtable-hbase-mirroring-client-1.x-parent
        • bigtable-hbase-mirroring-client-1.x-hadoop
        • bigtable-hbase-mirroring-client-1.x-integration-tests
        • bigtable-hbase-mirroring-client-1.x-shaded
        • bigtable-hbase-mirroring-client-1.x
      • bigtable-hbase-mirroring-client-2.x-parent
        • bigtable-hbase-mirroring-client-1.x-2.x-integration-tests
        • bigtable-hbase-mirroring-client-2.x-hadoop
        • bigtable-hbase-mirroring-client-2.x-integration-tests
        • bigtable-hbase-mirroring-client-2.x-shaded
        • bigtable-hbase-mirroring-client-2.x
      • bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded
      • pom.xml
  • pom.xml

29 files changed

+16
-384
lines changed

‎bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,6 @@ limitations under the License.
194194
<skip>true</skip>
195195
</configuration>
196196
</plugin>
197-
<plugin>
198-
<groupId>org.codehaus.mojo</groupId>
199-
<artifactId>clirr-maven-plugin</artifactId>
200-
<configuration>
201-
<skip>true</skip>
202-
</configuration>
203-
</plugin>
204197
<!-- End Skip publishing -->
205198
</plugins>
206199
</pluginManagement>

‎bigtable-dataflow-parent/bigtable-beam-import/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -498,23 +498,6 @@ limitations under the License.
498498
</execution>
499499
</executions>
500500
</plugin>
501-
<plugin>
502-
<groupId>org.apache.maven.plugins</groupId>
503-
<artifactId>maven-dependency-plugin</artifactId>
504-
<configuration>
505-
<ignoredUnusedDeclaredDependencies>
506-
<ignoredUnusedDeclaredDependency>com.google.cloud.bigdataoss:gcs-connector:*:*</ignoredUnusedDeclaredDependency>
507-
<!-- seems to be a bug in the dependency analyzer, removing this dep reports the reverse problem
508-
See: https://issues.apache.org/jira/browse/MDEP-679 -->
509-
<ignoredUnusedDeclaredDependency> commons-logging:commons-logging:*:*</ignoredUnusedDeclaredDependency>
510-
</ignoredUnusedDeclaredDependencies>
511-
<ignoredUsedUndeclaredDependencies>
512-
<!-- seems to be a bug in the dependency analyzer, adding this dep reports the reverse problem
513-
See: https://issues.apache.org/jira/browse/MDEP-679 -->
514-
<ignoredUsedUndeclaredDependency>org.springframework:spring-jcl:*:*</ignoredUsedUndeclaredDependency>
515-
</ignoredUsedUndeclaredDependencies>
516-
</configuration>
517-
</plugin>
518501
</plugins>
519502
</build>
520503

‎bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -341,16 +341,6 @@ limitations under the License.
341341
</execution>
342342
</executions>
343343
</plugin>
344-
<plugin>
345-
<groupId>org.apache.maven.plugins</groupId>
346-
<artifactId>maven-dependency-plugin</artifactId>
347-
<configuration>
348-
<ignoredNonTestScopedDependencies>
349-
<!-- required per verify-mirror-deps-->
350-
<ignoredNonTestScopedDependency>com.google.code.findbugs:jsr305:*</ignoredNonTestScopedDependency>
351-
</ignoredNonTestScopedDependencies>
352-
</configuration>
353-
</plugin>
354344
</plugins>
355345
</build>
356346
</project>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -285,25 +285,6 @@ limitations under the License.
285285
</execution>
286286
</executions>
287287
</plugin>
288-
289-
<!-- skip for shaded jar-->
290-
<plugin>
291-
<groupId>org.apache.maven.plugins</groupId>
292-
<artifactId>maven-dependency-plugin</artifactId>
293-
<configuration>
294-
<ignoredDependencies>
295-
<dependency>*</dependency>
296-
</ignoredDependencies>
297-
</configuration>
298-
</plugin>
299-
<!-- skip for shaded jar-->
300-
<plugin>
301-
<groupId>org.codehaus.mojo</groupId>
302-
<artifactId>clirr-maven-plugin</artifactId>
303-
<configuration>
304-
<skip>true</skip>
305-
</configuration>
306-
</plugin>
307288
</plugins>
308289
</build>
309290
</project>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,6 @@ limitations under the License.
411411
<skip>true</skip>
412412
</configuration>
413413
</plugin>
414-
<plugin>
415-
<groupId>org.codehaus.mojo</groupId>
416-
<artifactId>clirr-maven-plugin</artifactId>
417-
<configuration>
418-
<skip>true</skip>
419-
</configuration>
420-
</plugin>
421414
<!-- End Skip publishing -->
422415
</plugins>
423416
</pluginManagement>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,21 +132,6 @@ limitations under the License.
132132

133133
<build>
134134
<plugins>
135-
<!-- This is basically a replacement for the mapreduce jobs in hbase-server,
136-
but with the implementation replaced by bigtable-hbase-1.x-hadoop. This means
137-
that all of our dependencies are dictated by hbase-server. hbase-server
138-
has a fairly complex dependency tree with a lot of exclusions. Trying to
139-
replicate it here to declare exact deps our job uses creates an undue burden.-->
140-
<plugin>
141-
<groupId>org.apache.maven.plugins</groupId>
142-
<artifactId>maven-dependency-plugin</artifactId>
143-
<configuration>
144-
<ignoredDependencies>
145-
<dependency>*</dependency>
146-
</ignoredDependencies>
147-
</configuration>
148-
</plugin>
149-
150135
<plugin>
151136
<!-- skip UpperBound enforcement for hadoop jars -->
152137
<groupId>org.apache.maven.plugins</groupId>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -474,25 +474,6 @@ limitations under the License.
474474
</execution>
475475
</executions>
476476
</plugin>
477-
478-
<!-- skip for shaded jar-->
479-
<plugin>
480-
<groupId>org.apache.maven.plugins</groupId>
481-
<artifactId>maven-dependency-plugin</artifactId>
482-
<configuration>
483-
<ignoredDependencies>
484-
<dependency>*</dependency>
485-
</ignoredDependencies>
486-
</configuration>
487-
</plugin>
488-
<!-- skip for shaded jar-->
489-
<plugin>
490-
<groupId>org.codehaus.mojo</groupId>
491-
<artifactId>clirr-maven-plugin</artifactId>
492-
<configuration>
493-
<skip>true</skip>
494-
</configuration>
495-
</plugin>
496477
</plugins>
497478
</build>
498479
</project>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x/pom.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -210,26 +210,4 @@ limitations under the License.
210210
</dependency>
211211
</dependencies>
212212

213-
<build>
214-
<plugins>
215-
<plugin>
216-
<groupId>org.apache.maven.plugins</groupId>
217-
<artifactId>maven-dependency-plugin</artifactId>
218-
<version>3.5.0</version>
219-
<configuration>
220-
<ignoredNonTestScopedDependencies>
221-
<!-- Temporarily disable dependency plugin until we figure out why it thinks compile deps like google-cloud-bigtable are unused
222-
For example:
223-
[WARNING] Non-test scoped test only dependencies found:
224-
[WARNING] com.google.cloud:google-cloud-bigtable:jar:2.16.0:compile
225-
...
226-
227-
Same problem exists in bigtable-hbase-2.x
228-
-->
229-
<ignoredNonTestScopedDependency>*</ignoredNonTestScopedDependency>
230-
</ignoredNonTestScopedDependencies>
231-
</configuration>
232-
</plugin>
233-
</plugins>
234-
</build>
235213
</project>

‎bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -284,25 +284,6 @@ limitations under the License.
284284
</execution>
285285
</executions>
286286
</plugin>
287-
288-
<!-- skip for shaded jar-->
289-
<plugin>
290-
<groupId>org.apache.maven.plugins</groupId>
291-
<artifactId>maven-dependency-plugin</artifactId>
292-
<configuration>
293-
<ignoredDependencies>
294-
<dependency>*</dependency>
295-
</ignoredDependencies>
296-
</configuration>
297-
</plugin>
298-
<!-- skip for shaded jar-->
299-
<plugin>
300-
<groupId>org.codehaus.mojo</groupId>
301-
<artifactId>clirr-maven-plugin</artifactId>
302-
<configuration>
303-
<skip>true</skip>
304-
</configuration>
305-
</plugin>
306287
</plugins>
307288
</build>
308289
</project>

‎bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,13 +378,6 @@ limitations under the License.
378378
<skip>true</skip>
379379
</configuration>
380380
</plugin>
381-
<plugin>
382-
<groupId>org.codehaus.mojo</groupId>
383-
<artifactId>clirr-maven-plugin</artifactId>
384-
<configuration>
385-
<skip>true</skip>
386-
</configuration>
387-
</plugin>
388381
<!-- End Skip publishing -->
389382
</plugins>
390383
</pluginManagement>

0 commit comments

Comments
 (0)