Skip to content

Commit c792552

Browse files
committed
Manage ome:jxrlib-all at version 0.2.3
This eliminates the previous class conflicts, but introduces a new conflict with args4j; see: https://forum.image.sc/t/37290/6
1 parent 21c2bd4 commit c792552

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

pom.xml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,10 @@
202202
* org.apache.hadoop:hadoop-yarn-*
203203
* org.apache.spark:spark-*_2.11
204204
* org.jmockit:jmockit + junit:junit
205-
* ome:jxrlib-all + com.sun.istack:istack-commons-runtime
206-
* ome:jxrlib-all + javax.xml.bind:jaxb-api or jakarta.xml.bind:jakarta.xml.bind-api
207-
* ome:jxrlib-all + org.glassfish.jaxb:jaxb-runtime
208-
* ome:jxrlib-all + org.glassfish.jaxb:txw2
205+
* ome:jxrlib-all + args4j:args4j
209206
* com.github.jnr:jnr-ffi + org.jruby:jruby-core
210207
-->
211-
<allowedDuplicateClasses>META-INF/versions/9/javax.xml.bind.ModuleUtil,com.com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner</allowedDuplicateClasses>
208+
<allowedDuplicateClasses>META-INF/versions/9/javax.xml.bind.ModuleUtil,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.kohsuke.args4j.*,org.junit.runner.Runner</allowedDuplicateClasses>
212209

213210
<!--
214211
NB: We override these properties to make the enforcer happy.
@@ -705,6 +702,10 @@
705702
<!-- OME Model - https://github.com/ome/ome-model -->
706703
<ome-xml.version>6.0.1</ome-xml.version>
707704

705+
<!-- Glencoe Software jxrlib - https://github.com/glencoesoftware/jxrlib -->
706+
<jxrlib.version>0.2.3</jxrlib.version>
707+
<jxrlib-all.version>${jxrlib.version}</jxrlib-all.version>
708+
708709
<!-- Bio-Formats - https://github.com/ome/bioformats -->
709710
<bio-formats.version>6.5.0</bio-formats.version>
710711
<bio-formats_plugins.version>${bio-formats.version}</bio-formats_plugins.version>
@@ -2425,6 +2426,13 @@
24252426
<version>${ome-xml.version}</version>
24262427
</dependency>
24272428

2429+
<!-- Glencoe Software jxrlib - https://github.com/glencoesoftware/jxrlib -->
2430+
<dependency>
2431+
<groupId>ome</groupId>
2432+
<artifactId>jxrlib-all</artifactId>
2433+
<version>${jxrlib-all.version}</version>
2434+
</dependency>
2435+
24282436
<!-- Bio-Formats - https://github.com/ome/bioformats -->
24292437
<dependency>
24302438
<groupId>ome</groupId>
@@ -3971,6 +3979,7 @@
39713979
<metakit.version>LATEST</metakit.version>
39723980
<ome-poi.version>LATEST</ome-poi.version>
39733981
<ome-xml.version>LATEST</ome-xml.version>
3982+
<jxrlib-all.version>LATEST</jxrlib-all.version>
39743983
<bio-formats.version>LATEST</bio-formats.version>
39753984
<omero-blitz.version>LATEST</omero-blitz.version>
39763985
<omero-common.version>LATEST</omero-common.version>

0 commit comments

Comments
 (0)