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

Commits on Mar 8, 2016

  1. Update jnr dependencies.

    @headius
    headius committed Mar 8, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bf4bdcd View commit details

  2. Bump to joni release.

    @headius
    headius committed Mar 8, 2016
    Copy the full SHA
    aea5938 View commit details
Showing with 14 additions and 14 deletions.
  1. +6 −6 core/pom.rb
  2. +6 −6 core/pom.xml
  3. +1 −1 pom.rb
  4. +1 −1 pom.xml
12 changes: 6 additions & 6 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -42,16 +42,16 @@

# exclude jnr-ffi to avoid problems with shading and relocation of the asm packages
jar 'com.github.jnr:jnr-netdb:1.1.5', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-enxio:0.11-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-enxio:0.11', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-x86asm:1.0.2', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-unixsocket:0.11-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-posix:3.0.28-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-constants:0.9.1-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-ffi:2.0.8-SNAPSHOT'
jar 'com.github.jnr:jnr-unixsocket:0.11', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-posix:3.0.28', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-constants:0.9.1', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-ffi:2.0.8'
jar 'com.github.jnr:jffi:${jffi.version}'
jar 'com.github.jnr:jffi:${jffi.version}:native'

jar 'org.jruby.joni:joni:2.1.10-SNAPSHOT'
jar 'org.jruby.joni:joni:2.1.10'
jar 'org.jruby.extras:bytelist:1.0.13'
jar 'org.jruby.jcodings:jcodings:1.0.17'
jar 'org.jruby:dirgra:0.3'
12 changes: 6 additions & 6 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-enxio</artifactId>
<version>0.11-SNAPSHOT</version>
<version>0.11</version>
<exclusions>
<exclusion>
<artifactId>jnr-ffi</artifactId>
@@ -125,7 +125,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-unixsocket</artifactId>
<version>0.11-SNAPSHOT</version>
<version>0.11</version>
<exclusions>
<exclusion>
<artifactId>jnr-ffi</artifactId>
@@ -136,7 +136,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
<version>3.0.28-SNAPSHOT</version>
<version>3.0.28</version>
<exclusions>
<exclusion>
<artifactId>jnr-ffi</artifactId>
@@ -147,7 +147,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-constants</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.9.1</version>
<exclusions>
<exclusion>
<artifactId>jnr-ffi</artifactId>
@@ -158,7 +158,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-ffi</artifactId>
<version>2.0.8-SNAPSHOT</version>
<version>2.0.8</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
@@ -174,7 +174,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby.joni</groupId>
<artifactId>joni</artifactId>
<version>2.1.10-SNAPSHOT</version>
<version>2.1.10</version>
</dependency>
<dependency>
<groupId>org.jruby.extras</groupId>
2 changes: 1 addition & 1 deletion pom.rb
View file
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@
'jruby-launcher.version' => '1.1.1',
'ant.version' => '1.9.2',
'asm.version' => '5.0.4',
'jffi.version' => '1.2.11-SNAPSHOT',
'jffi.version' => '1.2.11',
'bouncy-castle.version' => '1.47',
'joda.time.version' => '2.8.2' )

2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -113,7 +113,7 @@ DO NOT MODIFIY - GENERATED CODE
<minitest.version>5.4.1</minitest.version>
<ant.version>1.9.2</ant.version>
<diff-lcs.version>1.1.3</diff-lcs.version>
<jffi.version>1.2.11-SNAPSHOT</jffi.version>
<jffi.version>1.2.11</jffi.version>
<rake.version>10.4.2</rake.version>
<jruby-launcher.version>1.1.1</jruby-launcher.version>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>