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
base: c74647f9ac3f
Choose a base ref
...
head repository: jruby/jruby
compare: c78272f4189c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 31, 2014

  1. (MAINT) Fix pom deps re: asm 

    Recent versions of JRuby core bumped their jnr-posix dependencies
to version 3.0.9, which has transitive dependencies on jnr-ffi 2.0.1
and asm-* 5.0.3.  However, JRuby core was still expressing explicit
dependencies on jnr-ffi 2.0.0 and asm-* 4.0.  These conflicting
dependencies cause build failures when used with tools that do
strict validation.
    Chris Price committed Dec 31, 2014
    Copy the full SHA
    2d474b5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2401 from cprice404/maint/jruby-1_7/fix-asm-pom-deps 

    (MAINT) Fix pom deps re: asm
    @enebo
    enebo committed Dec 31, 2014
    Copy the full SHA
    c78272f View commit details
    Browse the repository at this point in the history