Skip to content

Commit 2508fad

Browse files
headiusheadius
committed
Drop 9.1 support
JRuby 9.1.0.0 was released almost a decade ago and has been EOl for at least half as long. We also need to start moving to modern API signatures that accept ThreadContext to maintain support going forward.
1 parent da97ae4 commit 2508fad

File tree

2 files changed

+25
-140
lines changed

2 files changed

+25
-140
lines changed

‎Mavenfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ plugin :clean do
8282
'failOnError' => 'false' )
8383
end
8484

85-
jar 'org.jruby:jruby-core', '9.1.11.0', :scope => :provided
85+
jar 'org.jruby:jruby-core', '9.2.19.0', :scope => :provided
8686
# for invoker generated classes we need to add javax.annotation when on Java > 8
8787
jar 'javax.annotation:javax.annotation-api', '1.3.1', :scope => :compile
8888
jar 'junit:junit', '[4.13.1,)', :scope => :test
8989

9090
# NOTE: to build on Java 11 - installing gems fails (due old jossl) with:
9191
# load error: jopenssl/load -- java.lang.StringIndexOutOfBoundsException
92-
MVN_JRUBY_VERSION = ENV_JAVA['java.version'].to_i >= 9 ? '9.2.19.0' : '9.1.17.0'
92+
MVN_JRUBY_VERSION = '9.2.19.0'
9393

9494
jruby_plugin! :gem do
9595
# when installing dependent gems we want to use the built in openssl not the one from this lib directory
@@ -146,8 +146,7 @@ invoker_run_options = {
146146
'runit.dir' => '${runit.dir}' }
147147
}
148148

149-
jruby_9_K_versions = %w{ 9.1.2.0 9.1.8.0 9.1.12.0 9.1.16.0 9.1.17.0 }
150-
jruby_9_K_versions += %w{ 9.2.0.0 9.2.5.0 9.2.10.0 9.2.17.0 9.2.19.0 }
149+
jruby_9_K_versions = %w{ 9.2.0.0 9.2.5.0 9.2.10.0 9.2.17.0 9.2.19.0, 9.3.15.0, 9.4.13.0 }
151150

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

‎pom.xml‎

