Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,31 @@
</modules>

<repositories>
<!-- code.jlab.org package registries -->
<!-- jnp-hipo4 ::: https://code.jlab.org/hallb/clas12/hipo-java -->
<repository>
<!-- git repo: https://code.jlab.org/hallb/clas12/hipo-java -->
<!-- artifacts: jnp-hipo4 -->
<id>code.jlab.org-hipo-java</id>
<url>https://code.jlab.org/api/v4/projects/919/packages/maven</url>
</repository>
<!-- xmsg ::: https://code.jlab.org/hallb/clas12/coatjava/xmsg-java -->
<repository>
<!-- git repo: https://code.jlab.org/hallb/clas12/coatjava/xmsg-java -->
<!-- artifacts: xmsg -->
<id>code.jlab.org-xmsg-java</id>
<url>https://code.jlab.org/api/v4/projects/959/packages/maven</url>
</repository>
<!-- jclara ::: https://code.jlab.org/hallb/clas12/coatjava/clara-java -->
<repository>
<!-- git repo: https://code.jlab.org/hallb/clas12/coatjava/clara-java -->
<!-- artifacts: jclara -->
<id>code.jlab.org-clara-java</id>
<url>https://code.jlab.org/api/v4/projects/243/packages/maven</url>
</repository>
<!-- freehep-jminuit ::: https://code.jlab.org/hallb/clas12/jminuit-maven-mirror -->
<repository>
<!-- git repo: https://code.jlab.org/hallb/clas12/jminuit-maven-mirror -->
<!-- artifacts: freehep-jminuit -->
<id>code.jlab.org-freehep-jminuit</id>
<url>https://code.jlab.org/api/v4/projects/1079/packages/maven</url>
</repository>
<!-- ccdbrcdb ::: https://code.jlab.org/hallb/clas12/coatjava/ccdbrcdb-java -->
<repository>
<id>code.jlab.org-ccdbrcdb-java</id>
<url>https://code.jlab.org/api/v4/projects/245/packages/maven</url>
</repository>
<!-- clasweb repositories -->
<repository>
<id>clasweb-clas12maven</id>
Expand Down Expand Up @@ -216,7 +216,18 @@
<dependency>
<groupId>org.jlab.ccdbrcdb</groupId>
<artifactId>ccdbrcdb</artifactId>
<version>2.0</version>
<version>2.1</version>
<exclusions>
<exclusion>
<!--
protobuf is transitive via `mysql-connector-j` and is only needed for
the X DevAPI (MySQL X Protocol), unused here; it also conflicts with
the version used by `xmsg`, so we exclude it here
-->
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -425,12 +436,7 @@
</goals>
<configuration>
<rules>
<dependencyConvergence>
<excludes>
<!-- excluding conflicts that may be tricky to resolve -->
<exclude>com.google.protobuf:protobuf-java</exclude> <!-- `org.jlab.ccdbrcdb:ccdbrcdb` use v3, but `org.jlab.coda.xmsg` uses v2 -->
</excludes>
</dependencyConvergence>
<dependencyConvergence/>
</rules>
</configuration>
</execution>
Expand Down
Loading