Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 455fce13c244
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d7067869d99d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 19, 2016

  1. Copy the full SHA
    15b34cc View commit details
  2. Copy the full SHA
    d706786 View commit details
Showing with 28 additions and 1 deletion.
  1. +13 −1 truffle/pom.rb
  2. +15 −0 truffle/pom.xml
14 changes: 13 additions & 1 deletion truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,8 @@
properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'truffle.version' => '0.13',
'jruby.basedir' => '${basedir}/..' )
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

jar 'org.yaml:snakeyaml:1.14'
jar 'org.antlr:antlr4-runtime:4.5.1-1'
@@ -62,6 +63,11 @@
'outputFile' => '${jruby.basedir}/lib/jruby-truffle.jar' )
end

plugin( :surefire,
'systemProperties' => {
'jruby.home' => '${basedir}/..'
} )

build do
default_goal 'package'

@@ -91,4 +97,10 @@
end
end
end

profile 'test' do

properties( 'maven.test.skip' => 'false' )

end
end
15 changes: 15 additions & 0 deletions truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactId>jruby-truffle</artifactId>
<name>JRuby Truffle</name>
<properties>
<maven.test.skip>true</maven.test.skip>
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
@@ -156,6 +157,14 @@ DO NOT MODIFIY - GENERATED CODE
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
<jruby.home>${basedir}/..</jruby.home>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
@@ -271,5 +280,11 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
</profile>
<profile>
<id>test</id>
<properties>
<maven.test.skip>false</maven.test.skip>
</properties>
</profile>
</profiles>
</project>