Update to latest ruby-maven and start using the new psych gem.

jruby · Apr 30, 2015 · c75204f · c75204f
1 parent 69b8e67
commit c75204f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -27,7 +27,7 @@ def version
    ImportedGem.new( 'minitest', 'minitest.version', true ),
    ImportedGem.new( 'test-unit', 'test-unit.version', true ),
    ImportedGem.new( 'power_assert', 'power_assert.version', true ),
-   ImportedGem.new( 'psych', '2.0.9.2', true ),
+   ImportedGem.new( 'psych', '2.0.14.pre1', true ),
    ImportedGem.new( 'json', 'json.version', true ),
    ImportedGem.new( 'jar-dependencies', '0.1.13', true )
   ]
@@ -87,7 +87,7 @@ def to_pathname
     end
   end
 
-  gem 'ruby-maven', '3.1.1.0.8', :scope => :provided
+  gem 'ruby-maven', '3.1.1.0.11', :scope => :provided
 
   default_gemnames = default_gems.collect { |g| g.name }
 

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>psych</artifactId>
-      <version>2.0.9.2</version>
+      <version>2.0.14.pre1</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -158,7 +158,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>ruby-maven</artifactId>
-      <version>3.1.1.0.8</version>
+      <version>3.1.1.0.11</version>
       <type>gem</type>
       <scope>provided</scope>
     </dependency>

diff --git a/maven/jruby-dist/pom.rb b/maven/jruby-dist/pom.rb
@@ -13,7 +13,7 @@
               'main.basedir' => '${project.parent.parent.basedir}' )
 
   # pre-installed gems - not default gems !
-  gem 'ruby-maven', '3.1.1.0.8', :scope => 'provided'
+  gem 'ruby-maven', '3.1.1.0.11', :scope => 'provided'
 
   # HACK: add torquebox repo only when building from filesystem
   # not when using the pom as "dependency" in some other projects

diff --git a/maven/jruby-dist/pom.xml b/maven/jruby-dist/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>ruby-maven</artifactId>
-      <version>3.1.1.0.8</version>
+      <version>3.1.1.0.11</version>
       <type>gem</type>
       <scope>provided</scope>
     </dependency>

diff --git a/maven/jruby/src/it/runnable/Gemfile b/maven/jruby/src/it/runnable/Gemfile
@@ -5,3 +5,5 @@ gem 'rspec', '~> 2.14'
 gem 'rake', '~> 10.3'
 
 gem 'jbundler', '0.7.1'
+
+gem 'ruby-maven', '3.1.1.0.11'
diff --git a/maven/jruby/src/it/runnable/Gemfile.lock b/maven/jruby/src/it/runnable/Gemfile.lock
@@ -10,15 +10,15 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    equalizer (0.0.9)
-    ice_nine (0.11.0)
+    equalizer (0.0.11)
+    ice_nine (0.11.1)
     jar-dependencies (0.1.7)
     jbundler (0.7.1)
       bundler (~> 1.5)
       jar-dependencies (~> 0.1.7)
       maven-tools (~> 1.0.6)
       ruby-maven (>= 3.1.1.0.6, < 3.1.2)
-    maven-tools (1.0.7)
+    maven-tools (1.0.8)
       virtus (~> 1.0)
     rake (10.3.2)
     rspec (2.99.0)
@@ -29,12 +29,13 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.2)
-    ruby-maven (3.1.1.0.8)
-      maven-tools (~> 1.0.1)
+    ruby-maven (3.1.1.0.11)
+      maven-tools (~> 1.0.8)
       ruby-maven-libs (= 3.1.1)
     ruby-maven-libs (3.1.1)
-    thread_safe (0.3.4-java)
-    virtus (1.0.3)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
@@ -48,3 +49,4 @@ DEPENDENCIES
   jbundler (= 0.7.1)
   rake (~> 10.3)
   rspec (~> 2.14)
+  ruby-maven (= 3.1.1.0.11)
diff --git a/maven/jruby/src/it/runnable/pom.xml b/maven/jruby/src/it/runnable/pom.xml
@@ -297,7 +297,7 @@
                     <ice_nine>0.11.0</ice_nine>
                     <coercible>1.0.0</coercible>
                     <equalizer>0.0.9</equalizer>
-                    <ruby-maven>3.1.1.0.8</ruby-maven>
+                    <ruby-maven>3.1.1.0.11</ruby-maven>
                     <ruby-maven-libs>3.1.1</ruby-maven-libs>
                   </gems>
                 </configuration>