fix merge regression on runnable.jar

enebo · Jun 25, 2015 · f7abd92 · f7abd92
1 parent c077c19
commit f7abd92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/maven/jruby/src/it/runnable/Gemfile.lock b/maven/jruby/src/it/runnable/Gemfile.lock
@@ -34,13 +34,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    ruby-maven (3.1.1.0.8)
+    ruby-maven (3.1.1.0.11)
       maven-tools (~> 1.0.1)
       ruby-maven-libs (= 3.1.1)
     ruby-maven-libs (3.1.1)
-    thread_safe (0.3.4)
-    thread_safe (0.3.4-java)
-    virtus (1.0.3)
+    thread_safe (0.3.5-java)
+    virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
@@ -53,6 +52,4 @@ DEPENDENCIES
   jbundler (= 0.7.1)
   rake (~> 10.3)
   rspec (~> 3.0)
-
-BUNDLED WITH
-   1.10.4
+  ruby-maven (= 3.1.1.0.11)
diff --git a/maven/jruby/src/it/runnable/verify.bsh b/maven/jruby/src/it/runnable/verify.bsh
@@ -6,7 +6,7 @@ String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
 String expected = "Run RSpec code examples";
 if ( !log.contains( expected ) ) throw new RuntimeException( "log file does not contain '" + expected + "'" );
 
-expected = "uri:classloader:/Rakefile [\"-T\"]";
+expected = "uri:classloader:/Rakefile []";
 if ( !log.contains( expected ) ) throw new RuntimeException( "log file does not contain '" + expected + "'" );
 
 expected = "uri:classloader:/Rakefile [\"spec\"]";