jruby · Sep 17, 2014 · Sep 17, 2014 · Sep 17, 2014 · Sep 17, 2014
diff --git a/core/pom.xml b/core/pom.xml
@@ -422,6 +422,27 @@
             </configuration>
           </execution>
         </executions>
+      </plugin>
+       <plugin>
+	 <groupId>org.apache.felix</groupId>
+	 <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+      <plugin>
+	<artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+           <configuration>
+             <archive>
+               <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+             </archive>
+           </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -45,7 +45,7 @@ def version
    ImportedGem.new( 'krypt-core', KRYPT_VERSION, true ),
    ImportedGem.new( 'krypt-provider-jdk', KRYPT_VERSION, true ),
    ImportedGem.new( 'ffi', '1.9.3', true ),
-   ImportedGem.new( 'jar-dependencies', '0.1.1', true )
+   ImportedGem.new( 'jar-dependencies', '0.1.2', true )
   ]
 
 project 'JRuby Lib Setup' do

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2</version>
       <type>gem</type>
     </dependency>
     <dependency>

diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb
@@ -21,9 +21,7 @@
               'jruby.complete.home' => '${project.build.outputDirectory}/META-INF/jruby.home' )
 
   jar 'org.jruby:jruby-core:${project.version}'
-  jar( 'org.jruby:jruby-stdlib:${project.version}',
-       :exclusions => [ 'org.bouncycastle:bcpkix-jdk15on',
-                        'org.bouncycastle:bcprov-jdk15on' ] )
+  jar 'org.jruby:jruby-stdlib:${project.version}'
 
   plugin( 'org.apache.felix:maven-bundle-plugin',
           'archive' => {

diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
@@ -28,16 +28,6 @@
       <groupId>org.jruby</groupId>
       <artifactId>jruby-stdlib</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>bcpkix-jdk15on</artifactId>
-          <groupId>org.bouncycastle</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>bcprov-jdk15on</artifactId>
-          <groupId>org.bouncycastle</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
   <pluginRepositories>

diff --git a/maven/jruby-dist/src/main/assembly/jruby.xml b/maven/jruby-dist/src/main/assembly/jruby.xml
@@ -19,6 +19,7 @@
       <directory>${project.build.directory}/rubygems</directory>
       <outputDirectory>/lib/ruby/gems/shared</outputDirectory>
       <includes>
+        <include>cache/*</include>
         <include>specifications/*</include>
         <include>gems/**/*</include>
       </includes>

diff --git a/maven/jruby-jars/jruby-jars.gemspec b/maven/jruby-jars/jruby-jars.gemspec
@@ -1,6 +1,5 @@
 #-*- mode: ruby -*-
 
-require 'rake'
 require 'rexml/document'
 require 'rexml/xpath'
 
@@ -17,7 +16,7 @@ Gem::Specification.new do |s|
   s.description = File.read('README.txt', encoding: 'UTF-8').split(/\n{2,}/)[3]
   s.rubyforge_project = 'jruby/jruby'
   s.licenses = %w(EPL-1.0 GPL-2.0 LGPL-2.1)
-  s.files = FileList['[A-Z]*', 'lib/**/*.rb', "lib/**/jruby-*-#{version}.jar", 'test/**/*'].to_a
+  s.files = Dir['[A-Z]*'] + Dir['lib/**/*.rb'] + Dir["lib/**/jruby-*-#{version}.jar"] + Dir['test/**/*']
 end
 
 # vim: syntax=Ruby
diff --git a/maven/jruby-noasm/pom.rb b/maven/jruby-noasm/pom.rb
@@ -9,7 +9,7 @@
   model_version '4.0.0'
   id "org.jruby:jruby-noasm:#{version}"
   inherit "org.jruby:jruby-artifacts:#{version}"
-  packaging 'jar'
+  packaging 'bundle'
 
   properties( 'tesla.dump.pom' => 'pom.xml',
               'tesla.dump.readOnly' => true,
@@ -24,6 +24,16 @@
                         'org.ow2.asm:asm-util' ] )
   jar 'org.jruby:jruby-stdlib:${project.version}'
 
+  plugin( 'org.apache.felix:maven-bundle-plugin',
+          :instructions => { 
+            'Bundle-Name' => 'JRuby ${project.version}',
+            'Bundle-Description' => 'JRuby ${project.version} OSGi bundle',
+            'Bundle-SymbolicName' => 'org.jruby.jruby'
+          } ) do
+    # TODO fix DSL
+    @current.extensions = true
+  end
+
   plugin( :source,
           'skipSource' =>  'true' )
   plugin 'org.codehaus.mojo:build-helper-maven-plugin' do

diff --git a/maven/jruby-noasm/pom.xml b/maven/jruby-noasm/pom.xml
@@ -8,6 +8,7 @@
     <version>1.7.16-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-noasm</artifactId>
+  <packaging>bundle</packaging>
   <name>JRuby Main Maven Artifact With ASM Relocated</name>
   <properties>
     <jruby.basedir>${basedir}/../../</jruby.basedir>
@@ -52,6 +53,18 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-Name>JRuby ${project.version}</Bundle-Name>
+            <Bundle-Description>JRuby ${project.version} OSGi bundle</Bundle-Description>
+            <Bundle-SymbolicName>org.jruby.jruby</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <configuration>

diff --git a/maven/jruby-stdlib/pom.rb b/maven/jruby-stdlib/pom.rb
@@ -9,7 +9,7 @@
   model_version '4.0.0'
   id "org.jruby:jruby-stdlib:#{version}"
   inherit "org.jruby:jruby-artifacts:#{version}"
-  packaging 'jar'
+  packaging 'bundle'
 
   properties( 'tesla.dump.pom' => 'pom.xml',
               'tesla.dump.readOnly' => true,
@@ -22,6 +22,16 @@
               'gem.home' => '${jruby.basedir}/lib/ruby/gems/shared',
               'jruby.complete.home' => '${project.build.outputDirectory}/META-INF/jruby.home' )
 
+  plugin( 'org.apache.felix:maven-bundle-plugin',
+          :instructions => { 
+            'Bundle-Name' => 'JRuby Stdlib ${project.version}',
+            'Bundle-Description' => 'JRuby Stdlib ${project.version} OSGi bundle',
+            'Bundle-SymbolicName' => 'org.jruby.jruby-stdlib'
+          } ) do
+    # TODO fix DSL
+    @current.extensions = true
+  end
+
   plugin( :source,
           'skipSource' =>  'true' )
   plugin 'de.saumya.mojo:gem-maven-plugin:${jruby.plugins.version}' do

diff --git a/maven/jruby-stdlib/pom.xml b/maven/jruby-stdlib/pom.xml
@@ -8,6 +8,7 @@
     <version>1.7.16-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
+  <packaging>bundle</packaging>
   <name>JRuby Stdlib</name>
   <properties>
     <jruby.complete.gems>${jruby.complete.home}/lib/ruby/gems/shared</jruby.complete.gems>
@@ -62,6 +63,18 @@
       </resource>
     </resources>
     <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-Name>JRuby Stdlib ${project.version}</Bundle-Name>
+            <Bundle-Description>JRuby Stdlib ${project.version} OSGi bundle</Bundle-Description>
+            <Bundle-SymbolicName>org.jruby.jruby-stdlib</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <configuration>

diff --git a/maven/jruby/pom.rb b/maven/jruby/pom.rb
@@ -9,7 +9,7 @@
   model_version '4.0.0'
   id "org.jruby:jruby:#{version}"
   inherit "org.jruby:jruby-artifacts:#{version}"
-  packaging 'jar'
+  packaging 'bundle'
 
   properties( 'tesla.dump.pom' => 'pom.xml',
               'tesla.dump.readOnly' => true,
@@ -19,6 +19,16 @@
   jar 'org.jruby:jruby-core:${project.version}'
   jar 'org.jruby:jruby-stdlib:${project.version}'
 
+  plugin( 'org.apache.felix:maven-bundle-plugin',
+          :instructions => { 
+            'Bundle-Name' => 'JRuby ${project.version}',
+            'Bundle-Description' => 'JRuby ${project.version} OSGi bundle',
+            'Bundle-SymbolicName' => 'org.jruby.jruby'
+          } ) do
+    # TODO fix DSL
+    @current.extensions = true
+  end
+
   plugin( :source,
           'skipSource' =>  'true' )
   plugin 'org.codehaus.mojo:build-helper-maven-plugin' do

diff --git a/maven/jruby/pom.xml b/maven/jruby/pom.xml
@@ -8,6 +8,7 @@
     <version>1.7.16-SNAPSHOT</version>
   </parent>
   <artifactId>jruby</artifactId>
+  <packaging>bundle</packaging>
   <name>JRuby Main Maven Artifact</name>
   <properties>
     <jruby.basedir>${basedir}/../../</jruby.basedir>
@@ -30,6 +31,18 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-Name>JRuby ${project.version}</Bundle-Name>
+            <Bundle-Description>JRuby ${project.version} OSGi bundle</Bundle-Description>
+            <Bundle-SymbolicName>org.jruby.jruby</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <configuration>