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

Commits on Apr 25, 2016

  1. Copy the full SHA
    5842c1f View commit details
  2. Copy the full SHA
    f59aecf View commit details
Showing with 14 additions and 8 deletions.
  1. +3 −2 maven/jruby-complete/pom.rb
  2. +3 −2 maven/jruby-dist/pom.rb
  3. +2 −1 maven/jruby-jars/Mavenfile
  4. +2 −1 maven/jruby-jars/jruby-jars.gemspec
  5. +2 −1 maven/jruby/pom.rb
  6. +2 −1 test/pom.rb
5 changes: 3 additions & 2 deletions maven/jruby-complete/pom.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
require 'fileutils'

project 'JRuby Complete' do

version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip

version = ENV['JRUBY_VERSION'] ||
File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip

model_version '4.0.0'
id "org.jruby:jruby-complete:#{version}"
5 changes: 3 additions & 2 deletions maven/jruby-dist/pom.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
require 'rubygems/package'
require 'fileutils'
project 'JRuby Dist' do

version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip

version = ENV['JRUBY_VERSION'] ||
File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip

model_version '4.0.0'
id "org.jruby:jruby-dist:#{version}"
3 changes: 2 additions & 1 deletion maven/jruby-jars/Mavenfile
Original file line number Diff line number Diff line change
@@ -3,7 +3,8 @@ require 'fileutils'

gemspec

version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip
version = ENV['JRUBY_VERSION'] ||
File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip

# maven does treats prereleased version as snapshot - undo it here
ruby_version = model.version.sub( /-SNAPSHOT/, '' )
3 changes: 2 additions & 1 deletion maven/jruby-jars/jruby-jars.gemspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,8 @@

require 'fileutils'

version = File.read( File.join( File.dirname(File.expand_path(__FILE__)), '..', '..', 'VERSION' ) ).strip
version = ENV['JRUBY_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' )
3 changes: 2 additions & 1 deletion maven/jruby/pom.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
project 'JRuby Main Maven Artifact' do

version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip
version = ENV['JRUBY_VERSION'] ||
File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip

model_version '4.0.0'
id "org.jruby:jruby:#{version}"
3 changes: 2 additions & 1 deletion test/pom.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version = File.read( File.join( basedir, '..', 'VERSION' ) ).strip
version = ENV['JRUBY_VERSION'] ||
File.read( File.join( basedir, '..', 'VERSION' ) ).strip

project 'JRuby Integration Tests' do