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

Commits on Dec 12, 2016

  1. Update jnr.

    This commit aligns all jnr projects on latest versions. It should
    also fix #4332.
    headius committed Dec 12, 2016
    Copy the full SHA
    cb0b3ea View commit details
  2. Copy the full SHA
    99872ec View commit details
Showing with 15 additions and 10 deletions.
  1. +4 −4 core/pom.rb
  2. +4 −4 core/pom.xml
  3. +1 −1 pom.rb
  4. +1 −1 pom.xml
  5. +5 −0 test/mri/excludes/TestRubyOptimization.rb
8 changes: 4 additions & 4 deletions core/pom.rb
Original file line number Diff line number Diff line change
@@ -46,12 +46,12 @@

# exclude jnr-ffi to avoid problems with shading and relocation of the asm packages
jar 'com.github.jnr:jnr-netdb:1.1.6', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-enxio:0.14-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-enxio:0.14', :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.14', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-posix:3.0.32', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-unixsocket:0.15', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-posix:3.0.33', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-constants:0.9.6', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-ffi:2.1.1'
jar 'com.github.jnr:jnr-ffi:2.1.2'
jar 'com.github.jnr:jffi:${jffi.version}'
jar 'com.github.jnr:jffi:${jffi.version}:native'

8 changes: 4 additions & 4 deletions core/pom.xml
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-enxio</artifactId>
<version>0.14-SNAPSHOT</version>
<version>0.14</version>
<exclusions>
<exclusion>
<artifactId>jnr-ffi</artifactId>
@@ -126,7 +126,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-unixsocket</artifactId>
<version>0.14</version>
<version>0.15</version>
<exclusions>
<exclusion>
<artifactId>jnr-ffi</artifactId>
@@ -137,7 +137,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
<version>3.0.32</version>
<version>3.0.33</version>
<exclusions>
<exclusion>
<artifactId>jnr-ffi</artifactId>
@@ -159,7 +159,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-ffi</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
2 changes: 1 addition & 1 deletion pom.rb
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@
'jruby-launcher.version' => '1.1.1',
'ant.version' => '1.9.2',
'asm.version' => '5.0.4',
'jffi.version' => '1.2.13',
'jffi.version' => '1.2.14',
'bouncy-castle.version' => '1.47',
'joda.time.version' => '2.8.2' )

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -112,7 +112,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.13</jffi.version>
<jffi.version>1.2.14</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>
5 changes: 5 additions & 0 deletions test/mri/excludes/TestRubyOptimization.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
exclude :test_fixnum_minus, "needs investigation"
exclude :test_fixnum_plus, "needs investigation"
exclude :test_opt_case_dispatch, "depends on RubyVM"
exclude :test_string_freeze, "frozen string literal should be a new object if String#freeze is redefined (#2156)"
exclude :test_string_freeze_block, "frozen string literal revert to a call if String#freeze is redefined (#2156)"
exclude :test_string_freeze_saves_memory, "depends on ObjectSpace#memsize_of"
exclude :test_tailcall, "needs investigation"
exclude :test_tailcall_inhibited_by_block, "depends on RubyVM"
exclude :test_tailcall_inhibited_by_rescue, "depends on RubyVM"
exclude :test_tailcall_with_block, "needs investigation"