Skip to content

Commit

Permalink
remove more jruby.home properties from build
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
mkristian committed Apr 24, 2015
1 parent ae2428c commit 46f43bb
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 18 deletions.
1 change: 0 additions & 1 deletion core/pom.rb
Expand Up @@ -214,7 +214,6 @@
'reuseForks' => 'false',
'systemProperties' => {
'jruby.compat.version' => '1.9',
'jruby.home' => '${basedir}/..'
},
'argLine' => '-Xmx${jruby.test.memory} -XX:MaxPermSize=${jruby.test.memory.permgen} -Dfile.encoding=UTF-8 -Djava.awt.headless=true',
'includes' => [ 'org/jruby/test/MainTestSuite.java',
Expand Down
1 change: 0 additions & 1 deletion core/pom.xml
Expand Up @@ -509,7 +509,6 @@
<reuseForks>false</reuseForks>
<systemProperties>
<jruby.compat.version>1.9</jruby.compat.version>
<jruby.home>${basedir}/..</jruby.home>
</systemProperties>
<argLine>-Xmx${jruby.test.memory} -XX:MaxPermSize=${jruby.test.memory.permgen} -Dfile.encoding=UTF-8 -Djava.awt.headless=true</argLine>
<includes>
Expand Down
4 changes: 0 additions & 4 deletions maven/jruby-complete/pom.rb
Expand Up @@ -14,10 +14,6 @@
'main.basedir' => '${project.parent.parent.basedir}',
'jruby.complete.home' => '${project.build.outputDirectory}/META-INF/jruby.home' )

unless version =~ /-SNAPSHOT/
properties 'jruby.home' => '${basedir}/../..'
end

scope :provided do
jar 'org.jruby:jruby-core:${project.version}'
jar 'org.jruby:jruby-stdlib:${project.version}'
Expand Down
4 changes: 0 additions & 4 deletions maven/jruby-dist/pom.rb
Expand Up @@ -11,10 +11,6 @@
'tesla.dump.readonly' => true,
'main.basedir' => '${project.parent.parent.basedir}' )

unless version =~ /-SNAPSHOT/
properties 'jruby.home' => '${basedir}/../..'
end

# pre-installed gems - not default gems !
gem 'ruby-maven', '3.1.1.0.8', :scope => 'provided'

Expand Down
4 changes: 0 additions & 4 deletions maven/jruby/pom.rb
Expand Up @@ -13,10 +13,6 @@
'tesla.dump.readonly' => true,
'main.basedir' => '${project.parent.parent.basedir}' )

unless version =~ /-SNAPSHOT/
properties 'jruby.home' => '${basedir}/../..'
end

jar 'org.jruby:jruby-core:${project.version}'
jar 'org.jruby:jruby-stdlib:${project.version}'

Expand Down
4 changes: 0 additions & 4 deletions pom.rb
Expand Up @@ -84,10 +84,6 @@
'test-unit.version' => '3.0.3',
'power_assert.version' => '0.2.3' )

unless version =~ /-SNAPSHOT/
properties 'jruby.home' => '${basedir}/..'
end

modules [ 'truffle', 'core', 'lib' ]

plugin_management do
Expand Down

0 comments on commit 46f43bb

Please sign in to comment.