Skip to content

Commit 5f98419

Browse files
igorbernstein2igorbernstein2
authored
deps: clean up deps for mirroring-client (#4232)
Change-Id: I0e1a8f1f82d178e33d5e0be003fbb5938cb0496d
1 parent 0a7d88a commit 5f98419

File tree

9 files changed

+145
-139
lines changed
  • hbase-migration-tools/mirroring-client
    • bigtable-hbase-mirroring-client-1.x-parent
      • bigtable-hbase-mirroring-client-1.x
      • 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-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-core-parent/bigtable-hbase-mirroring-client-core

9 files changed

+145
-139
lines changed

‎hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,6 @@ limitations under the License.
7979
</exclusion>
8080
</exclusions>
8181
</dependency>
82-
83-
<!-- Manually promote dependencies: This is necessary to avoid flattening hbase-shaded-client's dependency tree -->
84-
<dependency>
85-
<groupId>commons-logging</groupId>
86-
<artifactId>commons-logging</artifactId>
87-
<version>${commons-logging.version}</version>
88-
</dependency>
89-
90-
<!-- for compatibility with bigtable-hbase-client-1.x-hadoop -->
91-
<dependency>
92-
<groupId>org.slf4j</groupId>
93-
<artifactId>slf4j-api</artifactId>
94-
<version>${hbase1-hadoop-slf4j.version}</version>
95-
</dependency>
96-
9782
<dependency>
9883
<groupId>ch.qos.reload4j</groupId>
9984
<artifactId>reload4j</artifactId>
@@ -103,33 +88,38 @@ limitations under the License.
10388
</dependencies>
10489

10590
<build>
91+
<pluginManagement>
92+
<plugins>
93+
<!-- disable google-cloud-shared-config enforcement checks because
94+
hbase-client's dependency subtree doesn't follow the same rules and is
95+
unable to be fixed here -->
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-enforcer-plugin</artifactId>
99+
<executions>
100+
<execution>
101+
<id>enforce</id>
102+
<configuration>
103+
<skip>true</skip>
104+
</configuration>
105+
</execution>
106+
<!-- This must be a drop in replacement for hbase-client, so can't
107+
manage hbase's deps -->
108+
<execution>
109+
<id>enforce-banned-deps</id>
110+
<goals>
111+
<goal>enforce</goal>
112+
</goals>
113+
<configuration>
114+
<skip>true</skip>
115+
</configuration>
116+
</execution>
117+
</executions>
118+
</plugin>
119+
</plugins>
120+
</pluginManagement>
121+
106122
<plugins>
107-
<!-- disable google-cloud-shared-config enforcement checks because
108-
hbase-client's dependency subtree doesn't follow the same rules and is
109-
unable to be fixed here -->
110-
<plugin>
111-
<groupId>org.apache.maven.plugins</groupId>
112-
<artifactId>maven-enforcer-plugin</artifactId>
113-
<executions>
114-
<execution>
115-
<id>enforce</id>
116-
<configuration>
117-
<skip>true</skip>
118-
</configuration>
119-
</execution>
120-
<!-- This must be a drop in replacement for hbase-client, so can't
121-
manage hbase's deps -->
122-
<execution>
123-
<id>enforce-banned-deps</id>
124-
<goals>
125-
<goal>enforce</goal>
126-
</goals>
127-
<configuration>
128-
<skip>true</skip>
129-
</configuration>
130-
</execution>
131-
</executions>
132-
</plugin>
133123
<plugin>
134124
<groupId>org.apache.maven.plugins</groupId>
135125
<artifactId>maven-shade-plugin</artifactId>

‎hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -251,21 +251,8 @@ limitations under the License.
251251
</exclusion>
252252
</exclusions>
253253
</dependency>
254-
<dependency>
255-
<groupId>ch.qos.reload4j</groupId>
256-
<artifactId>reload4j</artifactId>
257-
<version>${reload4j.version}</version>
258-
<scope>runtime</scope>
259-
</dependency>
260254

261255
<!-- Misc -->
262-
<dependency>
263-
<groupId>com.google.code.findbugs</groupId>
264-
<artifactId>jsr305</artifactId>
265-
<version>${jsr305.version}</version>
266-
<scope>test</scope>
267-
</dependency>
268-
269256
<dependency>
270257
<groupId>com.google.protobuf</groupId>
271258
<artifactId>protobuf-java</artifactId>

‎hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,40 @@ limitations under the License.
6060
<artifactId>reload4j</artifactId>
6161
<version>${reload4j.version}</version>
6262
</dependency>
63-
<dependency>
64-
<groupId>commons-logging</groupId>
65-
<artifactId>commons-logging</artifactId>
66-
<version>${commons-logging.version}</version>
67-
</dependency>
6863
</dependencies>
6964

7065
<build>
66+
<pluginManagement>
67+
<plugins>
68+
<!-- disable google-cloud-shared-config enforcement checks because
69+
hbase-client's dependency subtree doesn't follow the same rules and is
70+
unable to be fixed here -->
71+
<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-enforcer-plugin</artifactId>
74+
<executions>
75+
<execution>
76+
<id>enforce</id>
77+
<configuration>
78+
<skip>true</skip>
79+
</configuration>
80+
</execution>
81+
<!-- This must be a drop in replacement for hbase-client, so can't
82+
manage hbase's deps -->
83+
<execution>
84+
<id>enforce-banned-deps</id>
85+
<goals>
86+
<goal>enforce</goal>
87+
</goals>
88+
<configuration>
89+
<skip>true</skip>
90+
</configuration>
91+
</execution>
92+
</executions>
93+
</plugin>
94+
</plugins>
95+
</pluginManagement>
96+
7197
<plugins>
7298
<plugin>
7399
<groupId>org.apache.maven.plugins</groupId>
@@ -176,37 +202,29 @@ limitations under the License.
176202
</execution>
177203
</executions>
178204
</plugin>
205+
179206
<plugin>
180-
<groupId>org.apache.maven.plugins</groupId>
181-
<artifactId>maven-enforcer-plugin</artifactId>
207+
<groupId>com.google.cloud.bigtable.test</groupId>
208+
<artifactId>bigtable-build-helper</artifactId>
209+
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
210+
182211
<executions>
183212
<execution>
184-
<id>enforce</id>
185-
<configuration>
186-
<rules>
187-
<requireUpperBoundDeps>
188-
<excludes>
189-
<!--
190-
${guava.version} == 30.1-android
191-
api-common:1.10.4 requires 30.1.1-android
192-
-->
193-
<exclude>com.google.guava:guava</exclude>
194-
</excludes>
195-
</requireUpperBoundDeps>
196-
</rules>
197-
</configuration>
213+
<id>verify-mirror-deps-hbase</id>
214+
<phase>verify</phase>
198215
<goals>
199-
<goal>enforce</goal>
216+
<goal>verify-mirror-deps</goal>
200217
</goals>
218+
<configuration>
219+
<targetDependencies>
220+
<targetDependency>org.apache.hbase:hbase-shaded-client</targetDependency>
221+
</targetDependencies>
222+
<ignoredDependencies>
223+
<ignoredDependency>log4j:log4j</ignoredDependency>
224+
</ignoredDependencies>
225+
</configuration>
201226
</execution>
202-
</executions>
203-
</plugin>
204-
<plugin>
205-
<groupId>com.google.cloud.bigtable.test</groupId>
206-
<artifactId>bigtable-build-helper</artifactId>
207-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
208227

209-
<executions>
210228
<execution>
211229
<id>verify-shaded-jar-entries</id>
212230
<phase>verify</phase>

‎hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,27 @@ limitations under the License.
7272
<build>
7373
<plugins>
7474
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-enforcer-plugin</artifactId>
75+
<groupId>com.google.cloud.bigtable.test</groupId>
76+
<artifactId>bigtable-build-helper</artifactId>
77+
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
78+
7779
<executions>
7880
<execution>
79-
<id>enforce</id>
80-
<configuration>
81-
<rules>
82-
<requireUpperBoundDeps>
83-
<excludes>
84-
<!--
85-
bigtable-hbase-mirroring-client-core requires 30.1-android (${guava.version})
86-
api-common:1.10.4 requires 30.1.1-android
87-
-->
88-
<exclude>com.google.guava:guava</exclude>
89-
</excludes>
90-
</requireUpperBoundDeps>
91-
</rules>
92-
</configuration>
81+
<id>verify-mirror-deps-hbase</id>
82+
<phase>verify</phase>
9383
<goals>
94-
<goal>enforce</goal>
84+
<goal>verify-mirror-deps</goal>
9585
</goals>
86+
<configuration>
87+
<targetDependencies>
88+
<!-- make sure that we are a strict superset of hbase -->
89+
<targetDependency>org.apache.hbase:hbase-shaded-client</targetDependency>
90+
</targetDependencies>
91+
<ignoredDependencies>
92+
<!-- forcefully replaced with reload4j -->
93+
<dependency>log4j:log4j</dependency>
94+
</ignoredDependencies>
95+
</configuration>
9696
</execution>
9797
</executions>
9898
</plugin>
@@ -113,7 +113,7 @@ limitations under the License.
113113
<artifactSet>
114114
<includes>
115115
<include>com.google.cloud.bigtable:protobuf-java-format-shaded</include>
116-
<include>${project.groupId}:bigtable-hbase-mirroring-client-core</include>
116+
<include>com.google.cloud.bigtable}:bigtable-hbase-mirroring-client-core</include>
117117
</includes>
118118
</artifactSet>
119119
</configuration>

