Skip to content

Commit 47f5f79

Browse files
committed
build: fix dependency management
1 parent 14124f5 commit 47f5f79

File tree

5 files changed

+26
-44
lines changed

5 files changed

+26
-44
lines changed

google-cloud-jar-parent/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,25 @@
126126
<version>3.4</version>
127127
<scope>test</scope>
128128
</dependency>
129+
<dependency>
130+
<groupId>com.google.testparameterinjector</groupId>
131+
<artifactId>test-parameter-injector</artifactId>
132+
<version>1.17</version>
133+
<scope>test</scope>
134+
</dependency>
135+
<dependency>
136+
<groupId>io.opentelemetry</groupId>
137+
<artifactId>opentelemetry-bom</artifactId>
138+
<version>1.46.0</version>
139+
<type>pom</type>
140+
<scope>import</scope>
141+
</dependency>
142+
<dependency>
143+
<groupId>com.google.cloud.opentelemetry</groupId>
144+
<artifactId>exporter-trace</artifactId>
145+
<version>0.15.0</version>
146+
<scope>test</scope>
147+
</dependency>
129148
</dependencies>
130149
</dependencyManagement>
131150

java-datastore/datastore-v1-proto-client/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,6 @@
9595
<artifactId>junit</artifactId>
9696
<scope>test</scope>
9797
</dependency>
98-
99-
<dependency>
100-
<groupId>com.google.truth</groupId>
101-
<artifactId>truth</artifactId>
102-
<version>1.4.4</version>
103-
<scope>test</scope>
104-
<exclusions>
105-
<exclusion>
106-
<groupId>org.checkerframework</groupId>
107-
<artifactId>checker-qual</artifactId>
108-
</exclusion>
109-
</exclusions>
110-
</dependency>
11198
</dependencies>
11299

113100
<build>

java-datastore/google-cloud-datastore-utils/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<dependency>
7777
<groupId>com.google.truth</groupId>
7878
<artifactId>truth</artifactId>
79-
<version>1.4.2</version>
8079
<scope>test</scope>
8180
<exclusions>
8281
<exclusion>

java-datastore/google-cloud-datastore/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,6 @@
1717
<properties>
1818
<site.installationModule>google-cloud-datastore</site.installationModule>
1919
</properties>
20-
<dependencyManagement>
21-
<dependencies>
22-
<dependency>
23-
<!-- Artifacts from google-cloud-java monorepo -->
24-
<groupId>com.google.cloud</groupId>
25-
<artifactId>gapic-libraries-bom</artifactId>
26-
<version>1.61.0</version>
27-
<type>pom</type>
28-
<scope>import</scope>
29-
</dependency>
30-
</dependencies>
31-
</dependencyManagement>
3220
<dependencies>
3321
<dependency>
3422
<groupId>com.google.api.grpc</groupId>
@@ -160,7 +148,6 @@
160148
<dependency>
161149
<groupId>com.google.guava</groupId>
162150
<artifactId>guava-testlib</artifactId>
163-
<version>33.4.0-jre</version>
164151
<scope>test</scope>
165152
</dependency>
166153
<!-- Need testing utility classes for generated gRPC clients tests -->
@@ -195,13 +182,11 @@
195182
<dependency>
196183
<groupId>com.google.truth</groupId>
197184
<artifactId>truth</artifactId>
198-
<version>1.4.4</version>
199185
<scope>test</scope>
200186
</dependency>
201187
<dependency>
202188
<groupId>com.google.testparameterinjector</groupId>
203189
<artifactId>test-parameter-injector</artifactId>
204-
<version>1.17</version>
205190
<scope>test</scope>
206191
</dependency>
207192
<!-- OpenTelemetry -->
@@ -228,15 +213,13 @@
228213
<dependency>
229214
<groupId>io.opentelemetry</groupId>
230215
<artifactId>opentelemetry-semconv</artifactId>
231-
<version>1.1.0-alpha</version>
232216
<scope>test</scope>
233217
</dependency>
234218
<!-- END OpenTelemetry -->
235219
<!-- Cloud Ops -->
236220
<dependency>
237221
<groupId>com.google.cloud.opentelemetry</groupId>
238222
<artifactId>exporter-trace</artifactId>
239-
<version>0.15.0</version>
240223
<scope>test</scope>
241224
</dependency>
242225
<dependency>

java-datastore/pom.xml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,13 @@
152152

153153
<dependencyManagement>
154154
<dependencies>
155-
155+
<dependency>
156+
<groupId>com.google.cloud</groupId>
157+
<artifactId>google-cloud-trace-bom</artifactId>
158+
<version>2.84.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-trace:current} -->
159+
<type>pom</type>
160+
<scope>import</scope>
161+
</dependency>
156162
<dependency>
157163
<groupId>com.google.api.grpc</groupId>
158164
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
@@ -194,18 +200,6 @@
194200
</exclusion>
195201
</exclusions>
196202
</dependency>
197-
<dependency>
198-
<groupId>junit</groupId>
199-
<artifactId>junit</artifactId>
200-
<version>4.13.2</version>
201-
<scope>test</scope>
202-
</dependency>
203-
<dependency>
204-
<groupId>org.easymock</groupId>
205-
<artifactId>easymock</artifactId>
206-
<version>5.6.0</version>
207-
<scope>test</scope>
208-
</dependency>
209203
</dependencies>
210204
</dependencyManagement>
211205

0 commit comments

Comments
 (0)