jruby-openssl 0.9.15-java → 0.9.16-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1eca49194c1e569399cf1f69f58931b9f10b39d
-  data.tar.gz: 68ff5238280115fbf52784551dae434696371a3a
+  metadata.gz: 390fcbe6a3e79904d716a3a01d5a0c57b8cb0f51
+  data.tar.gz: ccb36ce879e1f39966118141cc727893b8dea631
 SHA512:
-  metadata.gz: b06767ec261001f9f5b6a1603463b47dafacb62e6fb3162ffa04b7607441ad267c543e4b09ca123127494d0b455459fa5a655a50b71322bec9cd88ec0d9c3fe4
-  data.tar.gz: 4e9679d394c0fd2b07508a6e57c2c34727d29e9e8e4c3510b66825202c99a2a49ba23e657f29ef18fe728a266b8107be948a0b96e52a9a89645c3b8001fc397a
+  metadata.gz: 6d7195a55754d197680ad516e1b58fb66537236fa899f3d882ee9c41c57a378d0e86862145a33a11316b07e481ec45c1469b7f2c8a1f79d5b8b6d3cfeb0b2b40
+  data.tar.gz: efdfec47995c72101b7f9bafe6095a1c8a6f451e6f42fe066407897886b52b3d0d1997368192abfbe029c9de6d443d36f894d22d9f312dac2c5c1259fe20698c

data/History.md

@@ -1,3 +1,8 @@
+## 0.9.15
+
+* always return a Fixnum from `OpenSSL::SSL::Session#timeout`, OpenSSL defaults
+  to 300 (been causing net/http.rb issues with timeouts on JRuby 9K)
+
 ## 0.9.14
 
 * upgrade to using BC **1.54** as default (all versions >= 1.49 are supported)

data/Rakefile

@@ -42,6 +42,7 @@ Rake::TestTask.new do |task|
   task.test_files = test_files.map { |path| path.sub('src/test/ruby/', '') }
   task.verbose = true
   task.loader = :direct
+  task.ruby_opts = [ '-C', 'src/test/ruby', '-rbundler/setup' ]
 end
 task :test => 'lib/jopenssl.jar'
 

data/lib/jopenssl/load.rb

@@ -8,12 +8,13 @@ unless ENV_JAVA['jruby.openssl.load.jars'].eql?('false')
   version = Jopenssl::Version::BOUNCY_CASTLE_VERSION
   bc_jars = nil
   begin
+    require 'jar-dependencies'
     # if we have jar-dependencies we let it track the jars
     require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', version )
     require_jar( 'org.bouncycastle', 'bcprov-jdk15on', version )
     bc_jars = true
   rescue LoadError
-  end if defined?(Jars) && ( ! Jars.skip? ) rescue nil
+  end
   unless bc_jars
     load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
     load "org/bouncycastle/bcprov-jdk15on/#{version}/bcprov-jdk15on-#{version}.jar"

data/lib/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module Jopenssl
-  VERSION = '0.9.15'
+  VERSION = '0.9.16'
   BOUNCY_CASTLE_VERSION = '1.54'
   # @deprecated
   module Version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: java
 authors:
 - Ola Bini
@@ -9,50 +9,50 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jar-dependencies
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
+  name: jar-dependencies
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: mocha
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
+  name: mocha
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+  name: ruby-maven
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
 email: ola.bini@gmail.com
 executables: []
@@ -63,6 +63,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/jopenssl.jar
 - lib/jopenssl/load.rb
 - lib/jopenssl/version.rb
 - lib/jopenssl18/openssl.rb
@@ -125,7 +126,6 @@ files:
 - lib/openssl/ssl.rb
 - lib/openssl/x509-internal.rb
 - lib/openssl/x509.rb
-- lib/jopenssl.jar
 - lib/org/bouncycastle/bcpkix-jdk15on/1.54/bcpkix-jdk15on-1.54.jar
 - lib/org/bouncycastle/bcprov-jdk15on/1.54/bcprov-jdk15on-1.54.jar
 homepage: https://github.com/jruby/jruby-openssl
@@ -152,8 +152,9 @@ requirements:
 - jar org.bouncycastle:bcpkix-jdk15on, 1.54
 - jar org.bouncycastle:bcprov-jdk15on, 1.54
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: JRuby OpenSSL
 test_files: []
+has_rdoc: