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

Commit 5b68436

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#116)
1 parent 16512e2 commit 5b68436

7 files changed

Lines changed: 482 additions & 498 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,6 @@ api_key
4343
# Python utilities
4444
*.pyc
4545
artman-genfiles
46-
venv
46+
venv
47+
48+
.flattened-pom.xml

‎google-cloud-document-ai/pom.xml‎

Lines changed: 110 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,119 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.google.cloud</groupId>
5+
<artifactId>google-cloud-document-ai</artifactId>
6+
<version>0.1.2-SNAPSHOT</version> <!-- {x-version-update:google-cloud-document-ai:current} -->
7+
<packaging>jar</packaging>
8+
<name>Google Cloud Document AI</name>
9+
<url>https://github.com/googleapis/java-documentai</url>
10+
<description>Java idiomatic client for Google Cloud Document AI</description>
11+
<parent>
412
<groupId>com.google.cloud</groupId>
5-
<artifactId>google-cloud-document-ai</artifactId>
13+
<artifactId>google-cloud-document-ai-parent</artifactId>
614
<version>0.1.2-SNAPSHOT</version> <!-- {x-version-update:google-cloud-document-ai:current} -->
7-
<packaging>jar</packaging>
8-
<name>Google Cloud Document AI</name>
9-
<url>https://github.com/googleapis/java-documentai</url>
10-
<description>Java idiomatic client for Google Cloud Document AI</description>
11-
<parent>
12-
<groupId>com.google.cloud</groupId>
13-
<artifactId>google-cloud-document-ai-parent</artifactId>
14-
<version>0.1.2-SNAPSHOT</version> <!-- {x-version-update:google-cloud-document-ai:current} -->
15-
</parent>
16-
<properties>
17-
<site.installationModule>google-cloud-document-ai</site.installationModule>
18-
</properties>
19-
<dependencies>
20-
<dependency>
21-
<groupId>io.grpc</groupId>
22-
<artifactId>grpc-api</artifactId>
23-
</dependency>
24-
<dependency>
25-
<groupId>io.grpc</groupId>
26-
<artifactId>grpc-stub</artifactId>
27-
</dependency>
28-
<dependency>
29-
<groupId>io.grpc</groupId>
30-
<artifactId>grpc-protobuf</artifactId>
31-
</dependency>
32-
<dependency>
33-
<groupId>com.google.api</groupId>
34-
<artifactId>api-common</artifactId>
35-
</dependency>
36-
<dependency>
37-
<groupId>com.google.protobuf</groupId>
38-
<artifactId>protobuf-java</artifactId>
39-
</dependency>
40-
<dependency>
41-
<groupId>com.google.api.grpc</groupId>
42-
<artifactId>proto-google-common-protos</artifactId>
43-
</dependency>
15+
</parent>
16+
<properties>
17+
<site.installationModule>google-cloud-document-ai</site.installationModule>
18+
</properties>
19+
<dependencies>
20+
<dependency>
21+
<groupId>io.grpc</groupId>
22+
<artifactId>grpc-api</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>io.grpc</groupId>
26+
<artifactId>grpc-stub</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>io.grpc</groupId>
30+
<artifactId>grpc-protobuf</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>com.google.api</groupId>
34+
<artifactId>api-common</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>com.google.protobuf</groupId>
38+
<artifactId>protobuf-java</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.google.api.grpc</groupId>
42+
<artifactId>proto-google-common-protos</artifactId>
43+
</dependency>
4444

