Skip to content

Commit 4b70729

Browse files
committed
build: exclude ccdbrcdb's protobuf
1 parent 0eb21a9 commit 4b70729

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

‎pom.xml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<dependency>
182182
<groupId>org.jlab.coda</groupId>
183183
<artifactId>xmsg</artifactId>
184-
<version>2.5</version> <!-- WARNING: if changed, check the `com.google.protobuf:protobuf-java` version; see `docs/dependency_conflicts.md` -->
184+
<version>2.5</version>
185185
</dependency>
186186

187187
<dependency>
@@ -230,7 +230,18 @@
230230
<dependency>
231231
<groupId>org.jlab.ccdbrcdb</groupId>
232232
<artifactId>ccdbrcdb</artifactId>
233-
<version>2.1</version> <!-- WARNING: if changed, check the `com.google.protobuf:protobuf-java` version; see `docs/dependency_conflicts.md` -->
233+
<version>2.1</version>
234+
<exclusions>
235+
<exclusion>
236+
<!--
237+
protobuf is transitive via `mysql-connector-j` and is only needed for
238+
the X DevAPI (MySQL X Protocol); it also conflicts with the version
239+
used by `xmsg`, so we exclude it here
240+
-->
241+
<groupId>com.google.protobuf</groupId>
242+
<artifactId>protobuf-java</artifactId>
243+
</exclusion>
244+
</exclusions>
234245
</dependency>
235246

236247
<dependency>
@@ -267,7 +278,7 @@
267278

268279
<!-- BEGIN DEPENDENCY CONFLICT RESOLUTION -->
269280
<!--
270-
the following dependency versions are specified to resolve dependency tree conflicts
281+
the following dependency versions are pinned to resolve dependency tree conflicts
271282
- see also exclusions in `maven-enforcer-plugin`
272283
- see `docs/dependency_conflicts.md` for more info
273284
-->
@@ -283,16 +294,6 @@
283294
<version>0.4.8</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
284295
</dependency>
285296

286-
<!-- resolve conflicting `com.google.protobuf:protobuf-java` by choosing the latest used by
287-
- `org.jlab.ccdbrcdb:ccdbrcdb`
288-
- `org.jlab.coda:xmsg`
289-
-->
290-
<dependency>
291-
<groupId>com.google.protobuf</groupId>
292-
<artifactId>protobuf-java</artifactId>
293-
<version>4.31.1</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
294-
</dependency>
295-
296297
<!-- resolve conflict between `j4ml:j4ml-clas12` and `clas-tracking`
297298
by using the version of `org.ejml:ejml-simple` used by `j4ml:j4ml-clas12:jar:0.9-SNAPSHOT` -->
298299
<dependency>

0 commit comments

Comments
 (0)