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

Commit 7ee3370

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#95)
1 parent 0d305cb commit 7ee3370

File tree

5 files changed

+34
-74
lines changed

5 files changed

+34
-74
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-servicedirectory/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,13 @@
102102
</dependencies>
103103
</profile>
104104
</profiles>
105+
106+
<build>
107+
<plugins>
108+
<plugin>
109+
<groupId>org.codehaus.mojo</groupId>
110+
<artifactId>flatten-maven-plugin</artifactId>
111+
</plugin>
112+
</plugins>
113+
</build>
105114
</project>

‎grpc-google-cloud-servicedirectory-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: 5 additions & 74 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-servicedirectory-parent</site.installationModule>
66-
<google.core.version>1.91.1</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-
<gax.version>1.56.0</gax.version>
70-
<grpc.version>1.30.0</grpc.version>
71-
<protobuf.version>3.12.2</protobuf.version>
72-
<junit.version>4.13</junit.version>
73-
<guava.version>29.0-android</guava.version>
74-
<threeten.version>1.4.4</threeten.version>
75-
<javax.annotations.version>1.3.2</javax.annotations.version>
76-
<animal-sniffer.version>1.18</animal-sniffer.version>
77-
<google.proto-iam-v1.version>0.13.0</google.proto-iam-v1.version>
7866
</properties>
7967

8068
<dependencyManagement>
@@ -96,74 +84,17 @@
9684
</dependency>
9785

9886
<dependency>
99-
<groupId>io.grpc</groupId>
100-
<artifactId>grpc-bom</artifactId>
101-
<version>${grpc.version}</version>
102-
<type>pom</type>
103-
<scope>import</scope>
104-
</dependency>
105-
<dependency>
106-
<groupId>com.google.api</groupId>
107-
<artifactId>gax-bom</artifactId>
108-
<version>${gax.version}</version>
109-
<type>pom</type>
110-
<scope>import</scope>
111-
</dependency>
112-
<dependency>
113-
<groupId>com.google.guava</groupId>
114-
<artifactId>guava-bom</artifactId>
115-
<version>${guava.version}</version>
87+
<groupId>com.google.cloud</groupId>
88+
<artifactId>google-cloud-shared-dependencies</artifactId>
89+
<version>0.8.1</version>
11690
<type>pom</type>
11791
<scope>import</scope>
11892
</dependency>
11993

120-
<dependency>
121-
<groupId>com.google.protobuf</groupId>
122-
<artifactId>protobuf-java</artifactId>
123-
<version>${protobuf.version}</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>com.google.api</groupId>
127-
<artifactId>api-common</artifactId>
128-
<version>${google.api-common.version}</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>com.google.api.grpc</groupId>
132-
<artifactId>proto-google-common-protos</artifactId>
133-
<version>${google.common-protos.version}</version>
134-
</dependency>
135-
<dependency>
136-
<groupId>org.threeten</groupId>
137-
<artifactId>threetenbp</artifactId>
138-
<version>${threeten.version}</version>
139-
</dependency>
140-
<dependency>
141-
<groupId>javax.annotation</groupId>
142-
<artifactId>javax.annotation-api</artifactId>
143-
<version>${javax.annotations.version}</version>
144-
</dependency>
145-
<dependency>
146-
<groupId>org.codehaus.mojo</groupId>
147-
<artifactId>animal-sniffer-annotations</artifactId>
148-
<version>${animal-sniffer.version}</version>
149-
</dependency>
150-
<dependency>
151-
<groupId>com.google.api.grpc</groupId>
152-
<artifactId>proto-google-iam-v1</artifactId>
153-
<version>${google.proto-iam-v1.version}</version>
154-
</dependency>
155-
15694
<dependency>
15795
<groupId>junit</groupId>
15896
<artifactId>junit</artifactId>
159-
<version>${junit.version}</version>
160-
<scope>test</scope>
161-
</dependency>
162-
<dependency>
163-
<groupId>com.google.api</groupId>
164-
<artifactId>gax-grpc</artifactId>
165-
<version>${gax.version}</version>
166-
<classifier>testlib</classifier>
97+
<version>4.13</version>
16798
<scope>test</scope>
16899
</dependency>
169100
</dependencies>
@@ -253,7 +184,7 @@
253184
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
254185
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
255186
<link>https://googleapis.dev/java/gax/latest/</link>
256-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
187+
<link>https://googleapis.github.io/api-common-java/</link>
257188
</links>
258189
</configuration>
259190
</plugin>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>proto-google-iam-v1</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)