Merge branch 'jruby'

Conflicts:
	.travis.yml

.travis.yml

@@ -5,6 +5,8 @@ rvm:
   - 1.9.2
   - 1.8.7
   - ree
+  - jruby-18mode
+  - jruby-19mode
 matrix:
   allow_failures:
     - rvm: 2.0.0

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.7.2 (Unreleased)
+
+  - [#187](https://github.com/airblade/paper_trail/pull/187) - Confirmed JRuby support.
+
 ## 2.7.1
 
   - [#206](https://github.com/airblade/paper_trail/issues/206) - Fixed Ruby 1.8.7 compatibility for tracking `object_changes`.

paper_trail.gemspec

@@ -20,6 +20,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'shoulda', '~> 3.3'
-  s.add_development_dependency 'sqlite3', '~> 1.2'
-  s.add_development_dependency 'ffaker', '>= 1.15'
+  s.add_development_dependency 'ffaker',  '>= 1.15'
+  # JRuby support for the test ENV
+  unless defined?(JRUBY_VERSION)
+    s.add_development_dependency 'sqlite3', '~> 1.2'
+  else
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.2.9'
+  end
 end