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

Commits on May 1, 2015

  1. Fix up Gemfile.lock for it/runnable.

    @headius
    headius committed May 1, 2015
    Copy the full SHA
    fe8119c View commit details

  2. Move to jnr-posix 3.0.12.

    @headius
    headius committed May 1, 2015
    Copy the full SHA
    fc0e290 View commit details
Showing with 4 additions and 6 deletions.
  1. +1 −1 core/pom.xml
  2. +3 −5 maven/jruby/src/it/runnable/Gemfile.lock
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
<version>3.0.11</version>
<version>3.0.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
8 changes: 3 additions & 5 deletions maven/jruby/src/it/runnable/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -12,28 +12,27 @@ GEM
diff-lcs (1.2.5)
equalizer (0.0.11)
ice_nine (0.11.1)
jar-dependencies (0.1.7)
jar-dependencies (0.1.13)
jbundler (0.7.1)
bundler (~> 1.5)
jar-dependencies (~> 0.1.7)
maven-tools (~> 1.0.6)
ruby-maven (>= 3.1.1.0.6, < 3.1.2)
maven-tools (1.0.8)
virtus (~> 1.0)
rake (10.3.2)
rake (10.4.2)
rspec (2.99.0)
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
rspec-core (2.99.2)
rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.99.2)
rspec-mocks (2.99.3)
ruby-maven (3.1.1.0.11)
maven-tools (~> 1.0.8)
ruby-maven-libs (= 3.1.1)
ruby-maven-libs (3.1.1)
thread_safe (0.3.5)
thread_safe (0.3.5-java)
virtus (1.0.5)
axiom-types (~> 0.1)
@@ -43,7 +42,6 @@ GEM

PLATFORMS
java
ruby

DEPENDENCIES
jbundler (= 0.7.1)