Skip to content

Commit 5ec28c1

Browse files
kareskares
committed
[build] work-around building on Java 11
old mavengem still used through polyglot dependency also can not use 9.1.17.0 as its jossl load errors
1 parent 2e087c4 commit 5ec28c1

2 files changed

Lines changed: 39 additions & 32 deletions

File tree

‎Mavenfile‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ end
8686
jar 'org.jruby:jruby-core', '1.7.20', :scope => :provided
8787
jar 'junit:junit', '4.11', :scope => :test
8888

89+
# 9.1.17.0 is Java 7 compatible (till supporting JRuby 1.7)
90+
# NOTE: to build on Java 11 - installing gems fails (due old jossl) with:
91+
# load error: jopenssl/load -- java.lang.StringIndexOutOfBoundsException
92+
MVN_JRUBY_VERSION = ENV_JAVA['java.version'].to_i >= 9 ? '9.2.9.0' : '9.1.17.0'
93+
8994
jruby_plugin! :gem do
9095
# when installing dependent gems we want to use the built in openssl not the one from this lib directory
9196
# we compile against jruby-core-1.7.20 and want to keep this out of the plugin execution here
@@ -103,16 +108,17 @@ supported_bc_versions = %w{ 1.56 1.57 1.58 1.59 1.60 1.61 1.62 1.63 1.64 }
103108
default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
104109
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
105110

