Skip to content

Commit a6b0a3a

Browse files
committed
Merge remote-tracking branch 'origin/jruby-9.2'
2 parents d5e4f85 + fbe13bf commit a6b0a3a

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

lib/pom.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def log(message=nil)
3333
['mutex_m', '0.1.0'],
3434
['ostruct', '0.3.0'],
3535
['prime', '0.1.0'],
36-
['psych', '3.3.1'],
36+
['psych', '3.2.0'],
3737
['racc', '1.5.2'],
3838
['rake-ant', '1.0.4'],
3939
['rdoc', '${rdoc.version}'],

lib/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ DO NOT MODIFIY - GENERATED CODE
268268
<dependency>
269269
<groupId>rubygems</groupId>
270270
<artifactId>psych</artifactId>
271-
<version>3.3.1</version>
271+
<version>3.2.0</version>
272272
<type>gem</type>
273273
<scope>provided</scope>
274274
<exclusions>
@@ -586,9 +586,9 @@ DO NOT MODIFIY - GENERATED CODE
586586
<include>cache/prime*0.1.0.gem</include>
587587
<include>gems/prime*0.1.0/**</include>
588588
<include>specifications/prime*0.1.0.gemspec</include>
589-
<include>cache/psych*3.3.1.gem</include>
590-
<include>gems/psych*3.3.1/**</include>
591-
<include>specifications/psych*3.3.1.gemspec</include>
589+
<include>cache/psych*3.2.0.gem</include>
590+
<include>gems/psych*3.2.0/**</include>
591+
<include>specifications/psych*3.2.0.gemspec</include>
592592
<include>cache/racc*1.5.2.gem</include>
593593
<include>gems/racc*1.5.2/**</include>
594594
<include>specifications/racc*1.5.2.gemspec</include>

0 commit comments

Comments
 (0)