Skip to content

Commit 194d061

Browse files
igorbernstein2igorbernstein2
authored
deps: unflatten deps for bigtable-hbase-1.x (#4222)
* deps: unflatten deps for bigtable-hbase-1.x Change-Id: Ife83709fb0fd9f691100fcb9415ed6a9d55ec073 * oops Change-Id: I9991ae07c40275d034e6f39613a22d425e802947 * oops Change-Id: I763e75e38249f48b4b46bdd83e07895f312b773c
1 parent df0a821 commit 194d061

1 file changed

Lines changed: 50 additions & 93 deletions

File tree

  • bigtable-hbase-1.x-parent/bigtable-hbase-1.x

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

Lines changed: 50 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,6 @@ limitations under the License.
5353
</dependencyManagement>
5454

5555
<dependencies>
56-
<dependency>
57-
<groupId>com.google.cloud.bigtable</groupId>
58-
<artifactId>bigtable-hbase</artifactId>
59-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
60-
</dependency>
61-
<dependency>
62-
<groupId>com.google.cloud.bigtable</groupId>
63-
<artifactId>bigtable-metrics-api</artifactId>
64-
<version>${bigtable-metrics-api.version}</version>
65-
<exclusions>
66-
<exclusion>
67-
<groupId>com.google.api</groupId>
68-
<artifactId>api-common</artifactId>
69-
</exclusion>
70-
</exclusions>
71-
</dependency>
72-
7356
<dependency>
7457
<groupId>org.apache.hbase</groupId>
7558
<artifactId>hbase-shaded-client</artifactId>
@@ -85,94 +68,32 @@ limitations under the License.
8568
<groupId>ch.qos.reload4j</groupId>
8669
<artifactId>reload4j</artifactId>
8770
<version>${reload4j.version}</version>
88-
<scope>runtime</scope>
8971
</dependency>
9072

9173
<dependency>
92-
<groupId>com.google.api</groupId>
93-
<artifactId>api-common</artifactId>
94-
</dependency>
95-
<dependency>
96-
<groupId>com.google.protobuf</groupId>
97-
<artifactId>protobuf-java</artifactId>
98-
</dependency>
99-
<dependency>
100-
<groupId>com.google.guava</groupId>
101-
<artifactId>guava</artifactId>
102-
</dependency>
103-
104-
<!-- deps for metrics instrumentation, these should be removed once we expose more hooks in veneer metrics -->
105-
<dependency>
106-
<groupId>com.google.api</groupId>
107-
<artifactId>gax</artifactId>
108-
</dependency>
109-
<dependency>
110-
<groupId>com.google.auth</groupId>
111-
<artifactId>google-auth-library-credentials</artifactId>
74+
<groupId>com.google.cloud.bigtable</groupId>
75+
<artifactId>bigtable-hbase</artifactId>
76+
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
11277
</dependency>
11378

114-
<!-- These are direct dependencies of TestBigtableConnection.java which is in test scope,
115-
but they are transitive dependencies of bigtable-client-core, which needs them during runtime.
116-
For more information please see https://github.com/googleapis/java-bigtable-hbase/pull/2447 -->
117-
<dependency>
118-
<groupId>io.grpc</groupId>
119-
<artifactId>grpc-api</artifactId>
120-
<scope>compile</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>io.grpc</groupId>
124-
<artifactId>grpc-core</artifactId>
125-
<scope>compile</scope>
126-
</dependency>
127-
<dependency>
128-
<groupId>io.grpc</groupId>
129-
<artifactId>grpc-stub</artifactId>
130-
<scope>compile</scope>
131-
</dependency>
132-
<dependency>
133-
<groupId>com.google.api.grpc</groupId>
134-
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
135-
<scope>compile</scope>
136-
</dependency>
137-
<dependency>
138-
<groupId>com.google.api.grpc</groupId>
139-
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
140-
<scope>compile</scope>
141-
</dependency>
142-
<dependency>
143-
<groupId>com.google.api.grpc</groupId>
144-
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
145-
<scope>compile</scope>
146-
</dependency>
147-
<dependency>
148-
<groupId>com.google.cloud</groupId>
149-
<artifactId>google-cloud-bigtable</artifactId>
150-
<scope>compile</scope>
151-
</dependency>
152-
<dependency>
153-
<groupId>com.google.cloud</groupId>
154-
<artifactId>google-cloud-core</artifactId>
155-
<scope>compile</scope>
156-
</dependency>
157-
<dependency>
158-
<groupId>com.google.api.grpc</groupId>
159-
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
160-
<scope>compile</scope>
161-
</dependency>
16279
<dependency>
16380
<groupId>net.bytebuddy</groupId>
16481
<artifactId>byte-buddy</artifactId>
16582
<version>${byte.buddy.version}</version>
16683
</dependency>
16784

168-
16985
<!-- Test dependencies-->
17086
<dependency>
17187
<groupId>com.google.cloud.bigtable</groupId>
17288
<artifactId>bigtable-internal-test-helper</artifactId>
17389
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
17490
<scope>test</scope>
17591
</dependency>
92+
<dependency>
93+
<groupId>com.google.api.grpc</groupId>
94+
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
95+
<scope>test</scope>
96+
</dependency>
17697
<dependency>
17798
<groupId>io.dropwizard.metrics</groupId>
17899
<artifactId>metrics-graphite</artifactId>
@@ -191,12 +112,6 @@ limitations under the License.
191112
</exclusion>
192113
</exclusions>
193114
</dependency>
194-
<dependency>
195-
<groupId>io.dropwizard.metrics</groupId>
196-
<artifactId>metrics-graphite</artifactId>
197-
<version>${dropwizard-metrics.version}</version>
198-
<scope>test</scope>
199-
</dependency>
200115
<dependency>
201116
<groupId>junit</groupId>
202117
<artifactId>junit</artifactId>
@@ -211,4 +126,46 @@ limitations under the License.
211126
</dependency>
212127
</dependencies>
213128

129+
<build>
130+
<plugins>
131+
<plugin>
132+
<groupId>com.google.cloud.bigtable.test</groupId>
133+
<artifactId>bigtable-build-helper</artifactId>
134+
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
135+
136+
<executions>
137+
<execution>
138+
<id>verify-mirror-deps-cbt</id>
139+
<phase>verify</phase>
140+
<goals>
141+
<goal>verify-mirror-deps</goal>
142+
</goals>
143+
<configuration>
144+
<targetDependencies>
145+
<!-- make sure that we are a strict superset of veneer -->
146+
<targetDependency>com.google.cloud:google-cloud-bigtable</targetDependency>
147+
</targetDependencies>
148+
</configuration>
149+
</execution>
150+
<execution>
151+
<id>verify-mirror-deps-hbase</id>
152+
<phase>verify</phase>
153+
<goals>
154+
<goal>verify-mirror-deps</goal>
155+
</goals>
156+
<configuration>
157+
<targetDependencies>
158+
<!-- make sure that we are a strict superset of hbase -->
159+
<targetDependency>org.apache.hbase:hbase-shaded-client</targetDependency>
160+
</targetDependencies>
161+
<ignoredDependencies>
162+
<!-- forcefully replaced with reload4j -->
163+
<dependency>log4j:log4j</dependency>
164+
</ignoredDependencies>
165+
</configuration>
166+
</execution>
167+
</executions>
168+
</plugin>
169+
</plugins>
170+
</build>
214171
</project>

0 commit comments

Comments
 (0)