Skip to content

Commit 5778ecb

Browse files
igorbernstein2igorbernstein2
authored
deps: unflatten the rest of the 1x artifacts (#4227)
Change-Id: I504c888c88b637c447f8cc4df6c59053b666ff79
1 parent d32e540 commit 5778ecb

File tree

4 files changed

+88
-156
lines changed

4 files changed

+88
-156
lines changed

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

Lines changed: 5 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -181,20 +181,6 @@ limitations under the License.
181181

182182
<dependencies>
183183
<!-- Project Modules -->
184-
<dependency>
185-
<groupId>com.google.cloud.bigtable</groupId>
186-
<artifactId>bigtable-hbase</artifactId>
187-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
188-
<scope>test</scope>
189-
<exclusions>
190-
<!-- included in hbase-shaded-testing-util -->
191-
<exclusion>
192-
<groupId>org.apache.hbase</groupId>
193-
<artifactId>hbase-shaded-client</artifactId>
194-
</exclusion>
195-
</exclusions>
196-
</dependency>
197-
198184
<dependency>
199185
<groupId>${project.groupId}</groupId>
200186
<artifactId>bigtable-hbase-1.x</artifactId>
@@ -231,22 +217,11 @@ limitations under the License.
231217
</dependency>
232218

233219
<!-- java-bigtable Modules -->
234-
<dependency>
235-
<groupId>com.google.cloud</groupId>
236-
<artifactId>google-cloud-bigtable</artifactId>
237-
<scope>test</scope>
238-
</dependency>
239-
240220
<dependency>
241221
<groupId>com.google.api.grpc</groupId>
242222
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
243223
<scope>test</scope>
244224
</dependency>
245-
<dependency>
246-
<groupId>com.google.api.grpc</groupId>
247-
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
248-
<scope>test</scope>
249-
</dependency>
250225

251226

252227
<!-- HBase testing tools -->
@@ -262,86 +237,22 @@ limitations under the License.
262237
</exclusion>
263238
</exclusions>
264239
</dependency>
265-
266-
267-
<!-- Misc -->
268-
<dependency>
269-
<groupId>com.google.auth</groupId>
270-
<artifactId>google-auth-library-credentials</artifactId>
271-
<scope>test</scope>
272-
</dependency>
273-
274-
<dependency>
275-
<groupId>com.google.auth</groupId>
276-
<artifactId>google-auth-library-oauth2-http</artifactId>
277-
<scope>test</scope>
278-
</dependency>
279-
280-
<dependency>
281-
<groupId>com.google.code.findbugs</groupId>
282-
<artifactId>jsr305</artifactId>
283-
<version>${jsr305.version}</version>
284-
<scope>test</scope>
285-
</dependency>
286-
287240
<dependency>
288-
<groupId>com.google.guava</groupId>
289-
<artifactId>guava</artifactId>
290-
<version>${guava.version}</version>
291-
<scope>test</scope>
292-
</dependency>
293-
294-
<dependency>
295-
<groupId>com.google.protobuf</groupId>
296-
<artifactId>protobuf-java</artifactId>
297-
<scope>test</scope>
241+
<groupId>ch.qos.reload4j</groupId>
242+
<artifactId>reload4j</artifactId>
243+
<version>${reload4j.version}</version>
244+
<scope>runtime</scope>
298245
</dependency>
299246

247+
<!-- Misc -->
300248
<dependency>
301249
<groupId>commons-lang</groupId>
302250
<artifactId>commons-lang</artifactId>
303251
<version>${commons-lang.version}</version>
304252
<scope>test</scope>
305253
</dependency>
306254

307-
<dependency>
308-
<groupId>io.grpc</groupId>
309-
<artifactId>grpc-alts</artifactId>
310-
<scope>test</scope>
311-
</dependency>
312-
<dependency>
313-
<groupId>io.grpc</groupId>
314-
<artifactId>grpc-stub</artifactId>
315-
<scope>test</scope>
316-
</dependency>
317-
318-
<dependency>
319-
<groupId>io.grpc</groupId>
320-
<artifactId>grpc-api</artifactId>
321-
<scope>test</scope>
322-
</dependency>
323-
324-
<dependency>
325-
<groupId>io.grpc</groupId>
326-
<artifactId>grpc-grpclb</artifactId>
327-
<scope>test</scope>
328-
</dependency>
329-
330-
<dependency>
331-
<groupId>io.grpc</groupId>
332-
<artifactId>grpc-netty-shaded</artifactId>
333-
<scope>test</scope>
334-
</dependency>
335-
336-
337255
<!-- Testing deps -->
338-
<dependency>
339-
<groupId>org.hamcrest</groupId>
340-
<artifactId>hamcrest-core</artifactId>
341-
<version>${hamcrest.version}</version>
342-
<scope>test</scope>
343-
</dependency>
344-
345256
<dependency>
346257
<groupId>org.hamcrest</groupId>
347258
<artifactId>hamcrest-library</artifactId>

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

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,8 @@ limitations under the License.
110110
<version>${hbase1.version}</version>
111111
<scope>test</scope>
112112
<exclusions>
113-
<!-- exclusion to avoid version conflict with existing artifact -->
114-
<exclusion>
115-
<groupId>org.slf4j</groupId>
116-
<artifactId>slf4j-api</artifactId>
117-
</exclusion>
118-
<!-- exclusion to avoid version conflict with existing artifact -->
119113
<exclusion>
114+
<!-- Exclude conflict with hbase-server -->
120115
<groupId>org.slf4j</groupId>
121116
<artifactId>slf4j-log4j12</artifactId>
122117
</exclusion>
@@ -131,37 +126,46 @@ limitations under the License.
131126
</dependencies>
132127

133128
<build>
129+
<pluginManagement>
130+
<plugins>
131+
<plugin>
132+
<!-- skip UpperBound enforcement for hadoop jars -->
133+
<groupId>org.apache.maven.plugins</groupId>
134+
<artifactId>maven-enforcer-plugin</artifactId>
135+
<executions>
136+
<execution>
137+
<id>enforce</id>
138+
<goals>
139+
<goal>enforce</goal>
140+
</goals>
141+
<configuration>
142+
<skip>true</skip>
143+
</configuration>
144+
</execution>
145+
<execution>
146+
<id>enforce-version-consistency-slf4j</id>
147+
<goals>
148+
<goal>enforce</goal>
149+
</goals>
150+
<configuration>
151+
<skip>true</skip>
152+
</configuration>
153+
</execution>
154+
<!-- We are not introducing any new deps here. We expect to be
155+
running in hadoop's provided classpath -->
156+
<execution>
157+
<id>enforce-banned-deps</id>
158+
<configuration>
159+
<skip>true</skip>
160+
</configuration>
161+
</execution>
162+
</executions>
163+
</plugin>
164+
</plugins>
165+
</pluginManagement>
166+
167+
134168
<plugins>
135-
<plugin>
136-
<!-- skip UpperBound enforcement for hadoop jars -->
137-
<groupId>org.apache.maven.plugins</groupId>
138-
<artifactId>maven-enforcer-plugin</artifactId>
139-
<executions>
140-
<execution>
141-
<id>enforce</id>
142-
<goals>
143-
<goal>enforce</goal>
144-
</goals>
145-
<configuration>
146-
<skip>true</skip>
147-
</configuration>
148-
</execution>
149-
<execution>
150-
<id>enforce-version-consistency-slf4j</id>
151-
<configuration>
152-
<skip>true</skip>
153-
</configuration>
154-
</execution>
155-
<!-- We are not introducing any new deps here. We expect to be
156-
running in hadoop's provided classpath -->
157-
<execution>
158-
<id>enforce-banned-deps</id>
159-
<configuration>
160-
<skip>true</skip>
161-
</configuration>
162-
</execution>
163-
</executions>
164-
</plugin>
165169
<plugin>
166170
<groupId>org.codehaus.mojo</groupId>
167171
<artifactId>build-helper-maven-plugin</artifactId>
@@ -225,19 +229,20 @@ limitations under the License.
225229
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
226230
<executions>
227231
<execution>
228-
<id>verify-mirror-deps</id>
232+
<id>verify-mirror-deps-hbase</id>
229233
<phase>verify</phase>
230234
<goals>
231235
<goal>verify-mirror-deps</goal>
232236
</goals>
233237
<configuration>
234238
<targetDependencies>
235-
<targetDependency>org.apache.hbase:hbase-server:${hbase1.version}</targetDependency>
239+
<targetDependency>org.apache.hbase:hbase-server</targetDependency>
236240
</targetDependencies>
237241
<ignoredDependencies>
238-
<!-- For some reason, hbase-server pulls in test deps -->
239-
<ignoredDependency>junit:junit</ignoredDependency>
240-
<ignoredDependency>org.hamcrest:hamcrest-core</ignoredDependency>
242+
243+
<!-- hbase-common pulls in test deps via hbase-annotations, exclude them from mirror check -->
244+
<dependency>junit:junit</dependency>
245+
<dependency>org.hamcrest:hamcrest-core</dependency>
241246
</ignoredDependencies>
242247
</configuration>
243248
</execution>

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

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
</exclusion>
4848
</exclusions>
4949
</dependency>
50+
5051
<dependency>
5152
<groupId>org.apache.hbase</groupId>
5253
<artifactId>hbase-shaded-client</artifactId>
@@ -56,34 +57,24 @@
5657
<groupId>log4j</groupId>
5758
<artifactId>log4j</artifactId>
5859
</exclusion>
59-
<exclusion>
60-
<groupId>org.slf4j</groupId>
61-
<artifactId>slf4j-log4j12</artifactId>
62-
</exclusion>
6360
</exclusions>
6461
</dependency>
62+
<dependency>
63+
<groupId>ch.qos.reload4j</groupId>
64+
<artifactId>reload4j</artifactId>
65+
<version>${reload4j.version}</version>
66+
</dependency>
67+
68+
<!-- For @Nullable -->
6569
<dependency>
6670
<groupId>com.google.code.findbugs</groupId>
6771
<artifactId>jsr305</artifactId>
6872
<version>3.0.2</version>
73+
<scope>provided</scope>
6974
</dependency>
70-
<dependency>
71-
<groupId>org.slf4j</groupId>
72-
<artifactId>slf4j-api</artifactId>
73-
<version>1.7.32</version>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.slf4j</groupId>
77-
<artifactId>log4j-over-slf4j</artifactId>
78-
<version>1.7.32</version>
79-
<scope>runtime</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>ch.qos.logback</groupId>
83-
<artifactId>logback-classic</artifactId>
84-
<version>1.2.11</version>
85-
<scope>runtime</scope>
86-
</dependency>
75+
76+
77+
<!-- Test deps -->
8778
<dependency>
8879
<groupId>org.mockito</groupId>
8980
<artifactId>mockito-core</artifactId>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/resources/log4j.properties

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Root logger option
16+
log4j.rootLogger=WARN, stdout
17+
18+
# Direct log messages to stdout
19+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
20+
log4j.appender.stdout.Target=System.out
21+
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
22+
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
23+
24+
# Uncomment the following line to get detailed logs on Schema Translator
25+
#log4j.logger.com.google.cloud.bigtable.hbase.tools.HBaseSchemaTranslator=TRACE

0 commit comments

Comments
 (0)