Skip to content

Commit 185917f

Browse files
kareskares
committed
[build] update supported JRuby/BC versions
1 parent 20881d5 commit 185917f

File tree

2 files changed

+100
-61
lines changed

2 files changed

+100
-61
lines changed

‎Mavenfile‎

Lines changed: 8 additions & 7 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 }
101+
supported_bc_versions = %w{ 1.55 1.56 1.57 1.58 1.59 1.60 1.61 }
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]
@@ -143,28 +143,29 @@ invoker_run_options = {
143143
'runit.dir' => '${runit.dir}' }
144144
}
145145

146-
jruby_1_7_versions = %w{ 1.7.18 1.7.20 1.7.22 1.7.23 1.7.24 1.7.25 1.7.26 1.7.27 }
146+
jruby_1_7_versions = %w{ 1.7.20 1.7.22 1.7.23 1.7.24 1.7.25 1.7.26 1.7.27 }
147147

148148
jruby_1_7_versions.each { |version|
149149
profile :id => "test-#{version}" do
150150
plugin :invoker, '1.8' do
151151
execute_goals( :install, :run, invoker_run_options )
152152
end
153-
properties 'jruby.versions' => version, 'jruby.modes' => '1.9,2.0',
153+
properties 'jruby.versions' => version,
154+
'jruby.modes' => '1.9,2.0',
154155
'bc.versions' => supported_bc_versions.join(',')
155156
end
156157
}
157158

158-
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 9.2.0.0 }
159+
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 }
160+
jruby_9_K_versions += %w{ 9.2.0.0 9.2.5.0 9.2.6.0 }
159161

160162
jruby_9_K_versions.each { |version|
161163
profile :id => "test-#{version}" do
162164
plugin :invoker, '1.8' do
163165
execute_goals( :install, :run, invoker_run_options )
164166
end
165-
# NOTE: we're work-around 9K maven-runit version bug (due minitest changes) !
166-
# ... still can not build with 9K : https://github.com/jruby/jruby/issues/3184
167-
properties 'jruby.version' => version, 'jruby.versions' => version,
167+
properties 'jruby.version' => version,
168+
'jruby.versions' => version,
168169
'bc.versions' => supported_bc_versions.join(',')
169170
end
170171
}

‎pom.xml‎

