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

Commit 2dded4e

Browse files
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#33)
1 parent bcfe491 commit 2dded4e

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
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

pom.xml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,28 +63,22 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-orgpolicy-parent</site.installationModule>
66-
<google.common-protos.version>1.18.0</google.common-protos.version>
67-
<protobuf.version>3.12.2</protobuf.version>
68-
<junit.version>4.13</junit.version>
6966
</properties>
7067

7168
<dependencyManagement>
7269
<dependencies>
7370
<dependency>
74-
<groupId>com.google.protobuf</groupId>
75-
<artifactId>protobuf-java</artifactId>
76-
<version>${protobuf.version}</version>
77-
</dependency>
78-
<dependency>
79-
<groupId>com.google.api.grpc</groupId>
80-
<artifactId>proto-google-common-protos</artifactId>
81-
<version>${google.common-protos.version}</version>
71+
<groupId>com.google.cloud</groupId>
72+
<artifactId>google-cloud-shared-dependencies</artifactId>
73+
<version>0.8.1</version>
74+
<type>pom</type>
75+
<scope>import</scope>
8276
</dependency>
8377

8478
<dependency>
8579
<groupId>junit</groupId>
8680
<artifactId>junit</artifactId>
87-
<version>${junit.version}</version>
81+
<version>4.13</version>
8882
<scope>test</scope>
8983
</dependency>
9084
</dependencies>
@@ -157,7 +151,7 @@
157151
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
158152
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
159153
<link>https://googleapis.dev/java/gax/latest/</link>
160-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
154+
<link>https://googleapis.github.io/api-common-java/</link>
161155
</links>
162156
</configuration>
163157
</plugin>

proto-google-cloud-orgpolicy-v1/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,13 @@
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
2424
</dependencies>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.codehaus.mojo</groupId>
30+
<artifactId>flatten-maven-plugin</artifactId>
31+
</plugin>
32+
</plugins>
33+
</build>
2534
</project>

0 commit comments

Comments
 (0)