Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 0b9096a

Browse files
chingor13chingor13
authored
feat(deps): use google-cloud-shared-dependencies and flatten-maven-plugin (#215)
* feat(deps): use google-cloud-shared-dependencies and flatten-maven-plugin * deps: use shared-dependencies 0.8.1
1 parent b3276cf commit 0b9096a

File tree

7 files changed

+51
-78
lines changed

7 files changed

+51
-78
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-datacatalog/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,13 @@
116116
</dependencies>
117117
</profile>
118118
</profiles>
119+
120+
<build>
121+
<plugins>
122+
<plugin>
123+
<groupId>org.codehaus.mojo</groupId>
124+
<artifactId>flatten-maven-plugin</artifactId>
125+
</plugin>
126+
</plugins>
127+
</build>
119128
</project>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,13 @@
5757
</dependencies>
5858
</profile>
5959
</profiles>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.codehaus.mojo</groupId>
65+
<artifactId>flatten-maven-plugin</artifactId>
66+
</plugin>
67+
</plugins>
68+
</build>
6069
</project>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,13 @@
5757
</dependencies>
5858
</profile>
5959
</profiles>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.codehaus.mojo</groupId>
65+
<artifactId>flatten-maven-plugin</artifactId>
66+
</plugin>
67+
</plugins>
68+
</build>
6069
</project>

‎pom.xml

Lines changed: 4 additions & 78 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-datacatalog-parent</site.installationModule>
66-
<google.core.version>1.93.6</google.core.version>
67-
<google.api-common.version>1.9.2</google.api-common.version>
68-
<google.common-protos.version>1.18.0</google.common-protos.version>
69-
<google.iam.version>0.13.0</google.iam.version>
70-
<gax.version>1.57.0</gax.version>
71-
<grpc.version>1.30.0</grpc.version>
72-
<protobuf.version>3.12.2</protobuf.version>
73-
<junit.version>4.13</junit.version>
74-
<guava.version>29.0-android</guava.version>
75-
<threeten.version>1.4.4</threeten.version>
76-
<javax.annotations.version>1.3.2</javax.annotations.version>
77-
<animal-sniffer.version>1.18</animal-sniffer.version>
7866
</properties>
7967

8068
<dependencyManagement>
@@ -106,79 +94,17 @@
10694
</dependency>
10795

10896
<dependency>
109-
<groupId>io.grpc</groupId>
110-
<artifactId>grpc-bom</artifactId>
111-
<version>${grpc.version}</version>
112-
<type>pom</type>
113-
<scope>import</scope>
114-
</dependency>
115-
<dependency>
116-
<groupId>com.google.api</groupId>
117-
<artifactId>gax-bom</artifactId>
118-
<version>${gax.version}</version>
119-
<type>pom</type>
120-
<scope>import</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>com.google.guava</groupId>
124-
<artifactId>guava-bom</artifactId>
125-
<version>${guava.version}</version>
97+
<groupId>com.google.cloud</groupId>
98+
<artifactId>google-cloud-shared-dependencies</artifactId>
99+
<version>0.8.1</version>
126100
<type>pom</type>
127101
<scope>import</scope>
128102
</dependency>
129103

130-
<dependency>
131-
<groupId>com.google.protobuf</groupId>
132-
<artifactId>protobuf-java</artifactId>
133-
<version>${protobuf.version}</version>
134-
</dependency>
135-
<dependency>
136-
<groupId>com.google.api</groupId>
137-
<artifactId>api-common</artifactId>
138-
<version>${google.api-common.version}</version>
139-
</dependency>
140-
<dependency>
141-
<groupId>com.google.api.grpc</groupId>
142-
<artifactId>proto-google-common-protos</artifactId>
143-
<version>${google.common-protos.version}</version>
144-
</dependency>
145-
<dependency>
146-
<groupId>com.google.api.grpc</groupId>
147-
<artifactId>proto-google-iam-v1</artifactId>
148-
<version>${google.iam.version}</version>
149-
</dependency>
150-
<dependency>
151-
<groupId>com.google.cloud</groupId>
152-
<artifactId>google-cloud-core</artifactId>
153-
<version>${google.core.version}</version>
154-
</dependency>
155-
<dependency>
156-
<groupId>org.threeten</groupId>
157-
<artifactId>threetenbp</artifactId>
158-
<version>${threeten.version}</version>
159-
</dependency>
160-
<dependency>
161-
<groupId>javax.annotation</groupId>
162-
<artifactId>javax.annotation-api</artifactId>
163-
<version>${javax.annotations.version}</version>
164-
</dependency>
165-
<dependency>
166-
<groupId>org.codehaus.mojo</groupId>
167-
<artifactId>animal-sniffer-annotations</artifactId>
168-
<version>${animal-sniffer.version}</version>
169-
</dependency>
170-
171104
<dependency>
172105
<groupId>junit</groupId>
173106
<artifactId>junit</artifactId>
174-
<version>${junit.version}</version>
175-
<scope>test</scope>
176-
</dependency>
177-
<dependency>
178-
<groupId>com.google.api</groupId>
179-
<artifactId>gax-grpc</artifactId>
180-
<version>${gax.version}</version>
181-
<classifier>testlib</classifier>
107+
<version>4.13</version>
182108
<scope>test</scope>
183109
</dependency>
184110
</dependencies>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>guava</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>guava</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

0 commit comments

Comments
 (0)