Commit b70632e
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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
208 | 208 | | |
209 | 209 | | |
210 | 210 | | |
| 211 | + | |
211 | 212 | | |
212 | | - | |
| 213 | + | |
213 | 214 | | |
214 | 215 | | |
215 | 216 | | |
| |||
0 commit comments