Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf459cc7161c^
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a3572ecceb43
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 11, 2016

  1. setup build running with new BC versions (1.51 - 1.54)

    @kares
    kares committed Jan 11, 2016
    Copy the full SHA
    bf459cc View commit details

  2. [travis-ci] test against JRuby 1.7.23

    @kares
    kares committed Jan 11, 2016
    Copy the full SHA
    a3572ec View commit details
Showing with 20 additions and 17 deletions.
  1. +1 −0 .travis.yml
  2. +4 −2 Mavenfile
  3. +15 −15 pom.xml
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ env:
- TEST_PROFILE=test-1.7.13
- TEST_PROFILE=test-1.7.18
- TEST_PROFILE=test-1.7.22
- TEST_PROFILE=test-1.7.23
- TEST_PROFILE=test-9.0.1.0
- TEST_PROFILE=test-9.0.4.0

6 changes: 4 additions & 2 deletions Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ plugin :deploy, '2.8.1' do
execute_goals( :deploy, :skip => false )
end

supported_bc_versions = %w{ 1.47 1.48 1.49 1.50 1.51 }
supported_bc_versions = %w{ 1.49 1.50 1.51 1.52 1.53 1.54 }

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

@@ -156,7 +156,9 @@ profile :id => 'test-1.7.4' do
'bc.versions' => supported_bc_versions.join(',')
end

%w{ 1.7.13 1.7.15 1.7.16 1.7.18 1.7.20 1.7.21 1.7.22 }.each { |version|
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.each { |version|

profile :id => "test-#{version}" do
plugin :invoker, '1.8' do
30 changes: 15 additions & 15 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -406,7 +406,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9</jruby.modes>
<jruby.versions>1.6.8</jruby.versions>
</properties>
@@ -444,7 +444,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9</jruby.modes>
<jruby.versions>1.7.4</jruby.versions>
</properties>
@@ -482,7 +482,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.13</jruby.versions>
</properties>
@@ -520,7 +520,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.15</jruby.versions>
</properties>
@@ -558,7 +558,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.16</jruby.versions>
</properties>
@@ -596,7 +596,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.18</jruby.versions>
</properties>
@@ -634,13 +634,13 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.20</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.21</id>
<id>test-1.7.22</id>
<build>
<plugins>
<plugin>
@@ -672,13 +672,13 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.21</jruby.versions>
<jruby.versions>1.7.22</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.22</id>
<id>test-1.7.23</id>
<build>
<plugins>
<plugin>
@@ -710,9 +710,9 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.22</jruby.versions>
<jruby.versions>1.7.23</jruby.versions>
</properties>
</profile>
<profile>
@@ -748,7 +748,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.0.1.0</jruby.version>
<jruby.versions>9.0.1.0</jruby.versions>
</properties>
@@ -786,7 +786,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.0.4.0</jruby.version>
<jruby.versions>9.0.4.0</jruby.versions>
</properties>