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: 96f6519fb210
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: dbb1711b045c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 2, 2016

  1. add hard dependency to jar-dependencies - fixes #74

    @mkristian
    mkristian committed Mar 2, 2016
    Copy the full SHA
    66a64bb View commit details

  2. prepare release

    @mkristian
    mkristian committed Mar 2, 2016
    Copy the full SHA
    dbb1711 View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −1 lib/jopenssl/load.rb
  2. +1 −1 lib/jopenssl/version.rb
  3. +1 −1 pom.xml
3 changes: 2 additions & 1 deletion lib/jopenssl/load.rb
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,13 @@
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"
2 changes: 1 addition & 1 deletion lib/jopenssl/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Jopenssl
VERSION = '0.9.16.dev'
VERSION = '0.9.16'
BOUNCY_CASTLE_VERSION = '1.54'
# @deprecated
module Version
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.16.dev-SNAPSHOT</version>
<version>0.9.16</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>