Skip to content

Commit 9f879f2

Browse files
kareskares
committed
upgrade BC - include the JSSE provider as we're planning on using it
1 parent d57e258 commit 9f879f2

File tree

6 files changed

+42
-40
lines changed

6 files changed

+42
-40
lines changed

‎Mavenfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,20 @@ plugin :deploy, '2.8.1' do
100100
execute_goals( :deploy, :skip => false )
101101
end
102102

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

105105
default_bc_version = File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
106106
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
107107

108108
properties( 'jruby.plugins.version' => '1.0.10',
109-
'jruby.versions' => '1.7.18',
109+
'jruby.versions' => '1.7.20',
110110
'bc.versions' => default_bc_version,
111111
'invoker.test' => '${bc.versions}',
112112
# allow to skip all tests with -Dmaven.test.skip
113113
'invoker.skip' => '${maven.test.skip}',
114114
'runit.dir' => 'src/test/ruby/**/test_*.rb',
115115
# use this version of jruby for ALL the jruby-maven-plugins
116-
'jruby.version' => '1.7.18',
116+
'jruby.version' => '1.7.20',
117117
# dump pom.xml as readonly when running 'rmvn'
118118
'polyglot.dump.pom' => 'pom.xml',
119119
'polyglot.dump.readonly' => true,

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ the JRuby [mailing list][1] or the [bug tracker][2].
2222
| 0.9.14 | 1.6.8-9.1.5 | Java 6-8 | 1.49-1.54 |
2323
| 0.9.17 | 1.6.8-9.1.5 | Java 6-8 | 1.50-1.54 |
2424
| ~>0.9.18 | 1.6.8-9.1.x | Java 6-8 | 1.50-1.55 |
25-
| 0.10.0 | 1.7.20-9.2.x | Java 7-9 | 1.54-1.56? |
25+
| 0.10.0 | 1.7.20-9.2.x | Java 7-9 | 1.54-1.58 |
2626

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

‎jruby-openssl.gemspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ Gem::Specification.new do |s|
2626
bc_version = version_rb.match( /.*\sBOUNCY_CASTLE_VERSION\s*=\s*['"](.*)['"]/ )[1]
2727
raise 'BOUNCY_CASTLE_VERSION not matched' if (bc_version || '').empty?
2828

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

3233
s.required_ruby_version = '>= 1.9.3'
3334
s.required_rubygems_version = '>= 2.4.8'

‎lib/jopenssl/load.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@
1212
begin
1313
require 'jar-dependencies'
1414
# if we have jar-dependencies we let it track the jars
15-
require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', version )
1615
require_jar( 'org.bouncycastle', 'bcprov-jdk15on', version )
16+
require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', version )
17+
require_jar( 'org.bouncycastle', 'bctls-jdk15on', version )
1718
bc_jars = true
1819
rescue LoadError
1920
bc_jars = false
2021
end
2122
unless bc_jars
22-
load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
2323
load "org/bouncycastle/bcprov-jdk15on/#{version}/bcprov-jdk15on-#{version}.jar"
24+
load "org/bouncycastle/bcpkix-jdk15on/#{version}/bcpkix-jdk15on-#{version}.jar"
25+
load "org/bouncycastle/bctls-jdk15on/#{version}/bctls-jdk15on-#{version}.jar"
2426
end
2527
end
2628

‎lib/jopenssl/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Jopenssl
22
VERSION = '0.10.0.dev'
3-
BOUNCY_CASTLE_VERSION = '1.56'
3+
BOUNCY_CASTLE_VERSION = '1.57'
44
end

‎pom.xml

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,11 @@ DO NOT MODIFIY - GENERATED CODE
5858
</distributionManagement>
5959
<properties>
6060
<bc.versions></bc.versions>
61-
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
6261
<jruby.plugins.version>1.0.10</jruby.plugins.version>
6362
<invoker.skip>${maven.test.skip}</invoker.skip>
64-
<jruby.version>1.7.18</jruby.version>
63+
<jruby.version>1.7.20</jruby.version>
6564
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
66-
<jruby.versions>1.7.18</jruby.versions>
65+
<jruby.versions>1.7.20</jruby.versions>
6766
<polyglot.dump.readonly>true</polyglot.dump.readonly>
6867
<tesla.dump.pom>pom.xml</tesla.dump.pom>
6968
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
@@ -92,15 +91,20 @@ DO NOT MODIFIY - GENERATED CODE
9291
<type>gem</type>
9392
<scope>test</scope>
9493
</dependency>
94+
<dependency>
95+
<groupId>org.bouncycastle</groupId>
96+
<artifactId>bcprov-jdk15on</artifactId>
97+
<version>1.57</version>
98+
</dependency>
9599
<dependency>
96100
<groupId>org.bouncycastle</groupId>
97101
<artifactId>bcpkix-jdk15on</artifactId>
98-
<version>1.56</version>
102+
<version>1.57</version>
99103
</dependency>
100104
<dependency>
101105
<groupId>org.bouncycastle</groupId>
102-
<artifactId>bcprov-jdk15on</artifactId>
103-
<version>1.56</version>
106+
<artifactId>bctls-jdk15on</artifactId>
107+
<version>1.57</version>
104108
</dependency>
105109
<dependency>
106110
<groupId>org.jruby</groupId>
@@ -117,8 +121,8 @@ DO NOT MODIFIY - GENERATED CODE
117121
</dependencies>
118122
<repositories>
119123
<repository>
120-
<id>mavengems</id>
121-
<url>mavengem:https://rubygems.org</url>
124+
<id>rubygems-releases</id>
125+
<url>http://rubygems-proxy.torquebox.org/releases</url>
122126
</repository>
123127
<repository>
124128
<releases>
@@ -133,11 +137,6 @@ DO NOT MODIFIY - GENERATED CODE
133137
</repositories>
134138
<build>
135139
<extensions>
136-
<extension>
137-
<groupId>org.torquebox.mojo</groupId>
138-
<artifactId>mavengem-wagon</artifactId>
139-
<version>${mavengem.wagon.version}</version>
140-
</extension>
141140
<extension>
142141
<groupId>de.saumya.mojo</groupId>
143142
<artifactId>gem-with-jar-extension</artifactId>
@@ -412,7 +411,7 @@ DO NOT MODIFIY - GENERATED CODE
412411
</plugins>
413412
</build>
414413
<properties>
415-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
414+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
416415
<jruby.modes>1.9,2.0</jruby.modes>
417416
<jruby.versions>1.7.13</jruby.versions>
418417
</properties>
@@ -450,7 +449,7 @@ DO NOT MODIFIY - GENERATED CODE
450449
</plugins>
451450
</build>
452451
<properties>
453-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
452+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
454453
<jruby.modes>1.9,2.0</jruby.modes>
455454
<jruby.versions>1.7.15</jruby.versions>
456455
</properties>
@@ -488,7 +487,7 @@ DO NOT MODIFIY - GENERATED CODE
488487
</plugins>
489488
</build>
490489
<properties>
491-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
490+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
492491
<jruby.modes>1.9,2.0</jruby.modes>
493492
<jruby.versions>1.7.16</jruby.versions>
494493
</properties>
@@ -526,7 +525,7 @@ DO NOT MODIFIY - GENERATED CODE
526525
</plugins>
527526
</build>
528527
<properties>
529-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
528+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
530529
<jruby.modes>1.9,2.0</jruby.modes>
531530
<jruby.versions>1.7.18</jruby.versions>
532531
</properties>
@@ -564,7 +563,7 @@ DO NOT MODIFIY - GENERATED CODE
564563
</plugins>
565564
</build>
566565
<properties>
567-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
566+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
568567
<jruby.modes>1.9,2.0</jruby.modes>
569568
<jruby.versions>1.7.20</jruby.versions>
570569
</properties>
@@ -602,7 +601,7 @@ DO NOT MODIFIY - GENERATED CODE
602601
</plugins>
603602
</build>
604603
<properties>
605-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
604+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
606605
<jruby.modes>1.9,2.0</jruby.modes>
607606
<jruby.versions>1.7.22</jruby.versions>
608607
</properties>
@@ -640,7 +639,7 @@ DO NOT MODIFIY - GENERATED CODE
640639
</plugins>
641640
</build>
642641
<properties>
643-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
642+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
644643
<jruby.modes>1.9,2.0</jruby.modes>
645644
<jruby.versions>1.7.23</jruby.versions>
646645
</properties>
@@ -678,7 +677,7 @@ DO NOT MODIFIY - GENERATED CODE
678677
</plugins>
679678
</build>
680679
<properties>
681-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
680+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
682681
<jruby.modes>1.9,2.0</jruby.modes>
683682
<jruby.versions>1.7.24</jruby.versions>
684683
</properties>
@@ -716,7 +715,7 @@ DO NOT MODIFIY - GENERATED CODE
716715
</plugins>
717716
</build>
718717
<properties>
719-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
718+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
720719
<jruby.modes>1.9,2.0</jruby.modes>
721720
<jruby.versions>1.7.25</jruby.versions>
722721
</properties>
@@ -754,7 +753,7 @@ DO NOT MODIFIY - GENERATED CODE
754753
</plugins>
755754
</build>
756755
<properties>
757-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
756+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
758757
<jruby.modes>1.9,2.0</jruby.modes>
759758
<jruby.versions>1.7.26</jruby.versions>
760759
</properties>
@@ -792,7 +791,7 @@ DO NOT MODIFIY - GENERATED CODE
792791
</plugins>
793792
</build>
794793
<properties>
795-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
794+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
796795
<jruby.modes>1.9,2.0</jruby.modes>
797796
<jruby.versions>1.7.27</jruby.versions>
798797
</properties>
@@ -830,7 +829,7 @@ DO NOT MODIFIY - GENERATED CODE
830829
</plugins>
831830
</build>
832831
<properties>
833-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
832+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
834833
<jruby.version>9.0.1.0</jruby.version>
835834
<jruby.versions>9.0.1.0</jruby.versions>
836835
</properties>
@@ -868,7 +867,7 @@ DO NOT MODIFIY - GENERATED CODE
868867
</plugins>
869868
</build>
870869
<properties>
871-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
870+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
872871
<jruby.version>9.0.5.0</jruby.version>
873872
<jruby.versions>9.0.5.0</jruby.versions>
874873
</properties>
@@ -906,7 +905,7 @@ DO NOT MODIFIY - GENERATED CODE
906905
</plugins>
907906
</build>
908907
<properties>
909-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
908+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
910909
<jruby.version>9.1.2.0</jruby.version>
911910
<jruby.versions>9.1.2.0</jruby.versions>
912911
</properties>
@@ -944,7 +943,7 @@ DO NOT MODIFIY - GENERATED CODE
944943
</plugins>
945944
</build>
946945
<properties>
947-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
946+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
948947
<jruby.version>9.1.5.0</jruby.version>
949948
<jruby.versions>9.1.5.0</jruby.versions>
950949
</properties>
@@ -982,7 +981,7 @@ DO NOT MODIFIY - GENERATED CODE
982981
</plugins>
983982
</build>
984983
<properties>
985-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
984+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
986985
<jruby.version>9.1.8.0</jruby.version>
987986
<jruby.versions>9.1.8.0</jruby.versions>
988987
</properties>
@@ -1020,7 +1019,7 @@ DO NOT MODIFIY - GENERATED CODE
10201019
</plugins>
10211020
</build>
10221021
<properties>
1023-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
1022+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
10241023
<jruby.version>9.1.12.0</jruby.version>
10251024
<jruby.versions>9.1.12.0</jruby.versions>
10261025
</properties>
@@ -1058,7 +1057,7 @@ DO NOT MODIFIY - GENERATED CODE
10581057
</plugins>
10591058
</build>
10601059
<properties>
1061-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
1060+
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
10621061
<jruby.version>9.1.13.0</jruby.version>
10631062
<jruby.versions>9.1.13.0</jruby.versions>
10641063
</properties>

0 commit comments

Comments
 (0)