Skip to content

Commit

Permalink
Do not exclude native bits from jar; they fail to load from file.
Browse files Browse the repository at this point in the history
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.
headius committed May 21, 2015
1 parent 6c53669 commit ae31756
Showing 2 changed files with 1 addition and 7 deletions.
3 changes: 1 addition & 2 deletions core/pom.rb
Original file line number Diff line number Diff line change
@@ -252,8 +252,7 @@
'shadedPattern' => 'org.jruby.org.objectweb' } ],
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ],
:artifactSet => { :excludes => ['com.github.jnr:jffi:native'] } )
'mainClass' => 'org.jruby.Main' } ] )
end

[:release, :main, :osgi, :j2ee, :complete, :dist, :'jruby_complete_jar_extended', :'jruby-jars' ].each do |name|
5 changes: 0 additions & 5 deletions core/pom.xml
Original file line number Diff line number Diff line change
@@ -544,11 +544,6 @@
<mainClass>org.jruby.Main</mainClass>
</transformer>
</transformers>
<artifactSet>
<excludes>
<exclude>com.github.jnr:jffi:native</exclude>
</excludes>
</artifactSet>
</configuration>
</execution>
</executions>

0 comments on commit ae31756

Please sign in to comment.