|
202 | 202 | * org.apache.hadoop:hadoop-yarn-* |
203 | 203 | * org.apache.spark:spark-*_2.11 |
204 | 204 | * 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 |
209 | 206 | * com.github.jnr:jnr-ffi + org.jruby:jruby-core |
210 | 207 | --> |
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> |
212 | 209 |
|
213 | 210 | <!-- |
214 | 211 | NB: We override these properties to make the enforcer happy. |
|
705 | 702 | <!-- OME Model - https://github.com/ome/ome-model --> |
706 | 703 | <ome-xml.version>6.0.1</ome-xml.version> |
707 | 704 |
|
| 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 | + |
708 | 709 | <!-- Bio-Formats - https://github.com/ome/bioformats --> |
709 | 710 | <bio-formats.version>6.5.0</bio-formats.version> |
710 | 711 | <bio-formats_plugins.version>${bio-formats.version}</bio-formats_plugins.version> |
|
2425 | 2426 | <version>${ome-xml.version}</version> |
2426 | 2427 | </dependency> |
2427 | 2428 |
|
| 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 | + |
2428 | 2436 | <!-- Bio-Formats - https://github.com/ome/bioformats --> |
2429 | 2437 | <dependency> |
2430 | 2438 | <groupId>ome</groupId> |
|
3971 | 3979 | <metakit.version>LATEST</metakit.version> |
3972 | 3980 | <ome-poi.version>LATEST</ome-poi.version> |
3973 | 3981 | <ome-xml.version>LATEST</ome-xml.version> |
| 3982 | + <jxrlib-all.version>LATEST</jxrlib-all.version> |
3974 | 3983 | <bio-formats.version>LATEST</bio-formats.version> |
3975 | 3984 | <omero-blitz.version>LATEST</omero-blitz.version> |
3976 | 3985 | <omero-common.version>LATEST</omero-common.version> |
|
0 commit comments