Skip to content

Commit 6715a8b

Browse files
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#162)
1 parent f42ebcc commit 6715a8b

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,6 @@ api_key
3939

4040
# Python utilities
4141
*.pyc
42-
artman-genfiles
42+
artman-genfiles
43+
44+
.flattened-pom.xml

pom.xml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@
7676
<type>pom</type>
7777
<scope>import</scope>
7878
</dependency>
79+
<dependency>
80+
<groupId>com.google.cloud</groupId>
81+
<artifactId>google-cloud-shared-dependencies</artifactId>
82+
<version>0.8.1</version>
83+
<type>pom</type>
84+
<scope>import</scope>
85+
</dependency>
7986
</dependencies>
8087
</dependencyManagement>
8188
<dependencies>
@@ -106,10 +113,6 @@
106113
</exclusion>
107114
</exclusions>
108115
</dependency>
109-
<dependency>
110-
<groupId>com.google.api.grpc</groupId>
111-
<artifactId>proto-google-cloud-spanner-v1</artifactId>
112-
</dependency>
113116
<dependency>
114117
<groupId>com.google.protobuf</groupId>
115118
<artifactId>protobuf-java</artifactId>
@@ -121,7 +124,6 @@
121124
<dependency>
122125
<groupId>org.threeten</groupId>
123126
<artifactId>threetenbp</artifactId>
124-
<version>${threeten.version}</version>
125127
</dependency>
126128
<dependency>
127129
<groupId>io.grpc</groupId>
@@ -134,7 +136,6 @@
134136
<dependency>
135137
<groupId>com.google.code.findbugs</groupId>
136138
<artifactId>jsr305</artifactId>
137-
<version>${findbugs.version}</version>
138139
</dependency>
139140
<dependency>
140141
<groupId>com.google.http-client</groupId>
@@ -333,6 +334,11 @@
333334
</execution>
334335
</executions>
335336
</plugin>
337+
338+
<plugin>
339+
<groupId>org.codehaus.mojo</groupId>
340+
<artifactId>flatten-maven-plugin</artifactId>
341+
</plugin>
336342
</plugins>
337343
<pluginManagement>
338344
<plugins>
@@ -453,7 +459,7 @@
453459
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
454460
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
455461
<link>https://googleapis.dev/java/gax/latest/</link>
456-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
462+
<link>https://googleapis.github.io/api-common-java/</link>
457463
</links>
458464
</configuration>
459465
</plugin>

0 commit comments

Comments
 (0)