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

Commits on Nov 25, 2014

  1. just obey the test which checks the correct versions

    @mkristian
    mkristian committed Nov 25, 2014
    Copy the full SHA
    c589687 View commit details

  2. -Pj2ee has no more errors

    @mkristian
    mkristian committed Nov 25, 2014
    Copy the full SHA
    e1456bb View commit details
Showing with 1 addition and 2 deletions.
  1. +0 −1 .travis.yml
  2. +1 −1 maven/jruby-jars/jruby-jars.gemspec
1 change: 0 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,6 @@ matrix:
- env: PHASE='-Pcomplete'
- env: PHASE='-Prake -Dtask=spec:jrubyc'
- env: PHASE='-Pjruby_complete_jar_extended'
- env: PHASE='-Pj2ee'
- env: PHASE='-Prake -Dtask=spec:profiler'
- env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
- env: PHASE='-Pmain,test -Dinvoker.test=extended'
2 changes: 1 addition & 1 deletion maven/jruby-jars/jruby-jars.gemspec
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ require 'rexml/xpath'
version = File.read( File.join( File.dirname(File.expand_path(__FILE__)), '..', '..', 'VERSION' ) ).strip

# this regexp can be refined to work with pre, rc1, rc2 and such cases
ruby_version = version.sub( /-SNAPSHOT$/, '.snapshot' )
ruby_version = version.sub( /-SNAPSHOT$/, '.SNAPSHOT' )

File.open( 'lib/jruby-jars/version.rb', 'w' ) do |f|
f.print <<EOF