Skip to content

Commit 8fdf6a9

Browse files
kareskares
committed
[build] update supported bc/jruby versions
1 parent 1ddc47a commit 8fdf6a9

File tree

2 files changed

+151
-37
lines changed

2 files changed

+151
-37
lines changed

‎Mavenfile

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

101-
supported_bc_versions = %w{ 1.55 1.56 1.57 1.58 1.59 1.60 1.61 }
101+
supported_bc_versions = %w{ 1.56 1.57 1.58 1.59 1.60 1.61 1.62 1.63 1.64 }
102102

103103
default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
104104
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
@@ -156,7 +156,7 @@ end
156156
}
157157

158158
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.8.0 9.1.12.0 9.1.16.0 9.1.17.0 }
159-
jruby_9_K_versions += %w{ 9.2.0.0 9.2.5.0 9.2.6.0 }
159+
jruby_9_K_versions += %w{ 9.2.0.0 9.2.5.0 9.2.6.0 9.2.7.0 9.2.8.0 9.2.9.0 }
160160

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

‎pom.xml

Lines changed: 149 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ DO NOT MODIFIY - GENERATED CODE
6060
</snapshotRepository>
6161
</distributionManagement>
6262
<properties>
63-
<bc.versions>1.62</bc.versions>
6463
<invoker.skip>${maven.test.skip}</invoker.skip>
65-
<invoker.test>${bc.versions}</invoker.test>
66-
<jruby.plugins.version>1.1.6</jruby.plugins.version>
64+
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
65+
<polyglot.dump.readonly>true</polyglot.dump.readonly>
6766
<jruby.switches>-W0</jruby.switches>
68-
<jruby.version>9.1.17.0</jruby.version>
69-
<jruby.versions>9.1.17.0</jruby.versions>
70-
<mavengem.wagon.version>0.2.1</mavengem.wagon.version>
67+
<bc.versions>1.62</bc.versions>
68+
<invoker.test>${bc.versions}</invoker.test>
7169
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
72-
<polyglot.dump.readonly>true</polyglot.dump.readonly>
73-
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
70+
<jruby.versions>9.1.17.0</jruby.versions>
71+
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
72+
<jruby.version>9.1.17.0</jruby.version>
73+
<jruby.plugins.version>1.1.6</jruby.plugins.version>
7474
</properties>
7575
<dependencies>
7676
<dependency>
@@ -433,8 +433,8 @@ DO NOT MODIFIY - GENERATED CODE
433433
</plugins>
434434
</build>
435435
<properties>
436-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
437436
<jruby.modes>1.9,2.0</jruby.modes>
437+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
438438
<jruby.versions>1.7.20</jruby.versions>
439439
</properties>
440440
</profile>
@@ -471,8 +471,8 @@ DO NOT MODIFIY - GENERATED CODE
471471
</plugins>
472472
</build>
473473
<properties>
474-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
475474
<jruby.modes>1.9,2.0</jruby.modes>
475+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
476476
<jruby.versions>1.7.22</jruby.versions>
477477
</properties>
478478
</profile>
@@ -509,8 +509,8 @@ DO NOT MODIFIY - GENERATED CODE
509509
</plugins>
510510
</build>
511511
<properties>
512-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
513512
<jruby.modes>1.9,2.0</jruby.modes>
513+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
514514
<jruby.versions>1.7.23</jruby.versions>
515515
</properties>
516516
</profile>
@@ -547,8 +547,8 @@ DO NOT MODIFIY - GENERATED CODE
547547
</plugins>
548548
</build>
549549
<properties>
550-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
551550
<jruby.modes>1.9,2.0</jruby.modes>
551+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
552552
<jruby.versions>1.7.24</jruby.versions>
553553
</properties>
554554
</profile>
@@ -585,8 +585,8 @@ DO NOT MODIFIY - GENERATED CODE
585585
</plugins>
586586
</build>
587587
<properties>
588-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
589588
<jruby.modes>1.9,2.0</jruby.modes>
589+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
590590
<jruby.versions>1.7.25</jruby.versions>
591591
</properties>
592592
</profile>
@@ -623,8 +623,8 @@ DO NOT MODIFIY - GENERATED CODE
623623
</plugins>
624624
</build>
625625
<properties>
626-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
627626
<jruby.modes>1.9,2.0</jruby.modes>
627+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
628628
<jruby.versions>1.7.26</jruby.versions>
629629
</properties>
630630
</profile>
@@ -661,8 +661,8 @@ DO NOT MODIFIY - GENERATED CODE
661661
</plugins>
662662
</build>
663663
<properties>
664-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
665664
<jruby.modes>1.9,2.0</jruby.modes>
665+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
666666
<jruby.versions>1.7.27</jruby.versions>
667667
</properties>
668668
</profile>
@@ -699,9 +699,9 @@ DO NOT MODIFIY - GENERATED CODE
699699
</plugins>
700700
</build>
701701
<properties>
702-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
703-
<jruby.version>9.0.1.0</jruby.version>
702+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
704703
<jruby.versions>9.0.1.0</jruby.versions>
704+
<jruby.version>9.0.1.0</jruby.version>
705705
</properties>
706706
</profile>
707707
<profile>
@@ -737,9 +737,9 @@ DO NOT MODIFIY - GENERATED CODE
737737
</plugins>
738738
</build>
739739
<properties>
740-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
741-
<jruby.version>9.0.5.0</jruby.version>
740+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
742741
<jruby.versions>9.0.5.0</jruby.versions>
742+
<jruby.version>9.0.5.0</jruby.version>
743743
</properties>
744744
</profile>
745745
<profile>
@@ -775,9 +775,9 @@ DO NOT MODIFIY - GENERATED CODE
775775
</plugins>
776776
</build>
777777
<properties>
778-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
779-
<jruby.version>9.1.2.0</jruby.version>
778+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
780779
<jruby.versions>9.1.2.0</jruby.versions>
780+
<jruby.version>9.1.2.0</jruby.version>
781781
</properties>
782782
</profile>
783783
<profile>
@@ -813,9 +813,9 @@ DO NOT MODIFIY - GENERATED CODE
813813
</plugins>
814814
</build>
815815
<properties>
816-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
817-
<jruby.version>9.1.8.0</jruby.version>
816+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
818817
<jruby.versions>9.1.8.0</jruby.versions>
818+
<jruby.version>9.1.8.0</jruby.version>
819819
</properties>
820820
</profile>
821821
<profile>
@@ -851,9 +851,9 @@ DO NOT MODIFIY - GENERATED CODE
851851
</plugins>
852852
</build>
853853
<properties>
854-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
855-
<jruby.version>9.1.12.0</jruby.version>
854+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
856855
<jruby.versions>9.1.12.0</jruby.versions>
856+
<jruby.version>9.1.12.0</jruby.version>
857857
</properties>
858858
</profile>
859859
<profile>
@@ -889,9 +889,9 @@ DO NOT MODIFIY - GENERATED CODE
889889
</plugins>
890890
</build>
891891
<properties>
892-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
893-
<jruby.version>9.1.16.0</jruby.version>
892+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
894893
<jruby.versions>9.1.16.0</jruby.versions>
894+
<jruby.version>9.1.16.0</jruby.version>
895895
</properties>
896896
</profile>
897897
<profile>
@@ -927,9 +927,9 @@ DO NOT MODIFIY - GENERATED CODE
927927
</plugins>
928928
</build>
929929
<properties>
930-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
931-
<jruby.version>9.1.17.0</jruby.version>
930+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
932931
<jruby.versions>9.1.17.0</jruby.versions>
932+
<jruby.version>9.1.17.0</jruby.version>
933933
</properties>
934934
</profile>
935935
<profile>
@@ -965,9 +965,9 @@ DO NOT MODIFIY - GENERATED CODE
965965
</plugins>
966966
</build>
967967
<properties>
968-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
969-
<jruby.version>9.2.0.0</jruby.version>
968+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
970969
<jruby.versions>9.2.0.0</jruby.versions>
970+
<jruby.version>9.2.0.0</jruby.version>
971971
</properties>
972972
</profile>
973973
<profile>
@@ -1003,9 +1003,9 @@ DO NOT MODIFIY - GENERATED CODE
10031003
</plugins>
10041004
</build>
10051005
<properties>
1006-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
1007-
<jruby.version>9.2.5.0</jruby.version>
1006+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
10081007
<jruby.versions>9.2.5.0</jruby.versions>
1008+
<jruby.version>9.2.5.0</jruby.version>
10091009
</properties>
10101010
</profile>
10111011
<profile>
@@ -1041,9 +1041,123 @@ DO NOT MODIFIY - GENERATED CODE
10411041
</plugins>
10421042
</build>
10431043
<properties>
1044-
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
1045-
<jruby.version>9.2.6.0</jruby.version>
1044+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
10461045
<jruby.versions>9.2.6.0</jruby.versions>
1046+
<jruby.version>9.2.6.0</jruby.version>
1047+
</properties>
1048+
</profile>
1049+
<profile>
1050+
<id>test-9.2.7.0</id>
1051+
<build>
1052+
<plugins>
1053+
<plugin>
1054+
<artifactId>maven-invoker-plugin</artifactId>
1055+
<version>1.8</version>
1056+
<executions>
1057+
<execution>
1058+
<goals>
1059+
<goal>install</goal>
1060+
<goal>run</goal>
1061+
</goals>
1062+
<configuration>
1063+
<projectsDirectory>integration</projectsDirectory>
1064+
<pomIncludes>
1065+
<pomInclude>*/pom.xml</pomInclude>
1066+
</pomIncludes>
1067+
<streamLogs>true</streamLogs>
1068+
<properties>
1069+
<jruby.versions>${jruby.versions}</jruby.versions>
1070+
<jruby.modes>${jruby.modes}</jruby.modes>
1071+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
1072+
<bc.versions>${bc.versions}</bc.versions>
1073+
<runit.dir>${runit.dir}</runit.dir>
1074+
</properties>
1075+
</configuration>
1076+
</execution>
1077+
</executions>
1078+
</plugin>
1079+
</plugins>
1080+
</build>
1081+
<properties>
1082+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
1083+
<jruby.versions>9.2.7.0</jruby.versions>
1084+
<jruby.version>9.2.7.0</jruby.version>
1085+
</properties>
1086+
</profile>
1087+
<profile>
1088+
<id>test-9.2.8.0</id>
1089+
<build>
1090+
<plugins>
1091+
<plugin>
1092+
<artifactId>maven-invoker-plugin</artifactId>
1093+
<version>1.8</version>
1094+
<executions>
1095+
<execution>
1096+
<goals>
1097+
<goal>install</goal>
1098+
<goal>run</goal>
1099+
</goals>
1100+
<configuration>
1101+
<projectsDirectory>integration</projectsDirectory>
1102+
<pomIncludes>
1103+
<pomInclude>*/pom.xml</pomInclude>
1104+
</pomIncludes>
1105+
<streamLogs>true</streamLogs>
1106+
<properties>
1107+
<jruby.versions>${jruby.versions}</jruby.versions>
1108+
<jruby.modes>${jruby.modes}</jruby.modes>
1109+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
1110+
<bc.versions>${bc.versions}</bc.versions>
1111+
<runit.dir>${runit.dir}</runit.dir>
1112+
</properties>
1113+
</configuration>
1114+
</execution>
1115+
</executions>
1116+
</plugin>
1117+
</plugins>
1118+
</build>
1119+
<properties>
1120+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
1121+
<jruby.versions>9.2.8.0</jruby.versions>
1122+
<jruby.version>9.2.8.0</jruby.version>
1123+
</properties>
1124+
</profile>
1125+
<profile>
1126+
<id>test-9.2.9.0</id>
1127+
<build>
1128+
<plugins>
1129+
<plugin>
1130+
<artifactId>maven-invoker-plugin</artifactId>
1131+
<version>1.8</version>
1132+
<executions>
1133+
<execution>
1134+
<goals>
1135+
<goal>install</goal>
1136+
<goal>run</goal>
1137+
</goals>
1138+
<configuration>
1139+
<projectsDirectory>integration</projectsDirectory>
1140+
<pomIncludes>
1141+
<pomInclude>*/pom.xml</pomInclude>
1142+
</pomIncludes>
1143+
<streamLogs>true</streamLogs>
1144+
<properties>
1145+
<jruby.versions>${jruby.versions}</jruby.versions>
1146+
<jruby.modes>${jruby.modes}</jruby.modes>
1147+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
1148+
<bc.versions>${bc.versions}</bc.versions>
1149+
<runit.dir>${runit.dir}</runit.dir>
1150+
</properties>
1151+
</configuration>
1152+
</execution>
1153+
</executions>
1154+
</plugin>
1155+
</plugins>
1156+
</build>
1157+
<properties>
1158+
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
1159+
<jruby.versions>9.2.9.0</jruby.versions>
1160+
<jruby.version>9.2.9.0</jruby.version>
10471161
</properties>
10481162
</profile>
10491163
<profile>

0 commit comments

Comments
 (0)