update BC to 1.60 + prepare for Java 9+ compilation

Author: kares

Mavenfile

@@ -49,6 +49,7 @@ plugin( :compiler, '3.1',
         :source => '1.7', :target => java_target,
         :encoding => 'UTF-8', :debug => true,
         :showWarnings => true, :showDeprecation => true,
+        :excludes => [ 'module-info.java' ],
 
         :generatedSourcesDirectory => gen_sources,
         :annotationProcessors => [ 'org.jruby.anno.AnnotationBinder' ],
@@ -67,6 +68,11 @@ plugin( :compiler, '3.1',
       # NOTE: maybe '-J-Xbootclasspath/p:${unsafe.jar}' ... as well ?!
 end
 
+profile 'module-info' do
+  activation { jdk '[9,)' }
+  plugin :compiler, '3.1', :source => '9', :target => java_target, :includes => [ 'module-info.java' ]
+end
+
 plugin :clean do
   execute_goals( 'clean', :id => 'default-clean', :phase => 'clean',
                  'filesets' => [
@@ -97,15 +103,15 @@ supported_bc_versions = %w{ 1.55 1.56 1.57 1.58 1.59 }
 default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
 default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
 
-properties( 'jruby.plugins.version' => '1.0.10',
+properties( 'jruby.plugins.version' => '1.1.5',
             'jruby.versions' => '1.7.26',
             'bc.versions' => default_bc_version,
             'invoker.test' => '${bc.versions}',
             # allow to skip all tests with -Dmaven.test.skip
             'invoker.skip' => '${maven.test.skip}',
             'runit.dir' => 'src/test/ruby/**/test_*.rb',
             # use this version of jruby for ALL the jruby-maven-plugins
-            'jruby.version' => '1.7.26',
+            'jruby.version' => '9.1.17.0',
             # dump pom.xml as readonly when running 'rmvn'
             'polyglot.dump.pom' => 'pom.xml',
             'polyglot.dump.readonly' => true,

lib/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module JOpenSSL
-  VERSION = '0.10.1'
-  BOUNCY_CASTLE_VERSION = '1.59'
+  VERSION = '0.10.2.dev'
+  BOUNCY_CASTLE_VERSION = '1.60'
 end
 Jopenssl = JOpenSSL

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>jruby-openssl</artifactId>
-  <version>0.10.1</version>
+  <version>0.10.2.dev-SNAPSHOT</version>
   <packaging>gem</packaging>
   <name>JRuby OpenSSL</name>
   <description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>
@@ -57,18 +57,18 @@ DO NOT MODIFIY - GENERATED CODE
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <bc.versions>1.59</bc.versions>
-    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
-    <jruby.plugins.version>1.0.10</jruby.plugins.version>
+    <bc.versions>1.60</bc.versions>
     <invoker.skip>${maven.test.skip}</invoker.skip>
-    <jruby.version>1.7.26</jruby.version>
-    <runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
+    <invoker.test>${bc.versions}</invoker.test>
+    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <jruby.version>9.1.17.0</jruby.version>
     <jruby.versions>1.7.26</jruby.versions>
+    <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
+    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <polyglot.dump.readonly>true</polyglot.dump.readonly>
+    <runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
-    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <tesla.dump.readonly>true</tesla.dump.readonly>
-    <invoker.test>${bc.versions}</invoker.test>
   </properties>
   <dependencies>
     <dependency>
@@ -95,17 +95,17 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.59</version>
+      <version>1.60</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.59</version>
+      <version>1.60</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bctls-jdk15on</artifactId>
-      <version>1.59</version>
+      <version>1.60</version>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
@@ -284,6 +284,9 @@ DO NOT MODIFIY - GENERATED CODE
           <debug>true</debug>
           <showWarnings>true</showWarnings>
           <showDeprecation>true</showDeprecation>
+          <excludes>
+            <exclude>module-info.java</exclude>
+          </excludes>
           <generatedSourcesDirectory>${basedir}/target/generated-sources</generatedSourcesDirectory>
           <annotationProcessors>
             <annotationProcessor>org.jruby.anno.AnnotationBinder</annotationProcessor>
@@ -373,6 +376,27 @@ DO NOT MODIFIY - GENERATED CODE
     </plugins>
   </build>
   <profiles>
+    <profile>
+      <id>module-info</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.1</version>
+            <configuration>
+              <source>9</source>
+              <target>1.7</target>
+              <includes>
+                <include>module-info.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>test-1.7.18</id>
       <build>