Skip to content

Commit

Permalink
Merge branch 'jruby-1_7'
Browse files Browse the repository at this point in the history
Conflicts:
	lib/pom.rb
	lib/ruby/shared/ffi/platform/x86_64-windows/platform.conf
  • Loading branch information
mkristian committed May 27, 2015
2 parents 6bfb18a + ec2960a commit f7c4f75
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit f7c4f75

Please sign in to comment.