jruby · Sep 17, 2014 · Sep 17, 2014 · Sep 17, 2014
diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb
@@ -20,8 +20,10 @@
               'main.basedir' => '${project.parent.parent.basedir}',
               'jruby.complete.home' => '${project.build.outputDirectory}/META-INF/jruby.home' )
 
-  jar 'org.jruby:jruby-core:${project.version}'
-  jar 'org.jruby:jruby-stdlib:${project.version}'
+  scope :provided do
+    jar 'org.jruby:jruby-core:${project.version}'
+    jar 'org.jruby:jruby-stdlib:${project.version}'
+  end
 
   plugin( 'org.apache.felix:maven-bundle-plugin',
           'archive' => {
@@ -33,7 +35,7 @@
             'Export-Package' => 'org.jruby.*;version=${project.version}',
             'Import-Package' => '!org.jruby.*, *;resolution:=optional',
             'DynamicImport-Package' => 'javax.*',
-            'Embed-Dependency' => '*;type=jar;scope=compile|runtime;inline=true',
+            'Embed-Dependency' => '*;type=jar;scope=provided;inline=true',
             'Embed-Transitive' => true,
             'Private-Package' => '*,.',
             'Bundle-Name' => 'JRuby ${project.version}',

diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
@@ -23,11 +23,13 @@
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
       <version>${project.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-stdlib</artifactId>
       <version>${project.version}</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
   <pluginRepositories>
@@ -61,7 +63,7 @@
             <Export-Package>org.jruby.*;version=${project.version}</Export-Package>
             <Import-Package>!org.jruby.*, *;resolution:=optional</Import-Package>
             <DynamicImport-Package>javax.*</DynamicImport-Package>
-            <Embed-Dependency>*;type=jar;scope=compile|runtime;inline=true</Embed-Dependency>
+            <Embed-Dependency>*;type=jar;scope=provided;inline=true</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
             <Private-Package>*,.</Private-Package>
             <Bundle-Name>JRuby ${project.version}</Bundle-Name>

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 'bundle'
+  packaging 'jar'
 
   properties( 'tesla.dump.pom' => 'pom.xml',
               'tesla.dump.readOnly' => true,
@@ -22,15 +22,7 @@
               '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( :jar, :archive => { :manifestFile => '${project.build.outputDirectory}/META-INF/MANIFEST.MF' } )
 
   plugin( :source,
           'skipSource' =>  'true' )
@@ -101,6 +93,11 @@
       excludes 'bin/jruby', 'bin/jruby*_*', 'bin/jruby*-*', '**/.*', 'lib/ruby/shared/rubygems/defaults/jruby_native.rb'
       target_path '${jruby.complete.home}'
     end
+
+    resource do
+      directory '${basedir}/src/main/resources'
+      filtering true
+    end
   end
 
 end
diff --git a/maven/jruby-stdlib/pom.xml b/maven/jruby-stdlib/pom.xml
@@ -8,7 +8,6 @@
     <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>
@@ -61,18 +60,18 @@
           <exclude>lib/ruby/shared/rubygems/defaults/jruby_native.rb</exclude>
         </excludes>
       </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources</directory>
+      </resource>
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
+        <artifactId>maven-jar-plugin</artifactId>
         <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>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
         </configuration>
       </plugin>
       <plugin>

diff --git a/maven/jruby-stdlib/src/emtpy.jar b/maven/jruby-stdlib/src/emtpy.jar
diff --git a/maven/jruby-stdlib/src/main/resources/META-INF/MANIFEST.MF b/maven/jruby-stdlib/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-Description: JRuby Stdlib @project.version@ OSGi bundle
+Bundle-DocURL: http://jruby.org
+Bundle-License: http://www.gnu.org/licenses/gpl-3.0-standalone.html, htt
+ p://www.gnu.org/licenses/lgpl-3.0-standalone.html, http://www.eclipse.o
+ rg/legal/epl-v10.html
+Bundle-ManifestVersion: 2
+Bundle-Name: JRuby Stdlib @project.version@
+Bundle-SymbolicName: org.jruby.jruby-stdlib
+Bundle-Vendor: JRuby
+Bundle-Version: @project.version@
+Created-By: Apache Maven Bundle Plugin