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: 3f25f725060d
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: 91c5ad1b981f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 24, 2018

  1. [build] try using later 1.7 JRuby for maven plugin

    @kares
    kares committed Jul 24, 2018
    Copy the full SHA
    33475eb View commit details

  2. [ci] do not use failing to start 1.7 JRubies 

    ... this will bite back later - let's keep moving forward
    @kares
    kares committed Jul 24, 2018
    Copy the full SHA
    91c5ad1 View commit details
Showing with 7 additions and 10 deletions.
  1. +2 −5 .travis.yml
  2. +2 −2 Mavenfile
  3. +3 −3 pom.xml
7 changes: 2 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -29,16 +29,13 @@ matrix:
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-1.7.24
- jdk: openjdk7
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-1.7.25
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-1.7.26
#
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.24" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.26" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.26
@@ -57,7 +54,7 @@ matrix:
rvm: jruby-1.7.26
- jdk: openjdk7
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.21
rvm: jruby-1.7.24
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-9.0.5.0
4 changes: 2 additions & 2 deletions Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -98,14 +98,14 @@ default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]

properties( 'jruby.plugins.version' => '1.0.10',
'jruby.versions' => '1.7.20',
'jruby.versions' => '1.7.26',
'bc.versions' => default_bc_version,
'invoker.test' => '${bc.versions}',
# allow to skip all tests with -Dmaven.test.skip
'invoker.skip' => '${maven.test.skip}',
'runit.dir' => 'src/test/ruby/**/test_*.rb',
# use this version of jruby for ALL the jruby-maven-plugins
'jruby.version' => '1.7.20',
'jruby.version' => '1.7.26',
# dump pom.xml as readonly when running 'rmvn'
'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -57,13 +57,13 @@ DO NOT MODIFIY - GENERATED CODE
</snapshotRepository>
</distributionManagement>
<properties>
<bc.versions></bc.versions>
<bc.versions>1.59</bc.versions>
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<invoker.skip>${maven.test.skip}</invoker.skip>
<jruby.version>1.7.20</jruby.version>
<jruby.version>1.7.26</jruby.version>
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
<jruby.versions>1.7.20</jruby.versions>
<jruby.versions>1.7.26</jruby.versions>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>