Skip to content

Commit ee15b1c

Browse files
igorbernstein2igorbernstein2
authored
deps: unflatten transitive dependencies in bigtable-hbase (#4207)
* chore: clean up pom.xml variables This is a purely cosmetic change Change-Id: Ia3750c137ae9f40c2e8124dbe5a807cbd706df6f * deps: unflatten transitive dependencies in bigtable-hbase Since bigtable-hbase is just a bridge between hbase-client and google-cloud-bigtable ecosystems, we should defer to those artifacts to dictate the transitive dependencies. This change makes this explicit by only depending on bigtable & hbase artifacts Change-Id: I479c336d0a1cf0fdfc14d36e044595b71088e76e
1 parent c17306c commit ee15b1c

File tree

1 file changed

+36
-107
lines changed
  • bigtable-client-core-parent/bigtable-hbase

1 file changed

+36
-107
lines changed

‎bigtable-client-core-parent/bigtable-hbase/pom.xml

Lines changed: 36 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -51,106 +51,7 @@ limitations under the License.
5151
</dependencyManagement>
5252

5353
<dependencies>
54-
<!-- List implementation deps first -->
55-
<dependency>
56-
<groupId>${project.groupId}</groupId>
57-
<artifactId>bigtable-metrics-api</artifactId>
58-
<version>${bigtable-metrics-api.version}</version>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>com.google.api</groupId>
62-
<artifactId>api-common</artifactId>
63-
</exclusion>
64-
</exclusions>
65-
</dependency>
66-
67-
<dependency>
68-
<groupId>com.google.protobuf</groupId>
69-
<artifactId>protobuf-java</artifactId>
70-
</dependency>
71-
72-
<dependency>
73-
<groupId>com.google.guava</groupId>
74-
<artifactId>guava</artifactId>
75-
</dependency>
76-
77-
<dependency>
78-
<groupId>com.google.cloud</groupId>
79-
<artifactId>google-cloud-bigtable</artifactId>
80-
</dependency>
81-
82-
<dependency>
83-
<groupId>com.google.api.grpc</groupId>
84-
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
85-
</dependency>
86-
<dependency>
87-
<groupId>com.google.api.grpc</groupId>
88-
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
89-
</dependency>
90-
<dependency>
91-
<groupId>com.google.api.grpc</groupId>
92-
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.google.api.grpc</groupId>
96-
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
97-
</dependency>
98-
<dependency>
99-
<groupId>com.google.auth</groupId>
100-
<artifactId>google-auth-library-credentials</artifactId>
101-
</dependency>
102-
<dependency>
103-
<groupId>io.grpc</groupId>
104-
<artifactId>grpc-api</artifactId>
105-
</dependency>
106-
<dependency>
107-
<groupId>io.grpc</groupId>
108-
<artifactId>grpc-stub</artifactId>
109-
</dependency>
110-
<dependency>
111-
<groupId>com.google.api</groupId>
112-
<artifactId>gax</artifactId>
113-
</dependency>
114-
<dependency>
115-
<groupId>io.opencensus</groupId>
116-
<artifactId>opencensus-api</artifactId>
117-
</dependency>
118-
<dependency>
119-
<groupId>org.threeten</groupId>
120-
<artifactId>threetenbp</artifactId>
121-
</dependency>
122-
<dependency>
123-
<groupId>com.google.code.findbugs</groupId>
124-
<artifactId>jsr305</artifactId>
125-
</dependency>
126-
<dependency>
127-
<groupId>com.google.api</groupId>
128-
<artifactId>api-common</artifactId>
129-
</dependency>
130-
<dependency>
131-
<groupId>commons-logging</groupId>
132-
<artifactId>commons-logging</artifactId>
133-
<version>${commons-logging.version}</version>
134-
</dependency>
135-
<dependency>
136-
<groupId>com.google.api.grpc</groupId>
137-
<artifactId>proto-google-common-protos</artifactId>
138-
</dependency>
139-
140-
<!-- For veneer client settings configurations -->
141-
<dependency>
142-
<groupId>io.grpc</groupId>
143-
<artifactId>grpc-core</artifactId>
144-
</dependency>
145-
<dependency>
146-
<groupId>com.google.api</groupId>
147-
<artifactId>gax-grpc</artifactId>
148-
</dependency>
149-
<dependency>
150-
<groupId>com.google.auth</groupId>
151-
<artifactId>google-auth-library-oauth2-http</artifactId>
152-
</dependency>
153-
54+
<!-- Api/HBase deps first -->
15455
<dependency>
15556
<groupId>org.apache.hbase</groupId>
15657
<artifactId>hbase-shaded-client</artifactId>
@@ -166,7 +67,18 @@ limitations under the License.
16667
<groupId>ch.qos.reload4j</groupId>
16768
<artifactId>reload4j</artifactId>
16869
<version>${reload4j.version}</version>
169-
<scope>runtime</scope>
70+
</dependency>
71+
72+
<!-- Implementation deps -->
73+
<dependency>
74+
<groupId>com.google.cloud</groupId>
75+
<artifactId>google-cloud-bigtable</artifactId>
76+
</dependency>
77+
78+
<dependency>
79+
<groupId>${project.groupId}</groupId>
80+
<artifactId>bigtable-metrics-api</artifactId>
81+
<version>${bigtable-metrics-api.version}</version>
17082
</dependency>
17183

17284
<!-- Test -->
@@ -181,6 +93,11 @@ limitations under the License.
18193
<artifactId>grpc-google-common-protos</artifactId>
18294
<scope>test</scope>
18395
</dependency>
96+
<dependency>
97+
<groupId>com.google.api.grpc</groupId>
98+
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
99+
<scope>test</scope>
100+
</dependency>
184101
<dependency>
185102
<groupId>commons-lang</groupId>
186103
<artifactId>commons-lang</artifactId>
@@ -193,12 +110,6 @@ limitations under the License.
193110
<version>${mockito.version}</version>
194111
<scope>test</scope>
195112
</dependency>
196-
<dependency>
197-
<groupId>org.hamcrest</groupId>
198-
<artifactId>hamcrest-core</artifactId>
199-
<version>${hamcrest.version}</version>
200-
<scope>test</scope>
201-
</dependency>
202113
<dependency>
203114
<groupId>com.google.truth</groupId>
204115
<artifactId>truth</artifactId>
@@ -234,6 +145,7 @@ limitations under the License.
234145
</systemProperties>
235146
</configuration>
236147
</plugin>
148+
237149
<plugin>
238150
<groupId>com.google.cloud.bigtable.test</groupId>
239151
<artifactId>bigtable-build-helper</artifactId>
@@ -253,6 +165,23 @@ limitations under the License.
253165
</targetDependencies>
254166
</configuration>
255167
</execution>
168+
<execution>
169+
<id>verify-mirror-deps-hbase</id>
170+
<phase>verify</phase>
171+
<goals>
172+
<goal>verify-mirror-deps</goal>
173+
</goals>
174+
<configuration>
175+
<targetDependencies>
176+
<!-- make sure that we are a strict superset of hbase -->
177+
<targetDependency>org.apache.hbase:hbase-shaded-client</targetDependency>
178+
</targetDependencies>
179+
<ignoredDependencies>
180+
<!-- forcefully replaced with reload4j -->
181+
<dependency>log4j:log4j</dependency>
182+
</ignoredDependencies>
183+
</configuration>
184+
</execution>
256185
</executions>
257186
</plugin>
258187
</plugins>

0 commit comments

Comments
 (0)