Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 42241cd0a80a
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 19616da4f57c
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 21, 2015

  1. preparing for 0.9.13 + start exposing VERSION constant(s) directly on… 

    … Jopenssl module
    @kares
    kares committed Dec 21, 2015
    Copy the full SHA
    4776d35 View commit details

  2. gemspec - specify ruby-maven version to be somehow recent

    @kares
    kares committed Dec 21, 2015
    Copy the full SHA
    423db50 View commit details

  3. eval to avoid syntax errors due keyword arguments

    @kares
    kares committed Dec 21, 2015
    Copy the full SHA
    19616da View commit details
Showing with 12 additions and 7 deletions.
  1. +1 −1 jruby-openssl.gemspec
  2. +8 −3 lib/jopenssl/version.rb
  3. +1 −1 pom.xml
  4. +2 −2 src/test/ruby/ssl/test_socket.rb
2 changes: 1 addition & 1 deletion jruby-openssl.gemspec
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'jar-dependencies', '~> 0.1.0'

s.add_development_dependency 'mocha', '~> 1.1.0'
s.add_development_dependency 'ruby-maven'
s.add_development_dependency 'ruby-maven', '~> 3.0'
# NOTE: runit-maven-plugin will use it's own :
#s.add_development_dependency 'test-unit', '2.5.5'
end
11 changes: 8 additions & 3 deletions lib/jopenssl/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
module Jopenssl
VERSION = '0.9.13'
BOUNCY_CASTLE_VERSION = '1.50'
# @deprecated
module Version
VERSION = '0.9.13.dev'
BOUNCY_CASTLE_VERSION = '1.50'
# @private
VERSION = Jopenssl::VERSION
# @private
BOUNCY_CASTLE_VERSION = Jopenssl::BOUNCY_CASTLE_VERSION
end
end
end
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
<modelVersion>4.0.0</modelVersion>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.13.dev-SNAPSHOT</version>
<version>0.9.13</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>
4 changes: 2 additions & 2 deletions src/test/ruby/ssl/test_socket.rb
View file
Original file line number Diff line number Diff line change
@@ -61,9 +61,9 @@ def test_ssl_sysread_blocking_error
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
server_connect(port) do |ssl|
ssl.write("abc\n")
# assert_raise(TypeError) { ssl.sysread(4, exception: false) }
# assert_raise(TypeError) { eval 'ssl.sysread(4, exception: false)' }
buf = ''
assert_raise(ArgumentError) { ssl.sysread(4, buf, exception: false) }
assert_raise(ArgumentError) { eval 'ssl.sysread(4, buf, exception: false)' }
assert_equal '', buf
assert_equal buf.object_id, ssl.sysread(4, buf).object_id
assert_equal "abc\n", buf