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

Commits on Jan 25, 2016

  1. Bump for release

    @enebo
    enebo committed Jan 25, 2016
    Copy the full SHA
    177258a View commit details

  2. Back on jruby-openssl due to a couple of discoveries on new session s… 

    …upport
    @enebo
    enebo committed Jan 25, 2016
    Copy the full SHA
    930dc8d View commit details
Showing with 8 additions and 8 deletions.
  1. +1 −1 VERSION
  2. +1 −1 core/pom.xml
  3. +1 −1 lib/pom.rb
  4. +3 −3 lib/pom.xml
  5. +1 −1 pom.xml
  6. +1 −1 truffle/pom.xml
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.0.5.0-SNAPSHOT
9.0.5.0
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.5.0-SNAPSHOT</version>
<version>9.0.5.0</version>
</parent>
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
2 changes: 1 addition & 1 deletion lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ def initialize( name, version, default_spec = true )

default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.13' ),
ImportedGem.new( 'jruby-openssl', '0.9.11' ),
ImportedGem.new( 'jruby-readline', '1.0', false ),
ImportedGem.new( 'rake', '${rake.version}' ),
ImportedGem.new( 'rdoc', '${rdoc.version}' ),
6 changes: 3 additions & 3 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.5.0-SNAPSHOT</version>
<version>9.0.5.0</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
@@ -28,13 +28,13 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.0.5.0-SNAPSHOT</version>
<version>9.0.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.13</version>
<version>0.9.11</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ DO NOT MODIFIY - GENERATED CODE
</parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.5.0-SNAPSHOT</version>
<version>9.0.5.0</version>
<packaging>pom</packaging>
<name>JRuby</name>
<description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>
2 changes: 1 addition & 1 deletion truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.5.0-SNAPSHOT</version>
<version>9.0.5.0</version>
</parent>
<artifactId>jruby-truffle</artifactId>
<name>JRuby Truffle</name>