Skip to content

Commit 788bb8e

Browse files
kareskares
committed
upgrade BC to 1.59 + include new BC/JRuby mvn profile targets
1 parent bcbb73c commit 788bb8e

File tree

3 files changed

+97
-21
lines changed

3 files changed

+97
-21
lines changed

‎Mavenfile

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

103-
supported_bc_versions = %w{ 1.54 1.55 1.56 1.57 1.58 } # due EC support dropped <= 1.50
103+
supported_bc_versions = %w{ 1.54 1.55 1.56 1.57 1.58 1.59 }
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]
@@ -171,7 +171,7 @@ end
171171

172172
}
173173

174-
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.5.0 9.1.8.0 9.1.12.0 9.1.13.0 }
174+
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.5.0 9.1.8.0 9.1.12.0 9.1.13.0 9.1.16.0 9.1.17.0 }
175175

176176
jruby_9_K_versions.each { |version|
177177
profile :id => "test-#{version}" do

‎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.57'
3+
BOUNCY_CASTLE_VERSION = '1.59'
44
end

‎pom.xml

Lines changed: 94 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,17 @@ DO NOT MODIFIY - GENERATED CODE
9595
<dependency>
9696
<groupId>org.bouncycastle</groupId>
9797
<artifactId>bcprov-jdk15on</artifactId>
98-
<version>1.57</version>
98+
<version>1.59</version>
9999
</dependency>
100100
<dependency>
101101
<groupId>org.bouncycastle</groupId>
102102
<artifactId>bcpkix-jdk15on</artifactId>
103-
<version>1.57</version>
103+
<version>1.59</version>
104104
</dependency>
105105
<dependency>
106106
<groupId>org.bouncycastle</groupId>
107107
<artifactId>bctls-jdk15on</artifactId>
108-
<version>1.57</version>
108+
<version>1.59</version>
109109
</dependency>
110110
<dependency>
111111
<groupId>org.jruby</groupId>
@@ -417,7 +417,7 @@ DO NOT MODIFIY - GENERATED CODE
417417
</plugins>
418418
</build>
419419
<properties>
420-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
420+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
421421
<jruby.modes>1.9,2.0</jruby.modes>
422422
<jruby.versions>1.7.18</jruby.versions>
423423
</properties>
@@ -455,7 +455,7 @@ DO NOT MODIFIY - GENERATED CODE
455455
</plugins>
456456
</build>
457457
<properties>
458-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
458+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
459459
<jruby.modes>1.9,2.0</jruby.modes>
460460
<jruby.versions>1.7.20</jruby.versions>
461461
</properties>
@@ -493,7 +493,7 @@ DO NOT MODIFIY - GENERATED CODE
493493
</plugins>
494494
</build>
495495
<properties>
496-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
496+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
497497
<jruby.modes>1.9,2.0</jruby.modes>
498498
<jruby.versions>1.7.22</jruby.versions>
499499
</properties>
@@ -531,7 +531,7 @@ DO NOT MODIFIY - GENERATED CODE
531531
</plugins>
532532
</build>
533533
<properties>
534-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
534+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
535535
<jruby.modes>1.9,2.0</jruby.modes>
536536
<jruby.versions>1.7.23</jruby.versions>
537537
</properties>
@@ -569,7 +569,7 @@ DO NOT MODIFIY - GENERATED CODE
569569
</plugins>
570570
</build>
571571
<properties>
572-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
572+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
573573
<jruby.modes>1.9,2.0</jruby.modes>
574574
<jruby.versions>1.7.24</jruby.versions>
575575
</properties>
@@ -607,7 +607,7 @@ DO NOT MODIFIY - GENERATED CODE
607607
</plugins>
608608
</build>
609609
<properties>
610-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
610+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
611611
<jruby.modes>1.9,2.0</jruby.modes>
612612
<jruby.versions>1.7.25</jruby.versions>
613613
</properties>
@@ -645,7 +645,7 @@ DO NOT MODIFIY - GENERATED CODE
645645
</plugins>
646646
</build>
647647
<properties>
648-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
648+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
649649
<jruby.modes>1.9,2.0</jruby.modes>
650650
<jruby.versions>1.7.26</jruby.versions>
651651
</properties>
@@ -683,7 +683,7 @@ DO NOT MODIFIY - GENERATED CODE
683683
</plugins>
684684
</build>
685685
<properties>
686-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
686+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
687687
<jruby.modes>1.9,2.0</jruby.modes>
688688
<jruby.versions>1.7.27</jruby.versions>
689689
</properties>
@@ -721,7 +721,7 @@ DO NOT MODIFIY - GENERATED CODE
721721
</plugins>
722722
</build>
723723
<properties>
724-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
724+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
725725
<jruby.version>9.0.1.0</jruby.version>
726726
<jruby.versions>9.0.1.0</jruby.versions>
727727
</properties>
@@ -759,7 +759,7 @@ DO NOT MODIFIY - GENERATED CODE
759759
</plugins>
760760
</build>
761761
<properties>
762-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
762+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
763763
<jruby.version>9.0.5.0</jruby.version>
764764
<jruby.versions>9.0.5.0</jruby.versions>
765765
</properties>
@@ -797,7 +797,7 @@ DO NOT MODIFIY - GENERATED CODE
797797
</plugins>
798798
</build>
799799
<properties>
800-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
800+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
801801
<jruby.version>9.1.2.0</jruby.version>
802802
<jruby.versions>9.1.2.0</jruby.versions>
803803
</properties>
@@ -835,7 +835,7 @@ DO NOT MODIFIY - GENERATED CODE
835835
</plugins>
836836
</build>
837837
<properties>
838-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
838+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
839839
<jruby.version>9.1.5.0</jruby.version>
840840
<jruby.versions>9.1.5.0</jruby.versions>
841841
</properties>
@@ -873,7 +873,7 @@ DO NOT MODIFIY - GENERATED CODE
873873
</plugins>
874874
</build>
875875
<properties>
876-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
876+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
877877
<jruby.version>9.1.8.0</jruby.version>
878878
<jruby.versions>9.1.8.0</jruby.versions>
879879
</properties>
@@ -911,7 +911,7 @@ DO NOT MODIFIY - GENERATED CODE
911911
</plugins>
912912
</build>
913913
<properties>
914-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
914+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
915915
<jruby.version>9.1.12.0</jruby.version>
916916
<jruby.versions>9.1.12.0</jruby.versions>
917917
</properties>
@@ -949,11 +949,87 @@ DO NOT MODIFIY - GENERATED CODE
949949
</plugins>
950950
</build>
951951
<properties>
952-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
952+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
953953
<jruby.version>9.1.13.0</jruby.version>
954954
<jruby.versions>9.1.13.0</jruby.versions>
955955
</properties>
956956
</profile>
957+
<profile>
958+
<id>test-9.1.16.0</id>
959+
<build>
960+
<plugins>
961+
<plugin>
962+
<artifactId>maven-invoker-plugin</artifactId>
963+
<version>1.8</version>
964+
<executions>
965+
<execution>
966+
<goals>
967+
<goal>install</goal>
968+
<goal>run</goal>
969+
</goals>
970+
<configuration>
971+
<projectsDirectory>integration</projectsDirectory>
972+
<pomIncludes>
973+
<pomInclude>*/pom.xml</pomInclude>
974+
</pomIncludes>
975+
<streamLogs>true</streamLogs>
976+
<properties>
977+
<jruby.versions>${jruby.versions}</jruby.versions>
978+
<jruby.modes>${jruby.modes}</jruby.modes>
979+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
980+
<bc.versions>${bc.versions}</bc.versions>
981+
<runit.dir>${runit.dir}</runit.dir>
982+
</properties>
983+
</configuration>
984+
</execution>
985+
</executions>
986+
</plugin>
987+
</plugins>
988+
</build>
989+
<properties>
990+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
991+
<jruby.version>9.1.16.0</jruby.version>
992+
<jruby.versions>9.1.16.0</jruby.versions>
993+
</properties>
994+
</profile>
995+
<profile>
996+
<id>test-9.1.17.0</id>
997+
<build>
998+
<plugins>
999+
<plugin>
1000+
<artifactId>maven-invoker-plugin</artifactId>
1001+
<version>1.8</version>
1002+
<executions>
1003+
<execution>
1004+
<goals>
1005+
<goal>install</goal>
1006+
<goal>run</goal>
1007+
</goals>
1008+
<configuration>
1009+
<projectsDirectory>integration</projectsDirectory>
1010+
<pomIncludes>
1011+
<pomInclude>*/pom.xml</pomInclude>
1012+
</pomIncludes>
1013+
<streamLogs>true</streamLogs>
1014+
<properties>
1015+
<jruby.versions>${jruby.versions}</jruby.versions>
1016+
<jruby.modes>${jruby.modes}</jruby.modes>
1017+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
1018+
<bc.versions>${bc.versions}</bc.versions>
1019+
<runit.dir>${runit.dir}</runit.dir>
1020+
</properties>
1021+
</configuration>
1022+
</execution>
1023+
</executions>
1024+
</plugin>
1025+
</plugins>
1026+
</build>
1027+
<properties>
1028+
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
1029+
<jruby.version>9.1.17.0</jruby.version>
1030+
<jruby.versions>9.1.17.0</jruby.versions>
1031+
</properties>
1032+
</profile>
9571033
<profile>
9581034
<id>release</id>
9591035
<build>

0 commit comments

Comments
 (0)