Skip to content

Commit 532a698

Browse files
stephaniewang526stephaniewang526
authored
feat: use shared-dependencies bom and add flatten to grpc and proto modules (googleapis#186)
1 parent 321d1df commit 532a698

File tree

11 files changed

+89
-91
lines changed
  • .gitignore
  • google-cloud-bigquerystorage
  • grpc-google-cloud-bigquerystorage-v1
  • grpc-google-cloud-bigquerystorage-v1alpha2
  • grpc-google-cloud-bigquerystorage-v1beta1
  • grpc-google-cloud-bigquerystorage-v1beta2
  • pom.xml
  • proto-google-cloud-bigquerystorage-v1
  • proto-google-cloud-bigquerystorage-v1alpha2
  • proto-google-cloud-bigquerystorage-v1beta1
  • proto-google-cloud-bigquerystorage-v1beta2

11 files changed

+89
-91
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ target/
1313
# python utilities
1414
*.pyc
1515
__pycache__
16+
17+
.flattened-pom.xml

‎google-cloud-bigquerystorage/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,10 @@
143143
<dependency>
144144
<groupId>com.google.cloud</groupId>
145145
<artifactId>google-cloud-bigquery</artifactId>
146-
<version>1.110.1</version>
147146
</dependency>
148147
<dependency>
149148
<groupId>com.google.code.findbugs</groupId>
150149
<artifactId>jsr305</artifactId>
151-
<version>3.0.2</version>
152150
</dependency>
153151
<dependency>
154152
<groupId>io.grpc</groupId>
@@ -157,7 +155,6 @@
157155
<dependency>
158156
<groupId>com.google.cloud</groupId>
159157
<artifactId>google-cloud-core</artifactId>
160-
<version>${google.core.version}</version>
161158
</dependency>
162159
<dependency>
163160
<groupId>com.google.protobuf</groupId>

‎grpc-google-cloud-bigquerystorage-v1/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@
3939
</dependency>
4040
</dependencies>
4141

42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>flatten-maven-plugin</artifactId>
47+
</plugin>
48+
</plugins>
49+
</build>
50+
4251
<profiles>
4352
<profile>
4453
<id>java9</id>

‎grpc-google-cloud-bigquerystorage-v1alpha2/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@
3939
</dependency>
4040
</dependencies>
4141

42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>flatten-maven-plugin</artifactId>
47+
</plugin>
48+
</plugins>
49+
</build>
50+
4251
<profiles>
4352
<profile>
4453
<id>java9</id>

‎grpc-google-cloud-bigquerystorage-v1beta1/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@
3939
</dependency>
4040
</dependencies>
4141

42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>flatten-maven-plugin</artifactId>
47+
</plugin>
48+
</plugins>
49+
</build>
50+
4251
<profiles>
4352
<profile>
4453
<id>java9</id>

‎grpc-google-cloud-bigquerystorage-v1beta2/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@
3939
</dependency>
4040
</dependencies>
4141

42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>flatten-maven-plugin</artifactId>
47+
</plugin>
48+
</plugins>
49+
</build>
50+
4251
<profiles>
4352
<profile>
4453
<id>java9</id>

‎pom.xml

Lines changed: 15 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,7 @@
6464
<project.protobuf-java.version>3.11.4</project.protobuf-java.version>
6565
<github.global.server>github</github.global.server>
6666
<site.installationModule>google-cloud-bigquerystorage-parent</site.installationModule>
67-
<google.core.version>1.93.4</google.core.version>
68-
<google.api-common.version>1.9.0</google.api-common.version>
69-
<google.common-protos.version>1.17.0</google.common-protos.version>
70-
<gax.version>1.56.0</gax.version>
71-
<auto-value-annotations.version>1.7</auto-value-annotations.version>
7267
<jackson-core.version>2.10.3</jackson-core.version>
73-
<grpc.version>1.28.1</grpc.version>
74-
<protobuf.version>3.11.4</protobuf.version>
75-
<junit.version>4.13</junit.version>
76-
<guava.version>29.0-android</guava.version>
77-
<threeten.version>1.4.3</threeten.version>
78-
<javax.annotations.version>1.3.2</javax.annotations.version>
79-
<animal-sniffer.version>1.18</animal-sniffer.version>
8068
<commons-lang3.version>3.5</commons-lang3.version>
8169
</properties>
8270

@@ -100,6 +88,18 @@
10088

10189
<dependencyManagement>
10290
<dependencies>
91+
<dependency>
92+
<groupId>com.google.cloud</groupId>
93+
<artifactId>google-cloud-shared-dependencies</artifactId>
94+
<version>0.1.1</version>
95+
<type>pom</type>
96+
<scope>import</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.google.cloud</groupId>
100+
<artifactId>google-cloud-bigquery</artifactId>
101+
<version>1.110.1</version>
102+
</dependency>
103103
<dependency>
104104
<groupId>com.google.api.grpc</groupId>
105105
<artifactId>proto-google-cloud-bigquerystorage-v1alpha2</artifactId>
@@ -120,7 +120,6 @@
120120
<artifactId>proto-google-cloud-bigquerystorage-v1</artifactId>
121121
<version>0.94.0</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1:current} -->
122122
</dependency>
123-
124123
<dependency>
125124
<groupId>com.google.api.grpc</groupId>
126125
<artifactId>grpc-google-cloud-bigquerystorage-v1alpha2</artifactId>
@@ -141,93 +140,21 @@
141140
<artifactId>grpc-google-cloud-bigquerystorage-v1</artifactId>
142141
<version>0.94.0</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1:current} -->
143142
</dependency>
144-
<dependency>
145-
<groupId>com.google.auto.value</groupId>
146-
<artifactId>auto-value-annotations</artifactId>
147-
<version>${auto-value-annotations.version}</version>
148-
</dependency>
149-
<dependency>
150-
<groupId>com.fasterxml.jackson.core</groupId>
151-
<artifactId>jackson-core</artifactId>
152-
<version>${jackson-core.version}</version>
153-
</dependency>
154143
<dependency>
155144
<groupId>com.google.cloud</groupId>
156145
<artifactId>google-cloud-bigquerystorage</artifactId>
157146
<version>0.129.0-beta</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
158147
</dependency>
159-
160-
<dependency>
161-
<groupId>io.grpc</groupId>
162-
<artifactId>grpc-bom</artifactId>
163-
<version>${grpc.version}</version>
164-
<type>pom</type>
165-
<scope>import</scope>
166-
</dependency>
167-
<dependency>
168-
<groupId>com.google.api</groupId>
169-
<artifactId>gax-bom</artifactId>
170-
<version>${gax.version}</version>
171-
<type>pom</type>
172-
<scope>import</scope>
173-
</dependency>
174148
<dependency>
175-
<groupId>com.google.guava</groupId>
176-
<artifactId>guava-bom</artifactId>
177-
<version>${guava.version}</version>
178-
<type>pom</type>
179-
<scope>import</scope>
180-
</dependency>
181-
182-
<dependency>
183-
<groupId>com.google.protobuf</groupId>
184-
<artifactId>protobuf-java</artifactId>
185-
<version>${protobuf.version}</version>
186-
</dependency>
187-
<dependency>
188-
<groupId>com.google.api</groupId>
189-
<artifactId>api-common</artifactId>
190-
<version>${google.api-common.version}</version>
191-
</dependency>
192-
<dependency>
193-
<groupId>com.google.api.grpc</groupId>
194-
<artifactId>proto-google-common-protos</artifactId>
195-
<version>${google.common-protos.version}</version>
196-
</dependency>
197-
<dependency>
198-
<groupId>org.threeten</groupId>
199-
<artifactId>threetenbp</artifactId>
200-
<version>${threeten.version}</version>
201-
</dependency>
202-
<dependency>
203-
<groupId>javax.annotation</groupId>
204-
<artifactId>javax.annotation-api</artifactId>
205-
<version>${javax.annotations.version}</version>
206-
</dependency>
207-
<dependency>
208-
<groupId>org.codehaus.mojo</groupId>
209-
<artifactId>animal-sniffer-annotations</artifactId>
210-
<version>${animal-sniffer.version}</version>
149+
<groupId>com.fasterxml.jackson.core</groupId>
150+
<artifactId>jackson-core</artifactId>
151+
<version>${jackson-core.version}</version>
211152
</dependency>
212153
<dependency>
213154
<groupId>org.apache.commons</groupId>
214155
<artifactId>commons-lang3</artifactId>
215156
<version>${commons-lang3.version}</version>
216157
</dependency>
217-
218-
<dependency>
219-
<groupId>junit</groupId>
220-
<artifactId>junit</artifactId>
221-
<version>${junit.version}</version>
222-
<scope>test</scope>
223-
</dependency>
224-
<dependency>
225-
<groupId>com.google.api</groupId>
226-
<artifactId>gax-grpc</artifactId>
227-
<version>${gax.version}</version>
228-
<classifier>testlib</classifier>
229-
<scope>test</scope>
230-
</dependency>
231158
</dependencies>
232159
</dependencyManagement>
233160

‎proto-google-cloud-bigquerystorage-v1/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,13 @@
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
2424
</dependencies>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.codehaus.mojo</groupId>
30+
<artifactId>flatten-maven-plugin</artifactId>
31+
</plugin>
32+
</plugins>
33+
</build>
2534
</project>

‎proto-google-cloud-bigquerystorage-v1alpha2/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,13 @@
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
2424
</dependencies>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.codehaus.mojo</groupId>
30+
<artifactId>flatten-maven-plugin</artifactId>
31+
</plugin>
32+
</plugins>
33+
</build>
2534
</project>

‎proto-google-cloud-bigquerystorage-v1beta1/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,13 @@
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
2424
</dependencies>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.codehaus.mojo</groupId>
30+
<artifactId>flatten-maven-plugin</artifactId>
31+
</plugin>
32+
</plugins>
33+
</build>
2534
</project>

‎proto-google-cloud-bigquerystorage-v1beta2/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,13 @@
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
2424
</dependencies>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.codehaus.mojo</groupId>
30+
<artifactId>flatten-maven-plugin</artifactId>
31+
</plugin>
32+
</plugins>
33+
</build>
2534
</project>

0 commit comments

Comments
 (0)