Skip to content

Commit 060a81a

Browse files
chingor13olavloite
chingor13
and
olavloite
authored
feat(deps): import shared-dependencies bom and use maven-flatten-plugin (#172)
* feat(deps): import shared-dependencies bom and use maven-flatten-plugin * flatten google-cloud-spanner pom.xml * update to v0.2.0 of shared-dependencies * fix: add exclude for m2e to prevent build errors in Eclipse Co-authored-by: Olav Loite <[email protected]>
1 parent 5806b0e commit 060a81a

File tree

9 files changed

+70
-123
lines changed

9 files changed

+70
-123
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ docs/
2828

2929
# Python utilities
3030
*.pyc
31+
32+
.flattened-pom.xml

‎google-cloud-spanner/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@
9494
</execution>
9595
</executions>
9696
</plugin>
97+
<plugin>
98+
<?m2e ignore?>
99+
<groupId>org.codehaus.mojo</groupId>
100+
<artifactId>flatten-maven-plugin</artifactId>
101+
</plugin>
97102
</plugins>
98103
<pluginManagement>
99104
<plugins>

‎grpc-google-cloud-spanner-admin-database-v1/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,14 @@
6161
</dependencies>
6262
</profile>
6363
</profiles>
64+
65+
<build>
66+
<plugins>
67+
<plugin>
68+
<?m2e ignore?>
69+
<groupId>org.codehaus.mojo</groupId>
70+
<artifactId>flatten-maven-plugin</artifactId>
71+
</plugin>
72+
</plugins>
73+
</build>
6474
</project>

‎grpc-google-cloud-spanner-admin-instance-v1/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,14 @@
6161
</dependencies>
6262
</profile>
6363
</profiles>
64+
65+
<build>
66+
<plugins>
67+
<plugin>
68+
<?m2e ignore?>
69+
<groupId>org.codehaus.mojo</groupId>
70+
<artifactId>flatten-maven-plugin</artifactId>
71+
</plugin>
72+
</plugins>
73+
</build>
6474
</project>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,14 @@
5353
</dependencies>
5454
</profile>
5555
</profiles>
56+
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<?m2e ignore?>
61+
<groupId>org.codehaus.mojo</groupId>
62+
<artifactId>flatten-maven-plugin</artifactId>
63+
</plugin>
64+
</plugins>
65+
</build>
5666
</project>

‎pom.xml‎

Lines changed: 3 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-spanner-parent</site.installationModule>
66-
<google.core.version>1.93.4</google.core.version>
67-
<google.api-common.version>1.9.0</google.api-common.version>
68-
<google.common-protos.version>1.17.0</google.common-protos.version>
69-
<gax.version>1.56.0</gax.version>
70-
<grpc.version>1.29.0</grpc.version>
71-
<protobuf.version>3.11.4</protobuf.version>
72-
<junit.version>4.13</junit.version>
73-
<guava.version>29.0-android</guava.version>
74-
<threeten.version>1.4.3</threeten.version>
75-
<javax.annotations.version>1.3.2</javax.annotations.version>
76-
<animal-sniffer.version>1.18</animal-sniffer.version>
77-
<opencensus.version>0.26.0</opencensus.version>
7866
</properties>
7967

8068
<dependencyManagement>
@@ -115,121 +103,13 @@
115103
<version>1.53.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
116104
</dependency>
117105

118-
<dependency>
119-
<groupId>io.grpc</groupId>
120-
<artifactId>grpc-bom</artifactId>
121-
<version>${grpc.version}</version>
122-
<type>pom</type>
123-
<scope>import</scope>
124-
</dependency>
125-
<dependency>
126-
<groupId>com.google.api</groupId>
127-
<artifactId>gax-bom</artifactId>
128-
<version>${gax.version}</version>
129-
<type>pom</type>
130-
<scope>import</scope>
131-
</dependency>
132-
<dependency>
133-
<groupId>com.google.guava</groupId>
134-
<artifactId>guava-bom</artifactId>
135-
<version>${guava.version}</version>
136-
<type>pom</type>
137-
<scope>import</scope>
138-
</dependency>
139106
<dependency>
140107
<groupId>com.google.cloud</groupId>
141-
<artifactId>google-cloud-core-bom</artifactId>
142-
<version>${google.core.version}</version>
108+
<artifactId>google-cloud-shared-dependencies</artifactId>
109+
<version>0.2.0</version>
143110
<type>pom</type>
144111
<scope>import</scope>
145112
</dependency>
146-
<dependency>
147-
<groupId>com.google.auth</groupId>
148-
<artifactId>google-auth-library-bom</artifactId>
149-
<version>0.20.0</version>
150-
<type>pom</type>
151-
<scope>import</scope>
152-
</dependency>
153-
<dependency>
154-
<groupId>com.google.protobuf</groupId>
155-
<artifactId>protobuf-bom</artifactId>
156-
<version>${protobuf.version}</version>
157-
<type>pom</type>
158-
<scope>import</scope>
159-
</dependency>
160-
<dependency>
161-
<groupId>com.google.http-client</groupId>
162-
<artifactId>google-http-client-bom</artifactId>
163-
<version>1.34.2</version>
164-
<type>pom</type>
165-
<scope>import</scope>
166-
</dependency>
167-
168-
<dependency>
169-
<groupId>com.google.api</groupId>
170-
<artifactId>api-common</artifactId>
171-
<version>${google.api-common.version}</version>
172-
</dependency>
173-
<dependency>
174-
<groupId>com.google.api.grpc</groupId>
175-
<artifactId>proto-google-common-protos</artifactId>
176-
<version>${google.common-protos.version}</version>
177-
</dependency>
178-
<dependency>
179-
<groupId>com.google.api.grpc</groupId>
180-
<artifactId>grpc-google-common-protos</artifactId>
181-
<version>${google.common-protos.version}</version>
182-
</dependency>
183-
<dependency>
184-
<groupId>com.google.api.grpc</groupId>
185-
<artifactId>proto-google-iam-v1</artifactId>
186-
<version>0.13.0</version>
187-
</dependency>
188-
<dependency>
189-
<groupId>org.threeten</groupId>
190-
<artifactId>threetenbp</artifactId>
191-
<version>${threeten.version}</version>
192-
</dependency>
193-
<dependency>
194-
<groupId>javax.annotation</groupId>
195-
<artifactId>javax.annotation-api</artifactId>
196-
<version>${javax.annotations.version}</version>
197-
</dependency>
198-
<dependency>
199-
<groupId>org.codehaus.mojo</groupId>
200-
<artifactId>animal-sniffer-annotations</artifactId>
201-
<version>${animal-sniffer.version}</version>
202-
</dependency>
203-
<dependency>
204-
<groupId>io.opencensus</groupId>
205-
<artifactId>opencensus-api</artifactId>
206-
<version>${opencensus.version}</version>
207-
</dependency>
208-
<dependency>
209-
<groupId>io.opencensus</groupId>
210-
<artifactId>opencensus-contrib-grpc-util</artifactId>
211-
<version>${opencensus.version}</version>
212-
</dependency>
213-
214-
<dependency>
215-
<groupId>junit</groupId>
216-
<artifactId>junit</artifactId>
217-
<version>${junit.version}</version>
218-
<scope>test</scope>
219-
</dependency>
220-
<dependency>
221-
<groupId>com.google.api</groupId>
222-
<artifactId>gax-grpc</artifactId>
223-
<version>${gax.version}</version>
224-
<classifier>testlib</classifier>
225-
<scope>test</scope>
226-
</dependency>
227-
<dependency>
228-
<groupId>com.google.truth</groupId>
229-
<artifactId>truth</artifactId>
230-
<version>1.0.1</version>
231-
<scope>test</scope>
232-
</dependency>
233113
</dependencies>
234114
</dependencyManagement>
235115

@@ -307,7 +187,7 @@
307187
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
308188
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
309189
<link>https://googleapis.dev/java/gax/latest/</link>
310-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
190+
<link>https://googleapis.github.io/api-common-java/1.8.1/apidocs/</link>
311191
</links>
312192
</configuration>
313193
</plugin>

‎proto-google-cloud-spanner-admin-database-v1/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,14 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<?m2e ignore?>
42+
<groupId>org.codehaus.mojo</groupId>
43+
<artifactId>flatten-maven-plugin</artifactId>
44+
</plugin>
45+
</plugins>
46+
</build>
3747
</project>

‎proto-google-cloud-spanner-admin-instance-v1/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,14 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<?m2e ignore?>
42+
<groupId>org.codehaus.mojo</groupId>
43+
<artifactId>flatten-maven-plugin</artifactId>
44+
</plugin>
45+
</plugins>
46+
</build>
3747
</project>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,14 @@
3030
<artifactId>guava</artifactId>
3131
</dependency>
3232
</dependencies>
33+
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<?m2e ignore?>
38+
<groupId>org.codehaus.mojo</groupId>
39+
<artifactId>flatten-maven-plugin</artifactId>
40+
</plugin>
41+
</plugins>
42+
</build>
3343
</project>

0 commit comments

Comments
 (0)