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: 1ace795c8abf
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: 9f879f2417f7
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 1, 2017

  1. README update with compatibility (plans) for 0.10.0

    @kares
    kares committed Nov 1, 2017
    Copy the full SHA
    d57e258 View commit details

  2. upgrade BC - include the JSSE provider as we're planning on using it

    @kares
    kares committed Nov 1, 2017
    Copy the full SHA
    9f879f2 View commit details
Showing with 43 additions and 40 deletions.
  1. +3 −3 Mavenfile
  2. +2 −1 README.md
  3. +3 −2 jruby-openssl.gemspec
  4. +4 −2 lib/jopenssl/load.rb
  5. +1 −1 lib/jopenssl/version.rb
  6. +30 −31 pom.xml
6 changes: 3 additions & 3 deletions Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -100,20 +100,20 @@ plugin :deploy, '2.8.1' do
execute_goals( :deploy, :skip => false )
end

supported_bc_versions = %w{ 1.51 1.52 1.53 1.54 } # due EC support dropped <= 1.50
supported_bc_versions = %w{ 1.54 1.55 1.56 1.57 1.58 } # due EC support dropped <= 1.50

default_bc_version = 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',
'jruby.versions' => '1.7.18',
'jruby.versions' => '1.7.20',
'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.18',
'jruby.version' => '1.7.20',
# dump pom.xml as readonly when running 'rmvn'
'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,8 @@ the JRuby [mailing list][1] or the [bug tracker][2].
| 0.9.13 | 1.6.8-9.1.2 | Java 6-8 | 1.49-1.52 |
| 0.9.14 | 1.6.8-9.1.5 | Java 6-8 | 1.49-1.54 |
| 0.9.17 | 1.6.8-9.1.5 | Java 6-8 | 1.50-1.54 |
| 0.9.18 | 1.6.8-9.1.7 | Java 6-8 | 1.50-1.55 |
| ~>0.9.18 | 1.6.8-9.1.x | Java 6-8 | 1.50-1.55 |
| 0.10.0 | 1.7.20-9.2.x | Java 7-9 | 1.54-1.58 |

NOTE: backwards JRuby compatibility was not handled for versions <= **0.9.6**

5 changes: 3 additions & 2 deletions jruby-openssl.gemspec
View file
Original file line number Diff line number Diff line change
@@ -26,8 +26,9 @@ Gem::Specification.new do |s|
bc_version = version_rb.match( /.*\sBOUNCY_CASTLE_VERSION\s*=\s*['"](.*)['"]/ )[1]
raise 'BOUNCY_CASTLE_VERSION not matched' if (bc_version || '').empty?

s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{bc_version}"
s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{bc_version}"
s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{bc_version}" # Provider
s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{bc_version}" # PKIX/CMS/EAC/PKCSOCSP/TSP/OPENSSL
s.requirements << "jar org.bouncycastle:bctls-jdk15on, #{bc_version}" # DTLS/TLS API/JSSE Provider

s.required_ruby_version = '>= 1.9.3'
s.required_rubygems_version = '>= 2.4.8'
6 changes: 4 additions & 2 deletions lib/jopenssl/load.rb
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,17 @@
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 )
require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', version )
require_jar( 'org.bouncycastle', 'bctls-jdk15on', version )
bc_jars = true
rescue LoadError
bc_jars = false
end
unless bc_jars
load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
load "org/bouncycastle/bcprov-jdk15on/#{version}/bcprov-jdk15on-#{version}.jar"
load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
load "org/bouncycastle/bctls-jdk15on/#{version}/bctls-jdk15on-#{version}.jar"
end
end

2 changes: 1 addition & 1 deletion lib/jopenssl/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Jopenssl
VERSION = '0.10.0.dev'
BOUNCY_CASTLE_VERSION = '1.56'
BOUNCY_CASTLE_VERSION = '1.57'
end
61 changes: 30 additions & 31 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -58,12 +58,11 @@ DO NOT MODIFIY - GENERATED CODE
</distributionManagement>
<properties>
<bc.versions></bc.versions>
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<invoker.skip>${maven.test.skip}</invoker.skip>
<jruby.version>1.7.18</jruby.version>
<jruby.version>1.7.20</jruby.version>
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
<jruby.versions>1.7.18</jruby.versions>
<jruby.versions>1.7.20</jruby.versions>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
@@ -92,15 +91,20 @@ DO NOT MODIFIY - GENERATED CODE
<type>gem</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.57</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.56</version>
<version>1.57</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.56</version>
<artifactId>bctls-jdk15on</artifactId>
<version>1.57</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
@@ -117,8 +121,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependencies>
<repositories>
<repository>
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
<repository>
<releases>
@@ -133,11 +137,6 @@ DO NOT MODIFIY - GENERATED CODE
</repositories>
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>${mavengem.wagon.version}</version>
</extension>
<extension>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-with-jar-extension</artifactId>
@@ -412,7 +411,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.13</jruby.versions>
</properties>
@@ -450,7 +449,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.15</jruby.versions>
</properties>
@@ -488,7 +487,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.16</jruby.versions>
</properties>
@@ -526,7 +525,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.18</jruby.versions>
</properties>
@@ -564,7 +563,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.20</jruby.versions>
</properties>
@@ -602,7 +601,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.22</jruby.versions>
</properties>
@@ -640,7 +639,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.23</jruby.versions>
</properties>
@@ -678,7 +677,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.24</jruby.versions>
</properties>
@@ -716,7 +715,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.25</jruby.versions>
</properties>
@@ -754,7 +753,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.26</jruby.versions>
</properties>
@@ -792,7 +791,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.27</jruby.versions>
</properties>
@@ -830,7 +829,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.version>9.0.1.0</jruby.version>
<jruby.versions>9.0.1.0</jruby.versions>
</properties>
@@ -868,7 +867,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.version>9.0.5.0</jruby.version>
<jruby.versions>9.0.5.0</jruby.versions>
</properties>
@@ -906,7 +905,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.version>9.1.2.0</jruby.version>
<jruby.versions>9.1.2.0</jruby.versions>
</properties>
@@ -944,7 +943,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.version>9.1.5.0</jruby.version>
<jruby.versions>9.1.5.0</jruby.versions>
</properties>
@@ -982,7 +981,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.version>9.1.8.0</jruby.version>
<jruby.versions>9.1.8.0</jruby.versions>
</properties>
@@ -1020,7 +1019,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.version>9.1.12.0</jruby.version>
<jruby.versions>9.1.12.0</jruby.versions>
</properties>
@@ -1058,7 +1057,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<jruby.version>9.1.13.0</jruby.version>
<jruby.versions>9.1.13.0</jruby.versions>
</properties>