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: 1a1f927df254
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 86106d738628
Choose a head ref
  • 2 commits
  • 25 files changed
  • 1 contributor

Commits on Oct 15, 2014

  1. [build] do use released jruby for building when on SNAPSHOT version

    @mkristian
    mkristian committed Oct 15, 2014
    Copy the full SHA
    db0d89a View commit details

  2. [build] removing obsolete files

    @mkristian
    mkristian committed Oct 15, 2014
    Copy the full SHA
    86106d7 View commit details
7 changes: 5 additions & 2 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -64,8 +64,11 @@ 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.home' => '${basedir}/..' )
'jruby.plugins.version' => '1.0.5' )

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}"
1 change: 0 additions & 1 deletion lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
<packaging>pom</packaging>
<name>JRuby Lib Setup</name>
<properties>
<jruby.home>${basedir}/..</jruby.home>
<tesla.dump.readonly>true</tesla.dump.readonly>
<jruby.plugins.version>1.0.5</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
156 changes: 0 additions & 156 deletions maven/jruby-complete/pom-generated.xml
View file

This file was deleted.

5 changes: 4 additions & 1 deletion maven/jruby-complete/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -11,10 +11,13 @@

properties( 'tesla.dump.pom' => 'pom.xml',
'tesla.dump.readonly' => true,
'jruby.home' => '${basedir}/../..',
'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}'
1 change: 0 additions & 1 deletion maven/jruby-complete/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
<packaging>bundle</packaging>
<name>JRuby Complete</name>
<properties>
<jruby.home>${basedir}/../..</jruby.home>
<tesla.dump.readonly>true</tesla.dump.readonly>
<main.basedir>${project.parent.parent.basedir}</main.basedir>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
Loading