Skip to content

Commit ae2428c

Browse files
committed
do not use local jruby for executing ruby code during build
[skip ci]
1 parent d77456d commit ae2428c

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

lib/pom.rb

+1-5
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,13 @@ def to_pathname
6060
properties( 'tesla.dump.pom' => 'pom.xml',
6161
'tesla.dump.readonly' => true,
6262
'tesla.version' => '0.1.1',
63-
'jruby.plugins.version' => '1.0.5',
63+
'jruby.plugins.version' => '1.0.9',
6464
'gem.home' => '${basedir}/ruby/gems/shared',
6565
# we copy everything into the target/classes/META-INF
6666
# so the jar plugin just packs it - see build/resources below
6767
'jruby.complete.home' => '${project.build.outputDirectory}/META-INF/jruby.home',
6868
'jruby.complete.gems' => '${jruby.complete.home}/lib/ruby/gems/shared' )
6969

70-
unless version =~ /-SNAPSHOT/
71-
properties 'jruby.home' => '${basedir}/..'
72-
end
73-
7470
# just depends on jruby-core so we are sure the jruby.jar is in place
7571
jar "org.jruby:jruby-core:#{version}", :scope => 'test'
7672

lib/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<tesla.dump.readonly>true</tesla.dump.readonly>
1414
<jruby.complete.gems>${jruby.complete.home}/lib/ruby/gems/shared</jruby.complete.gems>
1515
<gem.home>${basedir}/ruby/gems/shared</gem.home>
16-
<jruby.plugins.version>1.0.5</jruby.plugins.version>
16+
<jruby.plugins.version>1.0.9</jruby.plugins.version>
1717
<tesla.dump.pom>pom.xml</tesla.dump.pom>
1818
<jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
1919
<tesla.version>0.1.1</tesla.version>

0 commit comments

Comments
 (0)