Lines changed: 92 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -397,45 +397,6 @@ DO NOT MODIFIY - GENERATED CODE
397397
</plugins>
398398
</build>
399399
</profile>
400-
<profile>
401-
<id>test-1.7.18</id>
402-
<build>
403-
<plugins>
404-
<plugin>
405-
<artifactId>maven-invoker-plugin</artifactId>
406-
<version>1.8</version>
407-
<executions>
408-
<execution>
409-
<id>tests-with-different-bc-versions</id>
410-
<goals>
411-
<goal>install</goal>
412-
<goal>run</goal>
413-
</goals>
414-
<configuration>
415-
<projectsDirectory>integration</projectsDirectory>
416-
<pomIncludes>
417-
<pomInclude>*/pom.xml</pomInclude>
418-
</pomIncludes>
419-
<streamLogs>true</streamLogs>
420-
<properties>
421-
<jruby.versions>${jruby.versions}</jruby.versions>
422-
<jruby.modes>${jruby.modes}</jruby.modes>
423-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
424-
<bc.versions>${bc.versions}</bc.versions>
425-
<runit.dir>${runit.dir}</runit.dir>
426-
</properties>
427-
</configuration>
428-
</execution>
429-
</executions>
430-
</plugin>
431-
</plugins>
432-
</build>
433-
<properties>
434-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
435-
<jruby.modes>1.9,2.0</jruby.modes>
436-
<jruby.versions>1.7.18</jruby.versions>
437-
</properties>
438-
</profile>
439400
<profile>
440401
<id>test-1.7.20</id>
441402
<build>
@@ -445,6 +406,7 @@ DO NOT MODIFIY - GENERATED CODE
445406
<version>1.8</version>
446407
<executions>
447408
<execution>
409+
<id>tests-with-different-bc-versions</id>
448410
<goals>
449411
<goal>install</goal>
450412
<goal>run</goal>
@@ -469,7 +431,7 @@ DO NOT MODIFIY - GENERATED CODE
469431
</plugins>
470432
</build>
471433
<properties>
472-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
434+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
473435
<jruby.modes>1.9,2.0</jruby.modes>
474436
<jruby.versions>1.7.20</jruby.versions>
475437
</properties>
@@ -507,7 +469,7 @@ DO NOT MODIFIY - GENERATED CODE
507469
</plugins>
508470
</build>
509471
<properties>
510-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
472+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
511473
<jruby.modes>1.9,2.0</jruby.modes>
512474
<jruby.versions>1.7.22</jruby.versions>
513475
</properties>
@@ -545,7 +507,7 @@ DO NOT MODIFIY - GENERATED CODE
545507
</plugins>
546508
</build>
547509
<properties>
548-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
510+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
549511
<jruby.modes>1.9,2.0</jruby.modes>
550512
<jruby.versions>1.7.23</jruby.versions>
551513
</properties>
@@ -583,7 +545,7 @@ DO NOT MODIFIY - GENERATED CODE
583545
</plugins>
584546
</build>
585547
<properties>
586-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
548+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
587549
<jruby.modes>1.9,2.0</jruby.modes>
588550
<jruby.versions>1.7.24</jruby.versions>
589551
</properties>
@@ -621,7 +583,7 @@ DO NOT MODIFIY - GENERATED CODE
621583
</plugins>
622584
</build>
623585
<properties>
624-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
586+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
625587
<jruby.modes>1.9,2.0</jruby.modes>
626588
<jruby.versions>1.7.25</jruby.versions>
627589
</properties>
@@ -659,7 +621,7 @@ DO NOT MODIFIY - GENERATED CODE
659621
</plugins>
660622
</build>
661623
<properties>
662-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
624+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
663625
<jruby.modes>1.9,2.0</jruby.modes>
664626
<jruby.versions>1.7.26</jruby.versions>
665627
</properties>
@@ -697,7 +659,7 @@ DO NOT MODIFIY - GENERATED CODE
697659
</plugins>
698660
</build>
699661
<properties>
700-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
662+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
701663
<jruby.modes>1.9,2.0</jruby.modes>
702664
<jruby.versions>1.7.27</jruby.versions>
703665
</properties>
@@ -735,7 +697,7 @@ DO NOT MODIFIY - GENERATED CODE
735697
</plugins>
736698
</build>
737699
<properties>
738-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
700+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
739701
<jruby.version>9.0.1.0</jruby.version>
740702
<jruby.versions>9.0.1.0</jruby.versions>
741703
</properties>
@@ -773,7 +735,7 @@ DO NOT MODIFIY - GENERATED CODE
773735
</plugins>
774736
</build>
775737
<properties>
776-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
738+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
777739
<jruby.version>9.0.5.0</jruby.version>
778740
<jruby.versions>9.0.5.0</jruby.versions>
779741
</properties>
@@ -811,7 +773,7 @@ DO NOT MODIFIY - GENERATED CODE
811773
</plugins>
812774
</build>
813775
<properties>
814-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
776+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
815777
<jruby.version>9.1.2.0</jruby.version>
816778
<jruby.versions>9.1.2.0</jruby.versions>
817779
</properties>
@@ -849,7 +811,7 @@ DO NOT MODIFIY - GENERATED CODE
849811
</plugins>
850812
</build>
851813
<properties>
852-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
814+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
853815
<jruby.version>9.1.8.0</jruby.version>
854816
<jruby.versions>9.1.8.0</jruby.versions>
855817
</properties>
@@ -887,7 +849,7 @@ DO NOT MODIFIY - GENERATED CODE
887849
</plugins>
888850
</build>
889851
<properties>
890-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
852+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
891853
<jruby.version>9.1.12.0</jruby.version>
892854
<jruby.versions>9.1.12.0</jruby.versions>
893855
</properties>
@@ -925,7 +887,7 @@ DO NOT MODIFIY - GENERATED CODE
925887
</plugins>
926888
</build>
927889
<properties>
928-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
890+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
929891
<jruby.version>9.1.16.0</jruby.version>
930892
<jruby.versions>9.1.16.0</jruby.versions>
931893
</properties>
@@ -963,7 +925,7 @@ DO NOT MODIFIY - GENERATED CODE
963925
</plugins>
964926
</build>
965927
<properties>
966-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
928+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
967929
<jruby.version>9.1.17.0</jruby.version>
968930
<jruby.versions>9.1.17.0</jruby.versions>
969931
</properties>
@@ -1001,11 +963,87 @@ DO NOT MODIFIY - GENERATED CODE
1001963
</plugins>
1002964
</build>
1003965
<properties>
1004-
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
966+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
1005967
<jruby.version>9.2.0.0</jruby.version>
1006968
<jruby.versions>9.2.0.0</jruby.versions>
1007969
</properties>
1008970
</profile>
971+
<profile>
972+
<id>test-9.2.5.0</id>
973+
<build>
974+
<plugins>
975+
<plugin>
976+
<artifactId>maven-invoker-plugin</artifactId>
977+
<version>1.8</version>
978+
<executions>
979+
<execution>
980+
<goals>
981+
<goal>install</goal>
982+
<goal>run</goal>
983+
</goals>
984+
<configuration>
985+
<projectsDirectory>integration</projectsDirectory>
986+
<pomIncludes>
987+
<pomInclude>*/pom.xml</pomInclude>
988+
</pomIncludes>
989+
<streamLogs>true</streamLogs>
990+
<properties>
991+
<jruby.versions>${jruby.versions}</jruby.versions>
992+
<jruby.modes>${jruby.modes}</jruby.modes>
993+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
994+
<bc.versions>${bc.versions}</bc.versions>
995+
<runit.dir>${runit.dir}</runit.dir>
996+
</properties>
997+
</configuration>
998+
</execution>
999+
</executions>
1000+
</plugin>
1001+
</plugins>
1002+
</build>
1003+
<properties>
1004+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
1005+
<jruby.version>9.2.5.0</jruby.version>
1006+
<jruby.versions>9.2.5.0</jruby.versions>
1007+
</properties>
1008+
</profile>
1009+
<profile>
1010+
<id>test-9.2.6.0</id>
1011+
<build>
1012+
<plugins>
1013+
<plugin>
1014+
<artifactId>maven-invoker-plugin</artifactId>
1015+
<version>1.8</version>
1016+
<executions>
1017+
<execution>
1018+
<goals>
1019+
<goal>install</goal>
1020+
<goal>run</goal>
1021+
</goals>
1022+
<configuration>
1023+
<projectsDirectory>integration</projectsDirectory>
1024+
<pomIncludes>
1025+
<pomInclude>*/pom.xml</pomInclude>
1026+
</pomIncludes>
1027+
<streamLogs>true</streamLogs>
1028+
<properties>
1029+
<jruby.versions>${jruby.versions}</jruby.versions>
1030+
<jruby.modes>${jruby.modes}</jruby.modes>
1031+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
1032+
<bc.versions>${bc.versions}</bc.versions>
1033+
<runit.dir>${runit.dir}</runit.dir>
1034+
</properties>
1035+
</configuration>
1036+
</execution>
1037+
</executions>
1038+
</plugin>
1039+
</plugins>
1040+
</build>
1041+
<properties>
1042+
<bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
1043+
<jruby.version>9.2.6.0</jruby.version>
1044+
<jruby.versions>9.2.6.0</jruby.versions>
1045+
</properties>
1046+
</profile>
10091047
<profile>
10101048
<id>release</id>
10111049
<build>

0 commit comments

Comments
 (0)