106-
properties( 'jruby.plugins.version' => '1.1.6',
107-
'jruby.versions' => '9.1.17.0',
111+
properties( 'jruby.plugins.version' => '1.1.8',
108112
'jruby.switches' => '-W0', # https://github.com/torquebox/jruby-maven-plugins/issues/94
109113
'bc.versions' => default_bc_version,
110114
'invoker.test' => '${bc.versions}',
111115
# allow to skip all tests with -Dmaven.test.skip
112116
'invoker.skip' => '${maven.test.skip}',
113117
'runit.dir' => 'src/test/ruby/**/test_*.rb',
114-
# use this version of jruby for ALL the jruby-maven-plugins
115-
'jruby.version' => '9.1.17.0', # Java 7 compatible till supporting JRuby 1.7
118+
'mavengem.wagon.version' => '1.0.3', # for jruby plugin
119+
'mavengem-wagon.version' => '1.0.3', # for polyglot-ruby
120+
# use this version of jruby for the jruby-maven-plugins
121+
'jruby.versions' => MVN_JRUBY_VERSION, 'jruby.version' => MVN_JRUBY_VERSION,
116122
# dump pom.xml as readonly when running 'rmvn'
117123
'polyglot.dump.pom' => 'pom.xml',
118124
'polyglot.dump.readonly' => true )

‎pom.xml‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,18 @@ DO NOT MODIFIY - GENERATED CODE
6060
</snapshotRepository>
6161
</distributionManagement>
6262
<properties>
63-
<invoker.skip>${maven.test.skip}</invoker.skip>
64-
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
65-
<polyglot.dump.readonly>true</polyglot.dump.readonly>
66-
<jruby.switches>-W0</jruby.switches>
6763
<bc.versions>1.62</bc.versions>
64+
<invoker.skip>${maven.test.skip}</invoker.skip>
6865
<invoker.test>${bc.versions}</invoker.test>
69-
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
70-
<jruby.versions>9.1.17.0</jruby.versions>
71-
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
66+
<jruby.plugins.version>1.1.8</jruby.plugins.version>
67+
<jruby.switches>-W0</jruby.switches>
7268
<jruby.version>9.1.17.0</jruby.version>
73-
<jruby.plugins.version>1.1.6</jruby.plugins.version>
69+
<jruby.versions>9.1.17.0</jruby.versions>
70+
<mavengem-wagon.version>1.0.3</mavengem-wagon.version>
71+
<mavengem.wagon.version>1.0.3</mavengem.wagon.version>
72+
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
73+
<polyglot.dump.readonly>true</polyglot.dump.readonly>
74+
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
7475
</properties>
7576
<dependencies>
7677
<dependency>
@@ -433,8 +434,8 @@ DO NOT MODIFIY - GENERATED CODE
433434
</plugins>
434435
</build>
435436
<properties>
436-
<jruby.modes>1.9,2.0</jruby.modes>
437437
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
438+
<jruby.modes>1.9,2.0</jruby.modes>
438439
<jruby.versions>1.7.20</jruby.versions>
439440
</properties>
440441
</profile>
@@ -471,8 +472,8 @@ DO NOT MODIFIY - GENERATED CODE
471472
</plugins>
472473
</build>
473474
<properties>
474-
<jruby.modes>1.9,2.0</jruby.modes>
475475
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
476+
<jruby.modes>1.9,2.0</jruby.modes>
476477
<jruby.versions>1.7.22</jruby.versions>
477478
</properties>
478479
</profile>
@@ -509,8 +510,8 @@ DO NOT MODIFIY - GENERATED CODE
509510
</plugins>
510511
</build>
511512
<properties>
512-
<jruby.modes>1.9,2.0</jruby.modes>
513513
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
514+
<jruby.modes>1.9,2.0</jruby.modes>
514515
<jruby.versions>1.7.23</jruby.versions>
515516
</properties>
516517
</profile>
@@ -547,8 +548,8 @@ DO NOT MODIFIY - GENERATED CODE
547548
</plugins>
548549
</build>
549550
<properties>
550-
<jruby.modes>1.9,2.0</jruby.modes>
551551
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
552+
<jruby.modes>1.9,2.0</jruby.modes>
552553
<jruby.versions>1.7.24</jruby.versions>
553554
</properties>
554555
</profile>
@@ -585,8 +586,8 @@ DO NOT MODIFIY - GENERATED CODE
585586
</plugins>
586587
</build>
587588
<properties>
588-
<jruby.modes>1.9,2.0</jruby.modes>
589589
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
590+
<jruby.modes>1.9,2.0</jruby.modes>
590591
<jruby.versions>1.7.25</jruby.versions>
591592
</properties>
592593
</profile>
@@ -623,8 +624,8 @@ DO NOT MODIFIY - GENERATED CODE
623624
</plugins>
624625
</build>
625626
<properties>
626-
<jruby.modes>1.9,2.0</jruby.modes>
627627
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
628+
<jruby.modes>1.9,2.0</jruby.modes>
628629
<jruby.versions>1.7.26</jruby.versions>
629630
</properties>
630631
</profile>
@@ -661,8 +662,8 @@ DO NOT MODIFIY - GENERATED CODE
661662
</plugins>
662663
</build>
663664
<properties>
664-
<jruby.modes>1.9,2.0</jruby.modes>
665665
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
666+
<jruby.modes>1.9,2.0</jruby.modes>
666667
<jruby.versions>1.7.27</jruby.versions>
667668
</properties>
668669
</profile>
@@ -700,8 +701,8 @@ DO NOT MODIFIY - GENERATED CODE
700701
</build>
701702
<properties>
702703
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
703-
<jruby.versions>9.0.1.0</jruby.versions>
704704
<jruby.version>9.0.1.0</jruby.version>
705+
<jruby.versions>9.0.1.0</jruby.versions>
705706
</properties>
706707
</profile>
707708
<profile>
@@ -738,8 +739,8 @@ DO NOT MODIFIY - GENERATED CODE
738739
</build>
739740
<properties>
740741
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
741-
<jruby.versions>9.0.5.0</jruby.versions>
742742
<jruby.version>9.0.5.0</jruby.version>
743+
<jruby.versions>9.0.5.0</jruby.versions>
743744
</properties>
744745
</profile>
745746
<profile>
@@ -776,8 +777,8 @@ DO NOT MODIFIY - GENERATED CODE
776777
</build>
777778
<properties>
778779
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
779-
<jruby.versions>9.1.2.0</jruby.versions>
780780
<jruby.version>9.1.2.0</jruby.version>
781+
<jruby.versions>9.1.2.0</jruby.versions>
781782
</properties>
782783
</profile>
783784
<profile>
@@ -814,8 +815,8 @@ DO NOT MODIFIY - GENERATED CODE
814815
</build>
815816
<properties>
816817
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
817-
<jruby.versions>9.1.8.0</jruby.versions>
818818
<jruby.version>9.1.8.0</jruby.version>
819+
<jruby.versions>9.1.8.0</jruby.versions>
819820
</properties>
820821
</profile>
821822
<profile>
@@ -852,8 +853,8 @@ DO NOT MODIFIY - GENERATED CODE
852853
</build>
853854
<properties>
854855
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
855-
<jruby.versions>9.1.12.0</jruby.versions>
856856
<jruby.version>9.1.12.0</jruby.version>
857+
<jruby.versions>9.1.12.0</jruby.versions>
857858
</properties>
858859
</profile>
859860
<profile>
@@ -890,8 +891,8 @@ DO NOT MODIFIY - GENERATED CODE
890891
</build>
891892
<properties>
892893
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
893-
<jruby.versions>9.1.16.0</jruby.versions>
894894
<jruby.version>9.1.16.0</jruby.version>
895+
<jruby.versions>9.1.16.0</jruby.versions>
895896
</properties>
896897
</profile>
897898
<profile>
@@ -928,8 +929,8 @@ DO NOT MODIFIY - GENERATED CODE
928929
</build>
929930
<properties>
930931
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
931-
<jruby.versions>9.1.17.0</jruby.versions>
932932
<jruby.version>9.1.17.0</jruby.version>
933+
<jruby.versions>9.1.17.0</jruby.versions>
933934
</properties>
934935
</profile>
935936
<profile>
@@ -966,8 +967,8 @@ DO NOT MODIFIY - GENERATED CODE
966967
</build>
967968
<properties>
968969
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
969-
<jruby.versions>9.2.0.0</jruby.versions>
970970
<jruby.version>9.2.0.0</jruby.version>
971+
<jruby.versions>9.2.0.0</jruby.versions>
971972
</properties>
972973
</profile>
973974
<profile>
@@ -1004,8 +1005,8 @@ DO NOT MODIFIY - GENERATED CODE
10041005
</build>
10051006
<properties>
10061007
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
1007-
<jruby.versions>9.2.5.0</jruby.versions>
10081008
<jruby.version>9.2.5.0</jruby.version>
1009+
<jruby.versions>9.2.5.0</jruby.versions>
10091010
</properties>
10101011
</profile>
10111012
<profile>
@@ -1042,8 +1043,8 @@ DO NOT MODIFIY - GENERATED CODE
10421043
</build>
10431044
<properties>
10441045
<bc.versions>1.56,1.57,1.58,1.59,1.60,1.61,1.62,1.63,1.64</bc.versions>
1045-
<jruby.versions>9.2.6.0</jruby.versions>
10461046
<jruby.version>9.2.6.0</jruby.version>
1047+
<jruby.versions>9.2.6.0</jruby.versions>
10471048
</properties>
10481049
</profile>
10491050
<profile>
@@ -1080,8 +1081,8 @@ DO NOT MODIFIY - GENERATED CODE
10801081
</build>
10811082
<properties>
10821083
<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>
10841084
<jruby.version>9.2.7.0</jruby.version>
1085+
<jruby.versions>9.2.7.0</jruby.versions>
10851086
</properties>
10861087
</profile>
10871088
<profile>
@@ -1118,8 +1119,8 @@ DO NOT MODIFIY - GENERATED CODE
11181119
</build>
11191120
<properties>
11201121
<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>
11221122
<jruby.version>9.2.8.0</jruby.version>
1123+
<jruby.versions>9.2.8.0</jruby.versions>
11231124
</properties>
11241125
</profile>
11251126
<profile>
@@ -1156,8 +1157,8 @@ DO NOT MODIFIY - GENERATED CODE
11561157
</build>
11571158
<properties>
11581159
<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>
11601160
<jruby.version>9.2.9.0</jruby.version>
1161+
<jruby.versions>9.2.9.0</jruby.versions>
11611162
</properties>
11621163
</profile>
11631164
<profile>

0 commit comments

Comments
 (0)