upgrade integs to jruby 1.7.6, and fixed an rvm problem

jruby · Oct 27, 2013 · 3732c2e · 3732c2e
1 parent 76e00b3
commit 3732c2e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -17,9 +17,9 @@
   <properties>
     <version.jruby-maven-plugins>0.28.4</version.jruby-maven-plugins>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jruby.version>1.7.5</jruby.version>
+    <jruby.version>1.7.6</jruby.version>
     <warbler.version>1.4.0.dev</warbler.version>
-    <rubygems.home>${session.executionRootDirectory}/target/jruby/lib/ruby/gems/shared</rubygems.home>
+    <rubygems.home>${session.executionRootDirectory}/target/rubygems</rubygems.home>
   </properties>
 
   <dependencies>

diff --git a/integration/rails4_test/pom.xml b/integration/rails4_test/pom.xml
@@ -63,7 +63,7 @@
             <phase>pre-integration-test</phase>
             <goals><goal>jruby</goal></goals>
             <configuration>
-              <args>-C src/main/ruby -S warble</args>
+              <args>-C src/main/ruby -S ${rubygems.home}/bin/warble</args>
             </configuration>
           </execution>
         </executions>

diff --git a/integration/runnable_test/pom.xml b/integration/runnable_test/pom.xml
@@ -62,7 +62,7 @@
             <phase>pre-integration-test</phase>
             <goals><goal>jruby</goal></goals>
             <configuration>
-              <args>-Csrc/main/ruby -S warble</args>
+              <args>-Csrc/main/ruby -S ${rubygems.home}/bin/warble</args>
             </configuration>
           </execution>
         </executions>

diff --git a/integration/simple_rack_test/pom.xml b/integration/simple_rack_test/pom.xml
@@ -34,7 +34,7 @@
             <phase>pre-integration-test</phase>
             <goals><goal>jruby</goal></goals>
             <configuration>
-              <args>-Csrc/main/ruby -S warble</args>
+              <args>-Csrc/main/ruby -S ${rubygems.home}/bin/warble</args>
             </configuration>
           </execution>
         </executions>