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: 810d14046789
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: ee538ee1b341
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 16, 2016

  1. improve setup of rake tests

    @mkristian
    mkristian committed Mar 16, 2016
    Copy the full SHA
    3060dcf View commit details

  2. [build] use the version from the code for pom.xml

    @mkristian
    mkristian committed Mar 16, 2016
    Copy the full SHA
    ee538ee View commit details
Showing with 13 additions and 7 deletions.
  1. +3 −0 Gemfile
  2. +4 −4 Rakefile
  3. +1 −1 pom.xml
  4. +5 −2 src/test/ruby/test_helper.rb
3 changes: 3 additions & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -2,3 +2,6 @@ source 'https://rubygems.org'

# Specify your gem's dependencies in the gemspec
gemspec

# for the rake task
gem 'ruby-maven', '~> 3.3.8'
8 changes: 4 additions & 4 deletions Rakefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#-*- mode: ruby -*-

begin
require 'maven/ruby/tasks'
require 'ruby-maven'
rescue LoadError
warn "ruby-maven not available - some tasks will not work " <<
"either `gem install ruby-maven' or use mvn instead of rake"
@@ -19,12 +19,12 @@ else
Rake::Task[:jar].clear
desc "Package jopenssl.jar with the compiled classes"
task :jar => :maven do
maven.prepare_package '-Dmaven.test.skip=true'
RubyMaven.exec( 'prepare_package -Dmaven.test.skip=true'
end
namespace :jar do
desc "Package jopenssl.jar file (and dependendent jars)"
task :all => :maven do
maven.package '-Dmaven.test.skip=true'
RubyMaven.exec( 'package -Dmaven.test.skip=true'
end
end
end
@@ -64,4 +64,4 @@ namespace :integration do
lib = [ 'lib', 'src/test/integration' ]
ruby "-I#{lib.join(':')} -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
end
end
end
2 changes: 1 addition & 1 deletion pom.xml
View file
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.16</version>
<version>0.9.17</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>
7 changes: 5 additions & 2 deletions src/test/ruby/test_helper.rb
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,10 @@
puts Java::OrgBouncycastleJceProvider::BouncyCastleProvider.new.info
else
base_dir = File.expand_path('../../..', File.dirname(__FILE__))
$CLASSPATH << File.join(base_dir, 'pkg/classes')

jar = File.join(base_dir, 'lib/jopenssl.jar')
raise "jopenssl.jar jar not found" unless jar; $CLASSPATH << jar

jar = Dir[File.join(base_dir, 'lib/org/bouncycastle/**/bcprov-*.jar')].first
raise "bcprov jar not found" unless jar; $CLASSPATH << jar
jar = Dir[File.join(base_dir, 'lib/org/bouncycastle/**/bcpkix-*.jar')].first
@@ -205,4 +208,4 @@ def issue_crl(revoke_info, serial, lastup, nextup, extensions,
Dir.glob("#{File.join(base, sub)}/**/test_*.rb").each do |test|
require test
end
end
end