do not use local jruby for executing ruby code during build

[skip ci]
jruby · Apr 24, 2015 · ae2428c · ae2428c
1 parent d77456d
commit ae2428c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -60,17 +60,13 @@ def to_pathname
   properties( 'tesla.dump.pom' => 'pom.xml',
               'tesla.dump.readonly' => true,
               'tesla.version' => '0.1.1',
-              'jruby.plugins.version' => '1.0.5',
+              'jruby.plugins.version' => '1.0.9',
               'gem.home' => '${basedir}/ruby/gems/shared',
               # we copy everything into the target/classes/META-INF
               # so the jar plugin just packs it - see build/resources below
               'jruby.complete.home' => '${project.build.outputDirectory}/META-INF/jruby.home',
               'jruby.complete.gems' => '${jruby.complete.home}/lib/ruby/gems/shared' )
 
-  unless version =~ /-SNAPSHOT/
-    properties 'jruby.home' => '${basedir}/..'
-  end
-
   # just depends on jruby-core so we are sure the jruby.jar is in place
   jar "org.jruby:jruby-core:#{version}", :scope => 'test'
 

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -13,7 +13,7 @@
     <tesla.dump.readonly>true</tesla.dump.readonly>
     <jruby.complete.gems>${jruby.complete.home}/lib/ruby/gems/shared</jruby.complete.gems>
     <gem.home>${basedir}/ruby/gems/shared</gem.home>
-    <jruby.plugins.version>1.0.5</jruby.plugins.version>
+    <jruby.plugins.version>1.0.9</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
     <tesla.version>0.1.1</tesla.version>