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

Commits on Jun 17, 2015

  1. keep relative files as they are

    @mkristian
    mkristian committed Jun 17, 2015
    Copy the full SHA
    8d73196 View commit details

  2. no more filesystem path on j2ee_tomcat_rack integration test

    @mkristian
    mkristian committed Jun 17, 2015
    Copy the full SHA
    e2f2fd2 View commit details
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -556,8 +556,8 @@ private String resolveScript(String scriptName) {
// jruby.home = a jar file URL that does not resolve correctly with
// JRubyFile.create.
String result = resolve(config.getCurrentDirectory(), scriptName);
if (result != null) return result;
result = resolve(config.getJRubyHome() + "/bin", scriptName);
if (result != null) return scriptName;// use relative filename
result = resolve(config.getJRubyHome() + "/bin", scriptName);
if (result != null) return result;
result = resolve("uri:classloader:/bin", scriptName);
if (result != null) return result;
4 changes: 2 additions & 2 deletions maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ packaging 'war'
# get jruby dependencies
properties( 'jruby.version' => '@project.version@',
'jruby.home' => '../../../../../',
'jruby.plugins.version' => '1.0.3',
'jruby.plugins.version' => '1.0.9',
'project.build.sourceEncoding' => 'utf-8',
'public.dir' => '${basedir}/public' )

@@ -75,7 +75,7 @@ execute 'check download', :phase => :verify do
# TODO get rid off this over normalization
#expected = 'uri:classloader:/gems/flickraw-0.9.7'
# TODO find out why travis find the gem on filesystem
expected = 'target/classes/gems/flickraw-0.9.7'
expected = 'uri:classloader:/gems/flickraw-0.9.7'
unless result.match( /#{expected}/ )
raise "missed expected string in download: #{expected}"
end
2 changes: 1 addition & 1 deletion maven/jruby/src/it/j2ee_tomcat_rack/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<properties>
<jruby.home>../../../../../</jruby.home>
<jruby.version>@project.version@</jruby.version>
<jruby.plugins.version>1.0.3</jruby.plugins.version>
<jruby.plugins.version>1.0.9</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<public.dir>${basedir}/public</public.dir>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>