Skip to content

Commit a20a24d

Browse files
kareskares
committed
[build] get rid of old JRuby profiles and 1.8 mode, for good hopefully
1 parent f86bc0b commit a20a24d

File tree

2 files changed

+67
-105
lines changed

2 files changed

+67
-105
lines changed

‎Mavenfile

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -141,21 +141,21 @@ invoker_run_options = {
141141
'runit.dir' => '${runit.dir}' }
142142
}
143143

144-
profile :id => 'test-1.6.8' do
145-
plugin :invoker, '1.8' do
146-
execute_goals( :install, :run, invoker_run_options )
147-
end
148-
properties 'jruby.versions' => '1.6.8', 'jruby.modes' => '1.8,1.9',
149-
'bc.versions' => supported_bc_versions.join(',')
150-
end
151-
152-
profile :id => 'test-1.7.4' do
153-
plugin :invoker, '1.8' do
154-
execute_goals( :install, :run, invoker_run_options )
155-
end
156-
properties 'jruby.versions' => '1.7.4', 'jruby.modes' => '1.8,1.9',
157-
'bc.versions' => supported_bc_versions.join(',')
158-
end
144+
# profile :id => 'test-1.6.8' do
145+
# plugin :invoker, '1.8' do
146+
# execute_goals( :install, :run, invoker_run_options )
147+
# end
148+
# properties 'jruby.versions' => '1.6.8', 'jruby.modes' => '1.8,1.9',
149+
# 'bc.versions' => supported_bc_versions.join(',')
150+
# end
151+
#
152+
# profile :id => 'test-1.7.4' do
153+
# plugin :invoker, '1.8' do
154+
# execute_goals( :install, :run, invoker_run_options )
155+
# end
156+
# properties 'jruby.versions' => '1.7.4', 'jruby.modes' => '1.8,1.9',
157+
# 'bc.versions' => supported_bc_versions.join(',')
158+
# end
159159

160160
jruby_1_7_versions = %w{ 1.7.13 1.7.15 1.7.16 1.7.18 1.7.20 1.7.22 1.7.23 }
161161
jruby_1_7_versions += %w{ 1.7.24 1.7.25 1.7.26 1.7.27 }
@@ -166,13 +166,13 @@ profile :id => "test-#{version}" do
166166
plugin :invoker, '1.8' do
167167
execute_goals( :install, :run, invoker_run_options )
168168
end
169-
properties 'jruby.versions' => version, 'jruby.modes' => '1.8,1.9,2.0',
169+
properties 'jruby.versions' => version, 'jruby.modes' => '1.9,2.0',
170170
'bc.versions' => supported_bc_versions.join(',')
171171
end
172172

173173
}
174174

175-
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 }
175+
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 }
176176

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

‎pom.xml

