Merge branch 'master' into truffle-head

Author: chrisseaton

.gitignore

@@ -48,7 +48,7 @@ lib/ruby/stdlib/jar*
 lib/ruby/stdlib/jline
 lib/ruby/stdlib/jopenssl*
 lib/ruby/stdlib/krypt*
-lib/ruby/stdlib/openssl
+lib/ruby/stdlib/openssl*
 lib/ruby/stdlib/org/
 lib/ruby/stdlib/readline/*readline*.jar
 lib/ruby/stdlib/ripper.jar

antlib/extra.xml

@@ -25,7 +25,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -136,7 +136,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -152,7 +152,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -168,7 +168,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -460,7 +460,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>

core/pom.xml

@@ -91,6 +91,7 @@
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-enxio</artifactId>
       <version>0.9</version>
+      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -101,6 +102,7 @@
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
       <version>0.8</version>
+      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -116,6 +118,7 @@
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-ffi</artifactId>
       <version>2.0.3</version>
+      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

core/src/main/java/org/jruby/Ruby.java

@@ -1288,7 +1288,7 @@ && getInstanceConfig().getCompileMode() != CompileMode.TRUFFLE) {
         // attempt to enable unlimited-strength crypto on OpenJDK
         try {
             Class jceSecurity = Class.forName("javax.crypto.JceSecurity");
-            Field isRestricted = jceSecurity.getField("isRestricted");
+            Field isRestricted = jceSecurity.getDeclaredField("isRestricted");
             isRestricted.setAccessible(true);
             isRestricted.set(null, false);
             isRestricted.setAccessible(false);