Skip to content

Commit 5931d38

Browse files
chingor13chingor13
committed
build: fix dependency management
1 parent 14124f5 commit 5931d38

File tree

5 files changed

+26
-165
lines changed

5 files changed

+26
-165
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 & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,10 @@
9595
<artifactId>junit</artifactId>
9696
<scope>test</scope>
9797
</dependency>
98-
9998
<dependency>
10099
<groupId>com.google.truth</groupId>
101100
<artifactId>truth</artifactId>
102-
<version>1.4.4</version>
103101
<scope>test</scope>
104-
<exclusions>
105-
<exclusion>
106-
<groupId>org.checkerframework</groupId>
107-
<artifactId>checker-qual</artifactId>
108-
</exclusion>
109-
</exclusions>
110102
</dependency>
111103
</dependencies>
112104

@@ -130,48 +122,6 @@
130122
<skipTests>true</skipTests>
131123
</properties>
132124
</profile>
133-
<profile>
134-
<id>java17</id>
135-
<activation>
136-
<jdk>[17,)</jdk>
137-
</activation>
138-
<build>
139-
<plugins>
140-
<plugin>
141-
<groupId>org.apache.maven.plugins</groupId>
142-
<artifactId>maven-compiler-plugin</artifactId>
143-
<configuration>
144-
<encoding>UTF-8</encoding>
145-
<fork>true</fork>
146-
<compilerArgs>
147-
<arg>-XDcompilePolicy=simple</arg>
148-
<arg>--should-stop=ifError=FLOW</arg>
149-
<arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
150-
151-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
152-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
153-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
154-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
155-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
156-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
157-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
158-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
159-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
160-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
161-
</compilerArgs>
162-
<!-- Only run Error-Prone Core in handwritten modules -->
163-
<annotationProcessorPaths>
164-
<path>
165-
<groupId>com.google.errorprone</groupId>
166-
<artifactId>error_prone_core</artifactId>
167-
<version>${error-prone.version}</version>
168-
</path>
169-
</annotationProcessorPaths>
170-
</configuration>
171-
</plugin>
172-
</plugins>
173-
</build>
174-
</profile>
175125
</profiles>
176126

177127
</project>

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

Lines changed: 0 additions & 43 deletions
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>
@@ -107,47 +106,5 @@
107106
<skipTests>true</skipTests>
108107
</properties>
109108
</profile>
110-
<profile>
111-
<id>java17</id>
112-
<activation>
113-
<jdk>[17,)</jdk>
114-
</activation>
115-
<build>
116-
<plugins>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-compiler-plugin</artifactId>
120-
<configuration>
121-
<encoding>UTF-8</encoding>
122-
<fork>true</fork>
123-
<compilerArgs>
124-
<arg>-XDcompilePolicy=simple</arg>
125-
<arg>--should-stop=ifError=FLOW</arg>
126-
<arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
127-
128-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
129-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
130-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
131-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
132-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
133-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
134-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
135-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
136-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
137-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
138-
</compilerArgs>
139-
<!-- Only run Error-Prone Core in handwritten modules -->
140-
<annotationProcessorPaths>
141-
<path>
142-
<groupId>com.google.errorprone</groupId>
143-
<artifactId>error_prone_core</artifactId>
144-
<version>${error-prone.version}</version>
145-
</path>
146-
</annotationProcessorPaths>
147-
</configuration>
148-
</plugin>
149-
</plugins>
150-
</build>
151-
</profile>
152109
</profiles>
153110
</project>

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

Lines changed: 0 additions & 59 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>
@@ -271,47 +254,5 @@
271254
<test>com.google.cloud.datastore.it.ITDatastoreConceptsTest</test>
272255
</properties>
273256
</profile>
274-
<profile>
275-
<id>java17</id>
276-
<activation>
277-
<jdk>[17,)</jdk>
278-
</activation>
279-
<build>
280-
<plugins>
281-
<plugin>
282-
<groupId>org.apache.maven.plugins</groupId>
283-
<artifactId>maven-compiler-plugin</artifactId>
284-
<configuration>
285-
<encoding>UTF-8</encoding>
286-
<fork>true</fork>
287-
<compilerArgs>
288-
<arg>-XDcompilePolicy=simple</arg>
289-
<arg>--should-stop=ifError=FLOW</arg>
290-
<arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
291-
292-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
293-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
294-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
295-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
296-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
297-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
298-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
299-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
300-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
301-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
302-
</compilerArgs>
303-
<!-- Only run Error-Prone Core in handwritten modules -->
304-
<annotationProcessorPaths>
305-
<path>
306-
<groupId>com.google.errorprone</groupId>
307-
<artifactId>error_prone_core</artifactId>
308-
<version>${error-prone.version}</version>
309-
</path>
310-
</annotationProcessorPaths>
311-
</configuration>
312-
</plugin>
313-
</plugins>
314-
</build>
315-
</profile>
316257
</profiles>
317258
</project>

‎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)