Skip to content

Commit 973aaab

Browse files
committed
Update ome:jxrlib-all to 0.2.4
This eliminates the conflict with args4j; see: https://forum.image.sc/t/37290/7
1 parent b9580de commit 973aaab

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,8 @@
246246
Part of: junit:junit
247247
Also in: org.jmockit:jmockit
248248
Enables: junit:junit + org.jmockit:jmockit
249-
==
250-
Classes: org.kohsuke.args4j.*
251-
Part of: args4j:args4j
252-
Also in: ome:jxrlib-all
253-
Enables: args4j:args4j + ome:jxrlib-all
254249
-->
255-
<allowedDuplicateClasses>com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.kohsuke.args4j.*</allowedDuplicateClasses>
250+
<allowedDuplicateClasses>com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner</allowedDuplicateClasses>
256251

257252
<!--
258253
NB: We override these properties to make the enforcer happy.
@@ -747,7 +742,7 @@
747742
<ome-xml.version>6.0.1</ome-xml.version>
748743

749744
<!-- Glencoe Software jxrlib - https://github.com/glencoesoftware/jxrlib -->
750-
<jxrlib.version>0.2.3</jxrlib.version>
745+
<jxrlib.version>0.2.4</jxrlib.version>
751746
<jxrlib-all.version>${jxrlib.version}</jxrlib-all.version>
752747

753748
<!-- Bio-Formats - https://github.com/ome/bioformats -->

0 commit comments

Comments
 (0)