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

Commits on Nov 21, 2015

  1. set next dev SNAPSHOT

    kares committed Nov 21, 2015
    Copy the full SHA
    b76d879 View commit details
  2. Copy the full SHA
    cae3d57 View commit details
  3. Copy the full SHA
    4694e7f View commit details
Showing with 3 additions and 4 deletions.
  1. +0 −1 .travis.yml
  2. +1 −1 Rakefile
  3. +1 −1 lib/jopenssl/version.rb
  4. +1 −1 pom.xml
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@ matrix:
exclude:
- jdk: openjdk6
env: TEST_PROFILE=test-9.0.1.0
exclude:
- jdk: openjdk6
env: TEST_PROFILE=test-9.0.4.0
include:
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -58,6 +58,6 @@ namespace :integration do
end
loader = "ARGV.each { |f| require f }"
test_files = FileList['src/test/integration/*_test.rb'].to_a
ruby "-Ilib -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
ruby "-Ilib:. -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
end
end
2 changes: 1 addition & 1 deletion lib/jopenssl/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Jopenssl
module Version
VERSION = '0.9.12'
VERSION = '0.9.13.dev'
BOUNCY_CASTLE_VERSION = '1.50'
end
end
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
<modelVersion>4.0.0</modelVersion>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.12</version>
<version>0.9.13.dev-SNAPSHOT</version>
<packaging>gem</packaging>
<name>JRuby OpenSSL</name>
<description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>