‎hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,6 @@ limitations under the License.
230230
</dependency>
231231

232232
<!-- Misc -->
233-
<dependency>
234-
<groupId>com.google.code.findbugs</groupId>
235-
<artifactId>jsr305</artifactId>
236-
<version>${jsr305.version}</version>
237-
<scope>test</scope>
238-
</dependency>
239-
240233
<dependency>
241234
<groupId>com.google.guava</groupId>
242235
<artifactId>guava</artifactId>
@@ -334,6 +327,14 @@ limitations under the License.
334327
<version>1.7.30</version>
335328
<scope>test</scope>
336329
</dependency>
330+
331+
<!-- Pinned to prevent Enforcer errors -->
332+
<dependency>
333+
<groupId>io.dropwizard.metrics</groupId>
334+
<artifactId>metrics-core</artifactId>
335+
<version>3.2.6</version>
336+
<scope>test</scope>
337+
</dependency>
337338
</dependencies>
338339

339340
<build>

‎hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,6 @@ limitations under the License.
8484
<version>${reload4j.version}</version>
8585
<scope>runtime</scope>
8686
</dependency>
87-
88-
<!-- Manually promote dependencies: This is necessary to avoid flattening hbase-shaded-client's dependency tree -->
89-
<dependency>
90-
<groupId>commons-logging</groupId>
91-
<artifactId>commons-logging</artifactId>
92-
<version>${commons-logging.version}</version>
93-
</dependency>
94-
95-
<!-- for compatibility with bigtable-hbase-client-1.x-hadoop -->
96-
<dependency>
97-
<groupId>org.slf4j</groupId>
98-
<artifactId>slf4j-api</artifactId>
99-
<version>${hbase2-hadoop-slf4j.version}</version>
100-
</dependency>
10187
</dependencies>
10288