Lines changed: 22 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ DO NOT MODIFY - GENERATED CODE
9797
<dependency>
9898
<groupId>org.jruby</groupId>
9999
<artifactId>jruby-core</artifactId>
100-
<version>9.1.11.0</version>
100+
<version>9.2.19.0</version>
101101
<scope>provided</scope>
102102
</dependency>
103103
<dependency>
@@ -369,7 +369,7 @@ DO NOT MODIFY - GENERATED CODE
369369
</build>
370370
<profiles>
371371
<profile>
372-
<id>test-9.1.2.0</id>
372+
<id>test-9.2.0.0</id>
373373
<build>
374374
<plugins>
375375
<plugin>
@@ -403,126 +403,12 @@ DO NOT MODIFY - GENERATED CODE
403403
</build>
404404
<properties>
405405
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
406-
<jruby.version>9.1.2.0</jruby.version>
407-
<jruby.versions>9.1.2.0</jruby.versions>
408-
</properties>
409-
</profile>
410-
<profile>
411-
<id>test-9.1.8.0</id>
412-
<build>
413-
<plugins>
414-
<plugin>
415-
<artifactId>maven-invoker-plugin</artifactId>
416-
<version>1.8</version>
417-
<executions>
418-
<execution>
419-
<goals>
420-
<goal>install</goal>
421-
<goal>run</goal>
422-
</goals>
423-
<configuration>
424-
<projectsDirectory>integration</projectsDirectory>
425-
<pomIncludes>
426-
<pomInclude>*/pom.xml</pomInclude>
427-
</pomIncludes>
428-
<streamLogs>true</streamLogs>
429-
<properties>
430-
<jruby.versions>${jruby.versions}</jruby.versions>
431-
<jruby.modes>${jruby.modes}</jruby.modes>
432-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
433-
<bc.versions>${bc.versions}</bc.versions>
434-
<runit.dir>${runit.dir}</runit.dir>
435-
</properties>
436-
</configuration>
437-
</execution>
438-
</executions>
439-
</plugin>
440-
</plugins>
441-
</build>
442-
<properties>
443-
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
444-
<jruby.version>9.1.8.0</jruby.version>
445-
<jruby.versions>9.1.8.0</jruby.versions>
446-
</properties>
447-
</profile>
448-
<profile>
449-
<id>test-9.1.12.0</id>
450-
<build>
451-
<plugins>
452-
<plugin>
453-
<artifactId>maven-invoker-plugin</artifactId>
454-
<version>1.8</version>
455-
<executions>
456-
<execution>
457-
<goals>
458-
<goal>install</goal>
459-
<goal>run</goal>
460-
</goals>
461-
<configuration>
462-
<projectsDirectory>integration</projectsDirectory>
463-
<pomIncludes>
464-
<pomInclude>*/pom.xml</pomInclude>
465-
</pomIncludes>
466-
<streamLogs>true</streamLogs>
467-
<properties>
468-
<jruby.versions>${jruby.versions}</jruby.versions>
469-
<jruby.modes>${jruby.modes}</jruby.modes>
470-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
471-
<bc.versions>${bc.versions}</bc.versions>
472-
<runit.dir>${runit.dir}</runit.dir>
473-
</properties>
474-
</configuration>
475-
</execution>
476-
</executions>
477-
</plugin>
478-
</plugins>
479-
</build>
480-
<properties>
481-
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
482-
<jruby.version>9.1.12.0</jruby.version>
483-
<jruby.versions>9.1.12.0</jruby.versions>
484-
</properties>
485-
</profile>
486-
<profile>
487-
<id>test-9.1.16.0</id>
488-
<build>
489-
<plugins>
490-
<plugin>
491-
<artifactId>maven-invoker-plugin</artifactId>
492-
<version>1.8</version>
493-
<executions>
494-
<execution>
495-
<goals>
496-
<goal>install</goal>
497-
<goal>run</goal>
498-
</goals>
499-
<configuration>
500-
<projectsDirectory>integration</projectsDirectory>
501-
<pomIncludes>
502-
<pomInclude>*/pom.xml</pomInclude>
503-
</pomIncludes>
504-
<streamLogs>true</streamLogs>
505-
<properties>
506-
<jruby.versions>${jruby.versions}</jruby.versions>
507-
<jruby.modes>${jruby.modes}</jruby.modes>
508-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
509-
<bc.versions>${bc.versions}</bc.versions>
510-
<runit.dir>${runit.dir}</runit.dir>
511-
</properties>
512-
</configuration>
513-
</execution>
514-
</executions>
515-
</plugin>
516-
</plugins>
517-
</build>
518-
<properties>
519-
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
520-
<jruby.version>9.1.16.0</jruby.version>
521-
<jruby.versions>9.1.16.0</jruby.versions>
406+
<jruby.version>9.2.0.0</jruby.version>
407+
<jruby.versions>9.2.0.0</jruby.versions>
522408
</properties>
523409
</profile>
524410
<profile>
525-
<id>test-9.1.17.0</id>
411+
<id>test-9.2.5.0</id>
526412
<build>
527413
<plugins>
528414
<plugin>
@@ -555,12 +441,12 @@ DO NOT MODIFY - GENERATED CODE
555441
</build>
556442
<properties>
557443
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
558-
<jruby.version>9.1.17.0</jruby.version>
559-
<jruby.versions>9.1.17.0</jruby.versions>
444+
<jruby.version>9.2.5.0</jruby.version>
445+
<jruby.versions>9.2.5.0</jruby.versions>
560446
</properties>
561447
</profile>
562448
<profile>
563-
<id>test-9.2.0.0</id>
449+
<id>test-9.2.10.0</id>
564450
<build>
565451
<plugins>
566452
<plugin>
@@ -593,12 +479,12 @@ DO NOT MODIFY - GENERATED CODE
593479
</build>
594480
<properties>
595481
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
596-
<jruby.version>9.2.0.0</jruby.version>
597-
<jruby.versions>9.2.0.0</jruby.versions>
482+
<jruby.version>9.2.10.0</jruby.version>
483+
<jruby.versions>9.2.10.0</jruby.versions>
598484
</properties>
599485
</profile>
600486
<profile>
601-
<id>test-9.2.5.0</id>
487+
<id>test-9.2.17.0</id>
602488
<build>
603489
<plugins>
604490
<plugin>
@@ -631,12 +517,12 @@ DO NOT MODIFY - GENERATED CODE
631517
</build>
632518
<properties>
633519
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
634-
<jruby.version>9.2.5.0</jruby.version>
635-
<jruby.versions>9.2.5.0</jruby.versions>
520+
<jruby.version>9.2.17.0</jruby.version>
521+
<jruby.versions>9.2.17.0</jruby.versions>
636522
</properties>
637523
</profile>
638524
<profile>
639-
<id>test-9.2.10.0</id>
525+
<id>test-9.2.19.0,</id>
640526
<build>
641527
<plugins>
642528
<plugin>
@@ -669,12 +555,12 @@ DO NOT MODIFY - GENERATED CODE
669555
</build>
670556
<properties>
671557
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
672-
<jruby.version>9.2.10.0</jruby.version>
673-
<jruby.versions>9.2.10.0</jruby.versions>
558+
<jruby.version>9.2.19.0,</jruby.version>
559+
<jruby.versions>9.2.19.0,</jruby.versions>
674560
</properties>
675561
</profile>
676562
<profile>
677-
<id>test-9.2.17.0</id>
563+
<id>test-9.3.15.0,</id>
678564
<build>
679565
<plugins>
680566
<plugin>
@@ -707,12 +593,12 @@ DO NOT MODIFY - GENERATED CODE
707593
</build>
708594
<properties>
709595
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
710-
<jruby.version>9.2.17.0</jruby.version>
711-
<jruby.versions>9.2.17.0</jruby.versions>
596+
<jruby.version>9.3.15.0,</jruby.version>
597+
<jruby.versions>9.3.15.0,</jruby.versions>
712598
</properties>
713599
</profile>
714600
<profile>
715-
<id>test-9.2.19.0</id>
601+
<id>test-9.4.13.0</id>
716602
<build>
717603
<plugins>
718604
<plugin>
@@ -745,8 +631,8 @@ DO NOT MODIFY - GENERATED CODE
745631
</build>
746632
<properties>
747633
<bc.versions>1.60,1.61,1.62,1.63,1.64,1.65,1.66,1.67,1.68</bc.versions>
748-
<jruby.version>9.2.19.0</jruby.version>
749-
<jruby.versions>9.2.19.0</jruby.versions>
634+
<jruby.version>9.4.13.0</jruby.version>
635+
<jruby.versions>9.4.13.0</jruby.versions>
750636
</properties>
751637
</profile>
752638
<profile>

0 commit comments

Comments
 (0)