Skip to content

Commit b1d1576

Browse files
authored
deps: use first-party-dependencies in libraries-bom (#5125)
* deps: use first-party-dependencies in libraries-bom * start using RenovateBot for libraries-bom
1 parent c709567 commit b1d1576

File tree

2 files changed

+7
-202
lines changed

2 files changed

+7
-202
lines changed

libraries-bom/pom.xml

Lines changed: 6 additions & 198 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,6 @@
4444

4545
<properties>
4646
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
47-
<guava.version>31.1-jre</guava.version>
48-
<gson.version>2.9.1</gson.version>
49-
<google.cloud.core.version>2.8.6</google.cloud.core.version>
50-
<io.grpc.version>1.48.0</io.grpc.version>
51-
<http.version>1.42.2</http.version>
52-
<protobuf.version>3.21.4</protobuf.version>
53-
<gax.version>2.18.7</gax.version>
54-
<auth.version>1.8.1</auth.version>
55-
<api-common.version>2.2.1</api-common.version>
56-
<common.protos.version>2.9.2</common.protos.version>
57-
<iam.protos.version>1.5.2</iam.protos.version>
5847
</properties>
5948

6049
<distributionManagement>
@@ -70,150 +59,17 @@
7059

7160
<dependencyManagement>
7261
<dependencies>
73-
<!-- Not using Guava-bom because it includes guava-gwt, which has many invalid references -->
62+
<!-- first-party-dependencies is part of google-cloud-shared-dependencies
63+
BOM in https://github.com/googleapis/java-shared-dependencies/blob/main/first-party-dependencies/pom.xml.
64+
This includes Guava, Protobuf, gRPC, Google Auth Libraries, etc. -->
7465
<dependency>
75-
<groupId>com.google.guava</groupId>
76-
<artifactId>guava</artifactId>
77-
<version>${guava.version}</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>com.google.guava</groupId>
81-
<artifactId>guava-testlib</artifactId>
82-
<version>${guava.version}</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>com.google.code.gson</groupId>
86-
<artifactId>gson</artifactId>
87-
<version>${gson.version}</version>
88-
</dependency>
89-
<!-- protobufs from https://github.com/protocolbuffers/protobuf/tree/master/java -->
90-
<dependency>
91-
<groupId>com.google.protobuf</groupId>
92-
<artifactId>protobuf-bom</artifactId>
93-
<version>${protobuf.version}</version>
66+
<groupId>com.google.cloud</groupId>
67+
<artifactId>first-party-dependencies</artifactId>
68+
<version>3.0.3</version>
9469
<type>pom</type>
9570
<scope>import</scope>
9671
</dependency>
9772

98-
<!-- google-http-java-client from https://github.com/googleapis/google-http-java-client -->
99-
<dependency>
100-
<groupId>com.google.http-client</groupId>
101-
<artifactId>google-http-client</artifactId>
102-
<version>${http.version}</version>
103-
</dependency>
104-
<dependency>
105-
<groupId>com.google.http-client</groupId>
106-
<artifactId>google-http-client-android</artifactId>
107-
<version>${http.version}</version>
108-
</dependency>
109-
<dependency>
110-
<groupId>com.google.http-client</groupId>
111-
<artifactId>google-http-client-apache-v2</artifactId>
112-
<version>${http.version}</version>
113-
</dependency>
114-
<dependency>
115-
<groupId>com.google.http-client</groupId>
116-
<artifactId>google-http-client-appengine</artifactId>
117-
<version>${http.version}</version>
118-
</dependency>
119-
<dependency>
120-
<groupId>com.google.http-client</groupId>
121-
<artifactId>google-http-client-gson</artifactId>
122-
<version>${http.version}</version>
123-
</dependency>
124-
<dependency>
125-
<groupId>com.google.http-client</groupId>
126-
<artifactId>google-http-client-jackson2</artifactId>
127-
<version>${http.version}</version>
128-
</dependency>
129-
<dependency>
130-
<groupId>com.google.http-client</groupId>
131-
<artifactId>google-http-client-protobuf</artifactId>
132-
<version>${http.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>com.google.http-client</groupId>
136-
<artifactId>google-http-client-test</artifactId>
137-
<version>${http.version}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>com.google.http-client</groupId>
141-
<artifactId>google-http-client-xml</artifactId>
142-
<version>${http.version}</version>
143-
</dependency>
144-
145-
<!-- GRPC; specifically https://github.com/grpc/grpc-java -->
146-
<dependency>
147-
<groupId>io.grpc</groupId>
148-
<artifactId>grpc-alts</artifactId>
149-
<version>${io.grpc.version}</version>
150-
</dependency>
151-
<dependency>
152-
<groupId>io.grpc</groupId>
153-
<artifactId>grpc-api</artifactId>
154-
<version>${io.grpc.version}</version>
155-
</dependency>
156-
<dependency>
157-
<groupId>io.grpc</groupId>
158-
<artifactId>grpc-auth</artifactId>
159-
<version>${io.grpc.version}</version>
160-
</dependency>
161-
<dependency>
162-
<groupId>io.grpc</groupId>
163-
<artifactId>grpc-context</artifactId>
164-
<version>${io.grpc.version}</version>
165-
</dependency>
166-
<dependency>
167-
<groupId>io.grpc</groupId>
168-
<artifactId>grpc-core</artifactId>
169-
<version>${io.grpc.version}</version>
170-
</dependency>
171-
<dependency>
172-
<groupId>io.grpc</groupId>
173-
<artifactId>grpc-grpclb</artifactId>
174-
<version>${io.grpc.version}</version>
175-
</dependency>
176-
<dependency>
177-
<groupId>io.grpc</groupId>
178-
<artifactId>grpc-netty</artifactId>
179-
<version>${io.grpc.version}</version>
180-
</dependency>
181-
<dependency>
182-
<groupId>io.grpc</groupId>
183-
<artifactId>grpc-netty-shaded</artifactId>
184-
<version>${io.grpc.version}</version>
185-
</dependency>
186-
<dependency>
187-
<groupId>io.grpc</groupId>
188-
<artifactId>grpc-okhttp</artifactId>
189-
<version>${io.grpc.version}</version>
190-
</dependency>
191-
<dependency>
192-
<groupId>io.grpc</groupId>
193-
<artifactId>grpc-protobuf</artifactId>
194-
<version>${io.grpc.version}</version>
195-
</dependency>
196-
<dependency>
197-
<groupId>io.grpc</groupId>
198-
<artifactId>grpc-protobuf-lite</artifactId>
199-
<version>${io.grpc.version}</version>
200-
</dependency>
201-
<dependency>
202-
<groupId>io.grpc</groupId>
203-
<artifactId>grpc-services</artifactId>
204-
<version>${io.grpc.version}</version>
205-
</dependency>
206-
<dependency>
207-
<groupId>io.grpc</groupId>
208-
<artifactId>grpc-stub</artifactId>
209-
<version>${io.grpc.version}</version>
210-
</dependency>
211-
<dependency>
212-
<groupId>io.grpc</groupId>
213-
<artifactId>grpc-testing</artifactId>
214-
<version>${io.grpc.version}</version>
215-
</dependency>
216-
21773
<!-- google-cloud-java from https://github.com/googleapis/java-cloud-bom-->
21874
<dependency>
21975
<groupId>com.google.cloud</groupId>
@@ -222,54 +78,6 @@
22278
<type>pom</type>
22379
<scope>import</scope>
22480
</dependency>
225-
226-
<dependency>
227-
<groupId>com.google.api</groupId>
228-
<artifactId>api-common</artifactId>
229-
<version>${api-common.version}</version>
230-
</dependency>
231-
<dependency>
232-
<groupId>com.google.api</groupId>
233-
<artifactId>gax-bom</artifactId>
234-
<version>${gax.version}</version>
235-
<type>pom</type>
236-
<scope>import</scope>
237-
</dependency>
238-
<dependency>
239-
<groupId>com.google.auth</groupId>
240-
<artifactId>google-auth-library-bom</artifactId>
241-
<version>${auth.version}</version>
242-
<type>pom</type>
243-
<scope>import</scope>
244-
</dependency>
245-
<dependency>
246-
<groupId>com.google.cloud</groupId>
247-
<artifactId>google-cloud-core-bom</artifactId>
248-
<version>${google.cloud.core.version}</version>
249-
<type>pom</type>
250-
<scope>import</scope>
251-
</dependency>
252-
<dependency>
253-
<groupId>com.google.api.grpc</groupId>
254-
<artifactId>proto-google-common-protos</artifactId>
255-
<version>${common.protos.version}</version>
256-
</dependency>
257-
<dependency>
258-
<groupId>com.google.api.grpc</groupId>
259-
<artifactId>grpc-google-common-protos</artifactId>
260-
<version>${common.protos.version}</version>
261-
</dependency>
262-
<dependency>
263-
<groupId>com.google.api.grpc</groupId>
264-
<artifactId>proto-google-iam-v1</artifactId>
265-
<version>${iam.protos.version}</version>
266-
</dependency>
267-
<dependency>
268-
<groupId>com.google.api.grpc</groupId>
269-
<artifactId>grpc-google-iam-v1</artifactId>
270-
<version>${iam.protos.version}</version>
271-
</dependency>
272-
27381
</dependencies>
27482
</dependencyManagement>
27583

renovate.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,5 @@
7070
}
7171
],
7272
"semanticCommits": true,
73-
"dependencyDashboard": true,
74-
"ignorePaths": [
75-
"libraries-bom"
76-
]
73+
"dependencyDashboard": true
7774
}

0 commit comments

Comments
 (0)