45-
<dependency>
46-
<groupId>com.google.api.grpc</groupId>
47-
<artifactId>proto-google-cloud-document-ai-v1beta1</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.google.api.grpc</groupId>
51-
<artifactId>proto-google-cloud-document-ai-v1beta2</artifactId>
52-
</dependency>
53-
<dependency>
54-
<groupId>com.google.guava</groupId>
55-
<artifactId>guava</artifactId>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.google.api</groupId>
59-
<artifactId>gax</artifactId>
60-
</dependency>
61-
<dependency>
62-
<groupId>com.google.api</groupId>
63-
<artifactId>gax-grpc</artifactId>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.threeten</groupId>
67-
<artifactId>threetenbp</artifactId>
68-
</dependency>
45+
<dependency>
46+
<groupId>com.google.api.grpc</groupId>
47+
<artifactId>proto-google-cloud-document-ai-v1beta1</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.google.api.grpc</groupId>
51+
<artifactId>proto-google-cloud-document-ai-v1beta2</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.google.guava</groupId>
55+
<artifactId>guava</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.google.api</groupId>
59+
<artifactId>gax</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>com.google.api</groupId>
63+
<artifactId>gax-grpc</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.threeten</groupId>
67+
<artifactId>threetenbp</artifactId>
68+
</dependency>
6969

70-
<!-- Test dependencies -->
71-
<dependency>
72-
<groupId>junit</groupId>
73-
<artifactId>junit</artifactId>
74-
<scope>test</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>com.google.api.grpc</groupId>
78-
<artifactId>grpc-google-cloud-document-ai-v1beta1</artifactId>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>com.google.api.grpc</groupId>
83-
<artifactId>grpc-google-cloud-document-ai-v1beta2</artifactId>
84-
<scope>test</scope>
85-
</dependency>
70+
<!-- Test dependencies -->
71+
<dependency>
72+
<groupId>junit</groupId>
73+
<artifactId>junit</artifactId>
74+
<scope>test</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>com.google.api.grpc</groupId>
78+
<artifactId>grpc-google-cloud-document-ai-v1beta1</artifactId>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>com.google.api.grpc</groupId>
83+
<artifactId>grpc-google-cloud-document-ai-v1beta2</artifactId>
84+
<scope>test</scope>
85+
</dependency>
8686

87-
<!-- Need testing utility classes for generated gRPC clients tests -->
88-
<dependency>
89-
<groupId>com.google.api</groupId>
90-
<artifactId>gax-grpc</artifactId>
91-
<classifier>testlib</classifier>
92-
<scope>test</scope>
93-
</dependency>
94-
</dependencies>
87+
<!-- Need testing utility classes for generated gRPC clients tests -->
88+
<dependency>
89+
<groupId>com.google.api</groupId>
90+
<artifactId>gax-grpc</artifactId>
91+
<classifier>testlib</classifier>
92+
<scope>test</scope>
93+
</dependency>
94+
</dependencies>
95+
96+
<profiles>
97+
<profile>
98+
<id>java9</id>
99+
<activation>
100+
<jdk>[9,)</jdk>
101+
</activation>
102+
<dependencies>
103+
<dependency>
104+
<groupId>javax.annotation</groupId>
105+
<artifactId>javax.annotation-api</artifactId>
106+
</dependency>
107+
</dependencies>
108+
</profile>
109+
</profiles>
95110

96-
<profiles>
97-
<profile>
98-
<id>java9</id>
99-
<activation>
100-
<jdk>[9,)</jdk>
101-
</activation>
102-
<dependencies>
103-
<dependency>
104-
<groupId>javax.annotation</groupId>
105-
<artifactId>javax.annotation-api</artifactId>
106-
</dependency>
107-
</dependencies>
108-
</profile>
109-
</profiles>
111+
<build>
112+
<plugins>
113+
<plugin>
114+
<groupId>org.codehaus.mojo</groupId>
115+
<artifactId>flatten-maven-plugin</artifactId>
116+
</plugin>
117+
</plugins>
118+
</build>
110119
</project>

‎grpc-google-cloud-document-ai-v1beta1/pom.xml‎

