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

Commits on Feb 2, 2018

  1. upgrade jar-dependencies version

    @mkristian
    mkristian committed Feb 2, 2018
    Copy the full SHA
    e7f0954 View commit details

  2. upgrade jruby-readline version

    @mkristian
    mkristian committed Feb 2, 2018
    Copy the full SHA
    34e6c11 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 lib/pom.rb
  2. +1 −1 lib/pom.xml
  3. +1 −1 pom.rb
  4. +1 −1 pom.xml
2 changes: 1 addition & 1 deletion lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ def initialize( name, version, default_spec = true )
default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.21' ),
ImportedGem.new( 'jruby-readline', '1.2.0' ),
ImportedGem.new( 'jruby-readline', '1.2.1' ),
ImportedGem.new( 'rake', '${rake.version}' ),
ImportedGem.new( 'rdoc', '${rdoc.version}' ),
ImportedGem.new( 'minitest', '${minitest.version}' ),
2 changes: 1 addition & 1 deletion lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-readline</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
2 changes: 1 addition & 1 deletion pom.rb
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@
# used in ./lib/pom.rb and ./maven/jruby-stdlib/pom.rb
'rdoc.version' => '4.2.0',
'rake.version' => '10.4.2',
'jar-dependencies.version' => '0.3.10',
'jar-dependencies.version' => '0.3.12',

'jruby-launcher.version' => '1.1.1',
'ant.version' => '1.9.2',
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -127,7 +127,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<invoker.skip>true</invoker.skip>
<json.version>1.8.3</json.version>
<jar-dependencies.version>0.3.10</jar-dependencies.version>
<jar-dependencies.version>0.3.12</jar-dependencies.version>
<power_assert.version>0.2.3</power_assert.version>
<version.jruby>${project.version}</version.jruby>
<main.basedir>${project.basedir}</main.basedir>