Skip to content

Commit e161584

Browse files
tillscolleolleolle
authored andcommitted
Forward JRuby and Bundler versions from Ruby environment to Maven
1 parent 512c073 commit e161584

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ task :default => :spec
2828
# use Mavenfile to define :jar task
2929
require 'maven/ruby/maven'
3030
mvn = Maven::Ruby::Maven.new
31+
mvn << "-Djruby.version=#{JRUBY_VERSION}"
32+
mvn << "-Dbundler.version=#{Bundler::VERSION}"
3133
mvn << '--no-transfer-progress'
3234

3335
if defined?(JRUBY_VERSION) && !JRUBY_VERSION.start_with?('9.0')

integration/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<properties>
1111
<jruby.plugins.version>3.0.6</jruby.plugins.version>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13-
<jruby.version>9.4.13.0</jruby.version>
13+
<jruby.version>${jruby.version}</jruby.version>
1414
<warbler.version>2.0.4</warbler.version>
15-
<bundler.version>2.6.3</bundler.version>
15+
<bundler.version>${bundler.version}</bundler.version>
1616
<gem.home>${basedir}/../../pkg/rubygems</gem.home>
1717
<gem.path>${basedir}/../../pkg/rubygems</gem.path>
1818
</properties>

0 commit comments

Comments
 (0)