10389
<build>

‎hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,6 @@ limitations under the License.
235235
</dependency>
236236

237237
<!-- Misc -->
238-
<dependency>
239-
<groupId>com.google.code.findbugs</groupId>
240-
<artifactId>jsr305</artifactId>
241-
<version>${jsr305.version}</version>
242-
<scope>test</scope>
243-
</dependency>
244-
245238
<dependency>
246239
<groupId>com.google.guava</groupId>
247240
<artifactId>guava</artifactId>
@@ -345,6 +338,14 @@ limitations under the License.
345338
<version>1.7.30</version>
346339
<scope>test</scope>
347340
</dependency>
341+
342+
<!-- Pinned to prevent Enforcer errors -->
343+
<dependency>
344+
<groupId>io.dropwizard.metrics</groupId>
345+
<artifactId>metrics-core</artifactId>
346+
<version>3.2.6</version>
347+
<scope>test</scope>
348+
</dependency>
348349
</dependencies>
349350

350351
<build>

‎hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ limitations under the License.
4848
<artifactId>hbase-shaded-client</artifactId>
4949
<version>${hbase2.version}</version>
5050
</dependency>
51-
52-
<dependency>
53-
<groupId>commons-logging</groupId>
54-
<artifactId>commons-logging</artifactId>
55-
<version>${commons-logging.version}</version>
56-
</dependency>
5751
</dependencies>
5852

5953
<build>

0 commit comments

Comments
 (0)