Skip to content

Commit ae31756

Browse files
committed
Do not exclude native bits from jar; they fail to load from file.
It appears our logic (or jffi's logic) for loading the jni stubs is not working right with the lib/jni unpacked versions. With this exclude in place, jffi can't load unless you are in the JRuby dir. Reverting this change for the moment.
1 parent 6c53669 commit ae31756

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

core/pom.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,7 @@
252252
'shadedPattern' => 'org.jruby.org.objectweb' } ],
253253
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
254254
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
255-
'mainClass' => 'org.jruby.Main' } ],
256-
:artifactSet => { :excludes => ['com.github.jnr:jffi:native'] } )
255+
'mainClass' => 'org.jruby.Main' } ] )
257256
end
258257

259258
[:release, :main, :osgi, :j2ee, :complete, :dist, :'jruby_complete_jar_extended', :'jruby-jars' ].each do |name|

core/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -544,11 +544,6 @@
544544
<mainClass>org.jruby.Main</mainClass>
545545
</transformer>
546546
</transformers>
547-
<artifactSet>
548-
<excludes>
549-
<exclude>com.github.jnr:jffi:native</exclude>
550-
</excludes>
551-
</artifactSet>
552547
</configuration>
553548
</execution>
554549
</executions>

0 commit comments

Comments
 (0)