Lines changed: 62 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,68 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.google.api.grpc</groupId>
5-
<artifactId>grpc-google-cloud-document-ai-v1beta1</artifactId>
6-
<version>0.1.2-SNAPSHOT</version> <!-- {x-version-update:grpc-google-cloud-document-ai-v1beta1:current} -->
7-
<name>grpc-google-cloud-document-ai-v1beta1</name>
8-
<description>GRPC library for grpc-google-cloud-document-ai-v1beta1</description>
9-
<parent>
10-
<groupId>com.google.cloud</groupId>
11-
<artifactId>google-cloud-document-ai-parent</artifactId>
12-
<version>0.1.2-SNAPSHOT</version> <!-- {x-version-update:google-cloud-document-ai:current} -->
13-
</parent>
14-
<dependencies>
15-
<dependency>
16-
<groupId>io.grpc</groupId>
17-
<artifactId>grpc-api</artifactId>
18-
</dependency>
19-
<dependency>
20-
<groupId>io.grpc</groupId>
21-
<artifactId>grpc-stub</artifactId>
22-
</dependency>
23-
<dependency>
24-
<groupId>io.grpc</groupId>
25-
<artifactId>grpc-protobuf</artifactId>
26-
</dependency>
27-
<dependency>
28-
<groupId>com.google.protobuf</groupId>
29-
<artifactId>protobuf-java</artifactId>
30-
</dependency>
31-
<dependency>
32-
<groupId>com.google.api.grpc</groupId>
33-
<artifactId>proto-google-common-protos</artifactId>
34-
</dependency>
35-
<dependency>
36-
<groupId>com.google.api.grpc</groupId>
37-
<artifactId>proto-google-cloud-document-ai-v1beta1</artifactId>
38-
</dependency>
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.google.api.grpc</groupId>
5+
<artifactId>grpc-google-cloud-document-ai-v1beta1</artifactId>
6+
<version>0.1.2-SNAPSHOT</version> <!-- {x-version-update:grpc-google-cloud-document-ai-v1beta1:current} -->
7+
<name>grpc-google-cloud-document-ai-v1beta1</name>
8+
<description>GRPC library for grpc-google-cloud-document-ai-v1beta1</description>
9+
<parent>
10+
<groupId>com.google.cloud</groupId>
11+
<artifactId>google-cloud-document-ai-parent</artifactId>
12+
<version>0.1.2-SNAPSHOT</version> <!-- {x-version-update:google-cloud-document-ai:current} -->
13+
</parent>
14+
<dependencies>
15+
<dependency>
16+
<groupId>io.grpc</groupId>
17+
<artifactId>grpc-api</artifactId>
18+
</dependency>
19+
<dependency>
20+
<groupId>io.grpc</groupId>
21+
<artifactId>grpc-stub</artifactId>
22+
</dependency>
23+
<dependency>
24+
<groupId>io.grpc</groupId>
25+
<artifactId>grpc-protobuf</artifactId>
26+
</dependency>
27+
<dependency>
28+
<groupId>com.google.protobuf</groupId>
29+
<artifactId>protobuf-java</artifactId>
30+
</dependency>
31+
<dependency>
32+
<groupId>com.google.api.grpc</groupId>
33+
<artifactId>proto-google-common-protos</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.google.api.grpc</groupId>
37+
<artifactId>proto-google-cloud-document-ai-v1beta1</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.google.guava</groupId>
41+
<artifactId>guava</artifactId>
42+
</dependency>
43+
</dependencies>
44+
45+
<profiles>
46+
<profile>
47+
<id>java9</id>
48+
<activation>
49+
<jdk>[9,)</jdk>
50+
</activation>
51+
<dependencies>
3952
<dependency>
40-
<groupId>com.google.guava</groupId>
41-
<artifactId>guava</artifactId>
53+
<groupId>javax.annotation</groupId>
54+
<artifactId>javax.annotation-api</artifactId>
4255
</dependency>
43-
</dependencies>
56+
</dependencies>
57+
</profile>
58+
</profiles>
4459

45-
<profiles>
46-
<profile>
47-
<id>java9</id>
48-
<activation>
49-
<jdk>[9,)</jdk>
50-
</activation>
51-
<dependencies>
52-
<dependency>
53-
<groupId>javax.annotation</groupId>
54-
<artifactId>javax.annotation-api</artifactId>
55-
</dependency>
56-
</dependencies>
57-
</profile>
58-
</profiles>
60+
<build>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.codehaus.mojo</groupId>
64+
<artifactId>flatten-maven-plugin</artifactId>
65+
</plugin>
66+
</plugins>
67+
</build>
5968
</project>

0 commit comments

Comments
 (0)