Skip to content

Commit

Permalink
[build] add latest JRubies + make sure to use expand_path due issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@kares
kares committed Nov 4, 2016
1 parent e5dc4fa commit c17ca8d
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 4 deletions.
7 changes: 4 additions & 3 deletions Mavenfile
View file
Expand Up @@ -102,7 +102,8 @@ end

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

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

properties( 'jruby.plugins.version' => '1.0.10',
'jruby.versions' => '1.7.18',
Expand Down Expand Up @@ -157,7 +158,7 @@ profile :id => 'test-1.7.4' do
end

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

jruby_1_7_versions.each { |version|

Expand All @@ -171,7 +172,7 @@ end

}

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 }
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 }

jruby_9_K_versions.each { |version|
profile :id => "test-#{version}" do
Expand Down
78 changes: 77 additions & 1 deletion pom.xml
View file
Expand Up @@ -57,7 +57,7 @@ DO NOT MODIFIY - GENERATED CODE
</snapshotRepository>
</distributionManagement>
<properties>
<bc.versions>1.54</bc.versions>
<bc.versions></bc.versions>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<invoker.skip>${maven.test.skip}</invoker.skip>
<jruby.version>1.7.18</jruby.version>
Expand Down Expand Up @@ -791,6 +791,44 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.versions>1.7.25</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.26</id>
<build>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
<projectsDirectory>integration</projectsDirectory>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
<properties>
<jruby.versions>${jruby.versions}</jruby.versions>
<jruby.modes>${jruby.modes}</jruby.modes>
<jruby.openssl.version>${project.version}</jruby.openssl.version>
<bc.versions>${bc.versions}</bc.versions>
<runit.dir>${runit.dir}</runit.dir>
</properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.26</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.0.1.0</id>
<build>
Expand Down Expand Up @@ -981,6 +1019,44 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.versions>9.1.2.0</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.1.5.0</id>
<build>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
<projectsDirectory>integration</projectsDirectory>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
<properties>
<jruby.versions>${jruby.versions}</jruby.versions>
<jruby.modes>${jruby.modes}</jruby.modes>
<jruby.openssl.version>${project.version}</jruby.openssl.version>
<bc.versions>${bc.versions}</bc.versions>
<runit.dir>${runit.dir}</runit.dir>
</properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.1.5.0</jruby.version>
<jruby.versions>9.1.5.0</jruby.versions>
</properties>
</profile>
<profile>
<id>release</id>
<build>
Expand Down

0 comments on commit c17ca8d

Please sign in to comment.