Lines changed: 50 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -378,83 +378,6 @@ DO NOT MODIFIY - GENERATED CODE
378378
</plugins>
379379
</build>
380380
<profiles>
381-
<profile>
382-
<id>test-1.6.8</id>
383-
<build>
384-
<plugins>
385-
<plugin>
386-
<artifactId>maven-invoker-plugin</artifactId>
387-
<version>1.8</version>
388-
<executions>
389-
<execution>
390-
<id>tests-with-different-bc-versions</id>
391-
<goals>
392-
<goal>install</goal>
393-
<goal>run</goal>
394-
</goals>
395-
<configuration>
396-
<projectsDirectory>integration</projectsDirectory>
397-
<pomIncludes>
398-
<pomInclude>*/pom.xml</pomInclude>
399-
</pomIncludes>
400-
<streamLogs>true</streamLogs>
401-
<properties>
402-
<jruby.versions>${jruby.versions}</jruby.versions>
403-
<jruby.modes>${jruby.modes}</jruby.modes>
404-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
405-
<bc.versions>${bc.versions}</bc.versions>
406-
<runit.dir>${runit.dir}</runit.dir>
407-
</properties>
408-
</configuration>
409-
</execution>
410-
</executions>
411-
</plugin>
412-
</plugins>
413-
</build>
414-
<properties>
415-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
416-
<jruby.modes>1.8,1.9</jruby.modes>
417-
<jruby.versions>1.6.8</jruby.versions>
418-
</properties>
419-
</profile>
420-
<profile>
421-
<id>test-1.7.4</id>
422-
<build>
423-
<plugins>
424-
<plugin>
425-
<artifactId>maven-invoker-plugin</artifactId>
426-
<version>1.8</version>
427-
<executions>
428-
<execution>
429-
<goals>
430-
<goal>install</goal>
431-
<goal>run</goal>
432-
</goals>
433-
<configuration>
434-
<projectsDirectory>integration</projectsDirectory>
435-
<pomIncludes>
436-
<pomInclude>*/pom.xml</pomInclude>
437-
</pomIncludes>
438-
<streamLogs>true</streamLogs>
439-
<properties>
440-
<jruby.versions>${jruby.versions}</jruby.versions>
441-
<jruby.modes>${jruby.modes}</jruby.modes>
442-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
443-
<bc.versions>${bc.versions}</bc.versions>
444-
<runit.dir>${runit.dir}</runit.dir>
445-
</properties>
446-
</configuration>
447-
</execution>
448-
</executions>
449-
</plugin>
450-
</plugins>
451-
</build>
452-
<properties>
453-
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
454-
<jruby.modes>1.8,1.9</jruby.modes>
455-
<jruby.versions>1.7.4</jruby.versions>
456-
</properties>
457-
</profile>
458381
<profile>
459382
<id>test-1.7.13</id>
460383
<build>
@@ -464,6 +387,7 @@ DO NOT MODIFIY - GENERATED CODE
464387
<version>1.8</version>
465388
<executions>
466389
<execution>
390+
<id>tests-with-different-bc-versions</id>
467391
<goals>
468392
<goal>install</goal>
469393
<goal>run</goal>
@@ -489,7 +413,7 @@ DO NOT MODIFIY - GENERATED CODE
489413
</build>
490414
<properties>
491415
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
492-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
416+
<jruby.modes>1.9,2.0</jruby.modes>
493417
<jruby.versions>1.7.13</jruby.versions>
494418
</properties>
495419
</profile>
@@ -527,7 +451,7 @@ DO NOT MODIFIY - GENERATED CODE
527451
</build>
528452
<properties>
529453
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
530-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
454+
<jruby.modes>1.9,2.0</jruby.modes>
531455
<jruby.versions>1.7.15</jruby.versions>
532456
</properties>
533457
</profile>
@@ -565,7 +489,7 @@ DO NOT MODIFIY - GENERATED CODE
565489
</build>
566490
<properties>
567491
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
568-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
492+
<jruby.modes>1.9,2.0</jruby.modes>
569493
<jruby.versions>1.7.16</jruby.versions>
570494
</properties>
571495
</profile>
@@ -603,7 +527,7 @@ DO NOT MODIFIY - GENERATED CODE
603527
</build>
604528
<properties>
605529
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
606-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
530+
<jruby.modes>1.9,2.0</jruby.modes>
607531
<jruby.versions>1.7.18</jruby.versions>
608532
</properties>
609533
</profile>
@@ -641,7 +565,7 @@ DO NOT MODIFIY - GENERATED CODE
641565
</build>
642566
<properties>
643567
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
644-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
568+
<jruby.modes>1.9,2.0</jruby.modes>
645569
<jruby.versions>1.7.20</jruby.versions>
646570
</properties>
647571
</profile>
@@ -679,7 +603,7 @@ DO NOT MODIFIY - GENERATED CODE
679603
</build>
680604
<properties>
681605
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
682-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
606+
<jruby.modes>1.9,2.0</jruby.modes>
683607
<jruby.versions>1.7.22</jruby.versions>
684608
</properties>
685609
</profile>
@@ -717,7 +641,7 @@ DO NOT MODIFIY - GENERATED CODE
717641
</build>
718642
<properties>
719643
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
720-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
644+
<jruby.modes>1.9,2.0</jruby.modes>
721645
<jruby.versions>1.7.23</jruby.versions>
722646
</properties>
723647
</profile>
@@ -755,7 +679,7 @@ DO NOT MODIFIY - GENERATED CODE
755679
</build>
756680
<properties>
757681
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
758-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
682+
<jruby.modes>1.9,2.0</jruby.modes>
759683
<jruby.versions>1.7.24</jruby.versions>
760684
</properties>
761685
</profile>
@@ -793,7 +717,7 @@ DO NOT MODIFIY - GENERATED CODE
793717
</build>
794718
<properties>
795719
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
796-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
720+
<jruby.modes>1.9,2.0</jruby.modes>
797721
<jruby.versions>1.7.25</jruby.versions>
798722
</properties>
799723
</profile>
@@ -831,7 +755,7 @@ DO NOT MODIFIY - GENERATED CODE
831755
</build>
832756
<properties>
833757
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
834-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
758+
<jruby.modes>1.9,2.0</jruby.modes>
835759
<jruby.versions>1.7.26</jruby.versions>
836760
</properties>
837761
</profile>
@@ -869,7 +793,7 @@ DO NOT MODIFIY - GENERATED CODE
869793
</build>
870794
<properties>
871795
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
872-
<jruby.modes>1.8,1.9,2.0</jruby.modes>
796+
<jruby.modes>1.9,2.0</jruby.modes>
873797
<jruby.versions>1.7.27</jruby.versions>
874798
</properties>
875799
</profile>
@@ -1101,6 +1025,44 @@ DO NOT MODIFIY - GENERATED CODE
11011025
<jruby.versions>9.1.12.0</jruby.versions>
11021026
</properties>
11031027
</profile>
1028+
<profile>
1029+
<id>test-9.1.13.0</id>
1030+
<build>
1031+
<plugins>
1032+
<plugin>
1033+
<artifactId>maven-invoker-plugin</artifactId>
1034+
<version>1.8</version>
1035+
<executions>
1036+
<execution>
1037+
<goals>
1038+
<goal>install</goal>
1039+
<goal>run</goal>
1040+
</goals>
1041+
<configuration>
1042+
<projectsDirectory>integration</projectsDirectory>
1043+
<pomIncludes>
1044+
<pomInclude>*/pom.xml</pomInclude>
1045+
</pomIncludes>
1046+
<streamLogs>true</streamLogs>
1047+
<properties>
1048+
<jruby.versions>${jruby.versions}</jruby.versions>
1049+
<jruby.modes>${jruby.modes}</jruby.modes>
1050+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
1051+
<bc.versions>${bc.versions}</bc.versions>
1052+
<runit.dir>${runit.dir}</runit.dir>
1053+
</properties>
1054+
</configuration>
1055+
</execution>
1056+
</executions>
1057+
</plugin>
1058+
</plugins>
1059+
</build>
1060+
<properties>
1061+
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
1062+
<jruby.version>9.1.13.0</jruby.version>
1063+
<jruby.versions>9.1.13.0</jruby.versions>
1064+
</properties>
1065+
</profile>
11041066
<profile>
11051067
<id>release</id>
11061068
<build>

0 commit comments

Comments
 (0)