Skip to content

Commit c17ca8d

Browse files
committed
[build] add latest JRubies + make sure to use expand_path due issues
1 parent e5dc4fa commit c17ca8d

File tree

2 files changed

+81
-4
lines changed

2 files changed

+81
-4
lines changed

Mavenfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ end
102102

103103
supported_bc_versions = %w{ 1.51 1.52 1.53 1.54 } # due EC support dropped <= 1.50
104104

105-
default_bc_version = File.read('lib/jopenssl/version.rb')[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
105+
default_bc_version = File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
106+
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
106107

107108
properties( 'jruby.plugins.version' => '1.0.10',
108109
'jruby.versions' => '1.7.18',
@@ -157,7 +158,7 @@ profile :id => 'test-1.7.4' do
157158
end
158159

159160
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 }
160-
jruby_1_7_versions += %w{ 1.7.24 1.7.25 }
161+
jruby_1_7_versions += %w{ 1.7.24 1.7.25 1.7.26 }
161162

162163
jruby_1_7_versions.each { |version|
163164

@@ -171,7 +172,7 @@ end
171172

172173
}
173174

174-
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.0.0 9.1.1.0 9.1.2.0 }
175+
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.0.0 9.1.1.0 9.1.2.0 9.1.5.0 }
175176

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

pom.xml

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ DO NOT MODIFIY - GENERATED CODE
5757
</snapshotRepository>
5858
</distributionManagement>
5959
<properties>
60-
<bc.versions>1.54</bc.versions>
60+
<bc.versions></bc.versions>
6161
<jruby.plugins.version>1.0.10</jruby.plugins.version>
6262
<invoker.skip>${maven.test.skip}</invoker.skip>
6363
<jruby.version>1.7.18</jruby.version>
@@ -791,6 +791,44 @@ DO NOT MODIFIY - GENERATED CODE
791791
<jruby.versions>1.7.25</jruby.versions>
792792
</properties>
793793
</profile>
794+
<profile>
795+
<id>test-1.7.26</id>
796+
<build>
797+
<plugins>
798+
<plugin>
799+
<artifactId>maven-invoker-plugin</artifactId>
800+
<version>1.8</version>
801+
<executions>
802+
<execution>
803+
<goals>
804+
<goal>install</goal>
805+
<goal>run</goal>
806+
</goals>
807+
<configuration>
808+
<projectsDirectory>integration</projectsDirectory>
809+
<pomIncludes>
810+
<pomInclude>*/pom.xml</pomInclude>
811+
</pomIncludes>
812+
<streamLogs>true</streamLogs>
813+
<properties>
814+
<jruby.versions>${jruby.versions}</jruby.versions>
815+
<jruby.modes>${jruby.modes}</jruby.modes>
816+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
817+
<bc.versions>${bc.versions}</bc.versions>
818+
<runit.dir>${runit.dir}</runit.dir>
819+
</properties>
820+
</configuration>
821+
</execution>
822+
</executions>
823+
</plugin>
824+
</plugins>
825+
</build>
826+
<properties>
827+
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
828+
<jruby.modes>1.8,1.9,2.0</jruby.modes>
829+
<jruby.versions>1.7.26</jruby.versions>
830+
</properties>
831+
</profile>
794832
<profile>
795833
<id>test-9.0.1.0</id>
796834
<build>
@@ -981,6 +1019,44 @@ DO NOT MODIFIY - GENERATED CODE
9811019
<jruby.versions>9.1.2.0</jruby.versions>
9821020
</properties>
9831021
</profile>
1022+
<profile>
1023+
<id>test-9.1.5.0</id>
1024+
<build>
1025+
<plugins>
1026+
<plugin>
1027+
<artifactId>maven-invoker-plugin</artifactId>
1028+
<version>1.8</version>
1029+
<executions>
1030+
<execution>
1031+
<goals>
1032+
<goal>install</goal>
1033+
<goal>run</goal>
1034+
</goals>
1035+
<configuration>
1036+
<projectsDirectory>integration</projectsDirectory>
1037+
<pomIncludes>
1038+
<pomInclude>*/pom.xml</pomInclude>
1039+
</pomIncludes>
1040+
<streamLogs>true</streamLogs>
1041+
<properties>
1042+
<jruby.versions>${jruby.versions}</jruby.versions>
1043+
<jruby.modes>${jruby.modes}</jruby.modes>
1044+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
1045+
<bc.versions>${bc.versions}</bc.versions>
1046+
<runit.dir>${runit.dir}</runit.dir>
1047+
</properties>
1048+
</configuration>
1049+
</execution>
1050+
</executions>
1051+
</plugin>
1052+
</plugins>
1053+
</build>
1054+
<properties>
1055+
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
1056+
<jruby.version>9.1.5.0</jruby.version>
1057+
<jruby.versions>9.1.5.0</jruby.versions>
1058+
</properties>
1059+
</profile>
9841060
<profile>
9851061
<id>release</id>
9861062
<build>

0 commit comments

Comments
 (0)