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.
jruby · May 21, 2015 · ae31756 · ae31756
1 parent 6c53669
commit ae31756
Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -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|

diff --git a/core/pom.xml b/core/pom.xml
@@ -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>