From ec3e50393c91865d59e84933aeca3c050423ef73 Mon Sep 17 00:00:00 2001
From: Christian Meier <m.kristian@web.de>
Date: Fri, 23 Jan 2015 13:58:28 +0000
Subject: [PATCH] pack jni/* native libraries only in lib/jruby.jar

---
 core/pom.rb                                  | 22 ------------
 core/pom.xml                                 | 38 --------------------
 maven/jruby-dist/src/main/assembly/jruby.xml |  8 ++++-
 3 files changed, 7 insertions(+), 61 deletions(-)

diff --git a/core/pom.rb b/core/pom.rb
index db5a912288b..f08ee54fad0 100644
--- a/core/pom.rb
+++ b/core/pom.rb
@@ -299,28 +299,6 @@
 
   end
 
-  profile 'native' do
-
-    activation do
-      file( :missing => '../lib/jni' )
-    end
-
-    plugin :dependency do
-      execute_goals( 'unpack',
-                     :id => 'unzip native',
-                     :phase => 'process-classes',
-                     'excludes' =>  'META-INF,META-INF/*',
-                     'artifactItems' => [ { 'groupId' =>  'com.github.jnr',
-                                            'artifactId' =>  'jffi',
-                                            'version' =>  '${jffi.version}',
-                                            'type' =>  'jar',
-                                            'classifier' =>  'native',
-                                            'overWrite' =>  'false',
-                                            'outputDirectory' =>  '${jruby.basedir}/lib' } ] )
-    end
-
-  end
-
   profile 'test' do
 
     properties( 'maven.test.skip' => 'false' )
diff --git a/core/pom.xml b/core/pom.xml
index 5a94870e4af..0157a8e18a5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1019,44 +1019,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>native</id>
-      <activation>
-        <file>
-          <missing>../lib/jni</missing>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unzip native</id>
-                <phase>process-classes</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <excludes>META-INF,META-INF/*</excludes>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>com.github.jnr</groupId>
-                      <artifactId>jffi</artifactId>
-                      <version>${jffi.version}</version>
-                      <type>jar</type>
-                      <classifier>native</classifier>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${jruby.basedir}/lib</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>test</id>
       <properties>
diff --git a/maven/jruby-dist/src/main/assembly/jruby.xml b/maven/jruby-dist/src/main/assembly/jruby.xml
index 983b57fb431..b884cdfa16b 100644
--- a/maven/jruby-dist/src/main/assembly/jruby.xml
+++ b/maven/jruby-dist/src/main/assembly/jruby.xml
@@ -23,6 +23,13 @@
         <include>specifications/*</include>
         <include>gems/**/*</include>
       </includes>
+      <excludes>
+        <exclude>gems/*/spec</exclude>
+        <exclude>gems/*/specs</exclude>
+        <exclude>gems/*/test</exclude>
+        <exclude>gems/*/tests</exclude>
+        <exclude>gems/*/features</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.parent.parent.basedir}</directory>
@@ -31,7 +38,6 @@
         <include>LICENSE*</include>
         <include>COPYING*</include>
         <include>lib/jruby.jar</include>
-        <include>lib/jni/**/*</include>
         <include>samples/**/*</include>
         <include>docs/**/*</include>
         <include>tool/nailgun/*</include>