Move shade version to top pom.rb and add bundle dep change.

These changes are for Java 9 support, forced by module-info.class in invokebinder 1.10.
jruby · Oct 24, 2017 · 4c676ce · 4c676ce
1 parent bad1e15
commit 4c676ce
Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -261,7 +261,6 @@
 
 
   plugin :shade do
-    version( '3.1.0' )
     execute_goals( 'shade',
                    :id => 'create lib/jruby.jar',
                    :phase => 'package',

diff --git a/core/pom.xml b/core/pom.xml
@@ -602,7 +602,6 @@ DO NOT MODIFIY - GENERATED CODE
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
         <executions>
           <execution>
             <id>create lib/jruby.jar</id>

diff --git a/pom.rb b/pom.rb
@@ -128,7 +128,7 @@
     end
 
     plugin :compiler, '3.3'
-    plugin :shade, '2.4.3'
+    plugin :shade, '3.1.0'
     plugin :surefire, '2.15'
     plugin :plugin, '3.2'
     plugin( :invoker, '1.8',
@@ -148,6 +148,9 @@
 
     plugin 'org.eclipse.m2e:lifecycle-mapping:1.0.0'
     plugin :'scm-publish', '1.0-beta-2'
+    plugin 'org.apache.felix:maven-bundle-plugin' do
+      dependency(groupId: 'biz.aQute.bnd', artifactId: 'biz.aQute.bndlib', version: '3.5.0')
+    end
   end
 
   plugin( :site,

diff --git a/pom.xml b/pom.xml
@@ -285,7 +285,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>2.4.3</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -339,6 +339,17 @@ DO NOT MODIFIY - GENERATED CODE
           <artifactId>maven-scm-publish-plugin</artifactId>
           <version>1.0-beta-2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <dependencies>
+            <dependency>
+              <groupId>biz.aQute.bnd</groupId>
+              <artifactId>biz.aQute.bndlib</artifactId>
+              <version>3.5.0</version>
+            </dependency>
+          </dependencies>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>