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: f86bc0bc8dfd
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: 3c30b3404d69
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 1, 2017

  1. [build] get rid of old JRuby profiles and 1.8 mode, for good hopefully

    @kares
    kares committed Oct 1, 2017
    Copy the full SHA
    a20a24d View commit details

  2. actually, JRuby 1.7.20 might still be good to go?

    @kares
    kares committed Oct 1, 2017
    Copy the full SHA
    4e4209d View commit details

  3. [travis-ci] adjust test matrix - include some 9.1.13.0 testing

    @kares
    kares committed Oct 1, 2017
    Copy the full SHA
    3c30b34 View commit details
Showing with 74 additions and 112 deletions.
  1. +6 −6 .travis.yml
  2. +17 −17 Mavenfile
  3. +1 −1 lib/jopenssl/load.rb
  4. +50 −88 pom.xml
12 changes: 6 additions & 6 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ env:
- TEST_PROFILE=test-1.7.26
- TEST_PROFILE=test-9.0.5.0
- TEST_PROFILE=test-9.1.8.0
- TEST_PROFILE=test-9.1.12.0
- TEST_PROFILE=test-9.1.13.0

install: if [[ -v BUNDLE_INSTALL ]]; then jruby -S bundle install; else echo ""; fi

@@ -20,7 +20,7 @@ matrix:
- env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.24
- env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.20
rvm: jruby-1.7.21
include:
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
@@ -44,16 +44,16 @@ matrix:
rvm: jruby-1.7.26
- jdk: openjdk7
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.18
rvm: jruby-1.7.21
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-9.0.5.0
- jdk: openjdk7
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-9.1.2.0
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-9.1.5.0
- jdk: openjdk7
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-9.1.8.0
notifications:
irc:
channels:
34 changes: 17 additions & 17 deletions Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -141,21 +141,21 @@ invoker_run_options = {
'runit.dir' => '${runit.dir}' }
}

profile :id => 'test-1.6.8' do
plugin :invoker, '1.8' do
execute_goals( :install, :run, invoker_run_options )
end
properties 'jruby.versions' => '1.6.8', 'jruby.modes' => '1.8,1.9',
'bc.versions' => supported_bc_versions.join(',')
end

profile :id => 'test-1.7.4' do
plugin :invoker, '1.8' do
execute_goals( :install, :run, invoker_run_options )
end
properties 'jruby.versions' => '1.7.4', 'jruby.modes' => '1.8,1.9',
'bc.versions' => supported_bc_versions.join(',')
end
# profile :id => 'test-1.6.8' do
# plugin :invoker, '1.8' do
# execute_goals( :install, :run, invoker_run_options )
# end
# properties 'jruby.versions' => '1.6.8', 'jruby.modes' => '1.8,1.9',
# 'bc.versions' => supported_bc_versions.join(',')
# end
#
# profile :id => 'test-1.7.4' do
# plugin :invoker, '1.8' do
# execute_goals( :install, :run, invoker_run_options )
# end
# properties 'jruby.versions' => '1.7.4', 'jruby.modes' => '1.8,1.9',
# 'bc.versions' => supported_bc_versions.join(',')
# 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 1.7.26 1.7.27 }
@@ -166,13 +166,13 @@ profile :id => "test-#{version}" do
plugin :invoker, '1.8' do
execute_goals( :install, :run, invoker_run_options )
end
properties 'jruby.versions' => version, 'jruby.modes' => '1.8,1.9,2.0',
properties 'jruby.versions' => version, 'jruby.modes' => '1.9,2.0',
'bc.versions' => supported_bc_versions.join(',')
end

}

jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.5.0 9.1.8.0 9.1.12.0 }
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.5.0 9.1.8.0 9.1.12.0 9.1.13.0 }

jruby_9_K_versions.each { |version|
profile :id => "test-#{version}" do
2 changes: 1 addition & 1 deletion lib/jopenssl/load.rb
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
require 'java'
require 'jopenssl/version'

warn "JRuby #{JRUBY_VERSION} is not supported by jruby-openssl #{Jopenssl::VERSION}" if JRUBY_VERSION <= '1.7.20'
warn "JRuby #{JRUBY_VERSION} is not supported by jruby-openssl #{Jopenssl::VERSION}" if JRUBY_VERSION < '1.7.20'

# NOTE: assuming user does pull in BC .jars from somewhere else on the CP
unless ENV_JAVA['jruby.openssl.load.jars'].eql?('false')
138 changes: 50 additions & 88 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -378,83 +378,6 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<profiles>
<profile>
<id>test-1.6.8</id>
<build>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>tests-with-different-bc-versions</id>
<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</jruby.modes>
<jruby.versions>1.6.8</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.4</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</jruby.modes>
<jruby.versions>1.7.4</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.13</id>
<build>
@@ -464,6 +387,7 @@ DO NOT MODIFIY - GENERATED CODE
<version>1.8</version>
<executions>
<execution>
<id>tests-with-different-bc-versions</id>
<goals>
<goal>install</goal>
<goal>run</goal>
@@ -489,7 +413,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.13</jruby.versions>
</properties>
</profile>
@@ -527,7 +451,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.15</jruby.versions>
</properties>
</profile>
@@ -565,7 +489,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.16</jruby.versions>
</properties>
</profile>
@@ -603,7 +527,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.18</jruby.versions>
</properties>
</profile>
@@ -641,7 +565,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.20</jruby.versions>
</properties>
</profile>
@@ -679,7 +603,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.22</jruby.versions>
</properties>
</profile>
@@ -717,7 +641,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.23</jruby.versions>
</properties>
</profile>
@@ -755,7 +679,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.24</jruby.versions>
</properties>
</profile>
@@ -793,7 +717,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.25</jruby.versions>
</properties>
</profile>
@@ -831,7 +755,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.26</jruby.versions>
</properties>
</profile>
@@ -869,7 +793,7 @@ DO NOT MODIFIY - GENERATED CODE
</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.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.27</jruby.versions>
</properties>
</profile>
@@ -1101,6 +1025,44 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.versions>9.1.12.0</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.1.13.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.13.0</jruby.version>
<jruby.versions>9.1.13.0</jruby.versions>
</properties>
</profile>
<profile>
<id>release</id>
<build>