Skip to content

Commit b70632e

Browse files
committed
Ignore jruby-core + jnr-ffi conflicts
I don't like doing this, but jruby-core ships jnr-ffi unshaded, and jruby-core seems to be the most granular artifact available. :-( Since jython-slim depends properly on jnr-ffi, in order to support both jruby-core and jython-slim on the same classpath, we need to ignore this class overlap and just hope for the best version-wise.
1 parent 901eb4c commit b70632e

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,9 @@
208208
* ome:jxrlib-all + org.glassfish.jaxb:txw2
209209
* com.codahale.metrics:metrics-logback + io.dropwizard.metrics:metrics-logback
210210
* com.codahale.metrics:metrics-graphite + io.dropwizard.metrics:metrics-graphite
211+
* com.github.jnr:jnr-ffi + org.jruby:jruby-core
211212
-->
212-
<allowedDuplicateClasses>META-INF/versions/9/javax.xml.bind.ModuleUtil,com.codahale.metrics.graphite.*,com.codahale.metrics.logback.InstrumentedAppender,com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner</allowedDuplicateClasses>
213+
<allowedDuplicateClasses>META-INF/versions/9/javax.xml.bind.ModuleUtil,com.codahale.metrics.graphite.*,com.codahale.metrics.logback.InstrumentedAppender,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>
213214

214215
<!--
215216
NB: We override these properties to make the enforcer happy.

0 commit comments

Comments
 (0)