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

Commits on Aug 24, 2017

  1. Missed part of version update.

    @headius
    headius committed Aug 24, 2017
    Copy the full SHA
    5fffaaa View commit details

  2. Use jcodings 1.0.25 to better handle encoding to charset lookup. 

    Fixes #4716.
    @headius
    headius committed Aug 24, 2017
    Copy the full SHA
    8191375 View commit details
Showing with 2 additions and 5 deletions.
  1. +1 −1 core/pom.rb
  2. +1 −1 core/pom.xml
  3. +0 −3 pom.xml
2 changes: 1 addition & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@

jar 'org.jruby.joni:joni:2.1.11'
jar 'org.jruby.extras:bytelist:1.0.15'
jar 'org.jruby.jcodings:jcodings:1.0.18'
jar 'org.jruby.jcodings:jcodings:1.0.25-SNAPSHOT'
jar 'org.jruby:dirgra:0.3'

jar 'com.headius:invokebinder:1.7'
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -183,7 +183,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
<version>1.0.18</version>
<version>1.0.25-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
3 changes: 0 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -271,9 +271,6 @@ DO NOT MODIFIY - GENERATED CODE
<requireMavenVersion>
<version>[3.3.0,)</version>
</requireMavenVersion>
<requireReleaseDeps>
<message>No Snapshots Allowed!</message>
</requireReleaseDeps>
</rules>
</configuration>
</execution>