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: 597cce851c13
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: 9a2379027b0d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 27, 2016

  1. fill in missed release notes for 0.9.15

    @kares
    kares committed Jan 27, 2016
    Copy the full SHA
    1aa736d View commit details

  2. finish-up releasing notes in BUILDING.md

    @kares
    kares committed Jan 27, 2016
    Copy the full SHA
    c107c84 View commit details

  3. [travis-ci] allow failures on 1.7.22 now that we're good against 1.7.24

    @kares
    kares committed Jan 27, 2016
    Copy the full SHA
    9a23790 View commit details
Showing with 14 additions and 2 deletions.
  1. +3 −1 .travis.yml
  2. +6 −1 BUILDING.md
  3. +5 −0 History.md
4 changes: 3 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ install: echo 'no bundle install atm!'
script: if [[ -v TEST_COMMAND ]]; then $TEST_COMMAND; else mvn verify -P $TEST_PROFILE; fi

matrix:
allow_failures:
- rvm: jruby-1.7.22 # seems as an embed loading bug (same with 1.7.23)
exclude:
- jdk: openjdk6
env: TEST_PROFILE=test-9.0.1.0
@@ -29,7 +31,7 @@ matrix:
include:
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.22
rvm: jruby-1.7.24
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-9.0.4.0
7 changes: 6 additions & 1 deletion BUILDING.md
View file
Original file line number Diff line number Diff line change
@@ -37,6 +37,11 @@ one can run a tests Ruby-style e.g. `jruby -Ilib:. src/test/ruby/test_bn.rb`
* (advised) run JRuby's full suite using the staged new jruby-openssl gem
e.g. https://github.com/jruby/jruby/commit/1df6315e9145195f19ad862be5e3a5

* (advised) release the staging repository at Sonatype's if all is well

* (optional) update JRuby to bundle new jruby-openssl gem (remove staging)
e.g. https://github.com/jruby/jruby/commit/8750e736491825eec1d1954a07d492

* gem push the build gem from pkg/ e.g. `gem push pkg/jruby-openssl-0.9.15.gem`

* tag the release e.g. `git tag v0.9.15`
@@ -46,7 +51,7 @@ one can run a tests Ruby-style e.g. `jruby -Ilib:. src/test/ruby/test_bn.rb`

* `git push origin master --tags`

* e.g. https://github.com/jruby/jruby/commit/8750e736491825eec1d1954a07d492
* (advised) ... take the rest of the day off!


#### Manually Deploying
5 changes: 5 additions & 0 deletions History.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.9.15

* always return a Fixnum from `OpenSSL::SSL::Session#timeout`, OpenSSL defaults
to 300 (been causing net/http.rb issues with timeouts on JRuby 9K)

## 0.9.14

* upgrade to using BC **1.54** as default (all versions >= 1.49 are supported)