Merge branch 'jruby-1_7'

Conflicts: lib/pom.rb lib/ruby/shared/ffi/platform/x86_64-windows/platform.conf
jruby · May 27, 2015 · f7c4f75 · f7c4f75
2 parents 6bfb18a + ec2960a
commit f7c4f75
Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -29,7 +29,7 @@ def version
    ImportedGem.new( 'power_assert', 'power_assert.version', true ),
    ImportedGem.new( 'psych', '2.0.14.pre1', true ),
    ImportedGem.new( 'json', 'json.version', true ),
-   ImportedGem.new( 'jar-dependencies', '0.1.13', true )
+   ImportedGem.new( 'jar-dependencies', '0.1.14', true )
   ]
 
 project 'JRuby Lib Setup' do

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -144,7 +144,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>0.1.13</version>
+      <version>0.1.14</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>