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

Commits on Apr 20, 2016

  1. Bump for release

    @enebo
    enebo committed Apr 20, 2016
    Copy the full SHA
    fba2883 View commit details

  2. Fixes #3618. blacklist ppc64 Linux from windows installer packaging

    @enebo
    enebo committed Apr 20, 2016
    Copy the full SHA
    67804b0 View commit details
Showing with 13 additions and 9 deletions.
  1. +1 −1 VERSION
  2. +1 −1 core/pom.xml
  3. +7 −3 install/jruby.install4j
  4. +2 −2 lib/pom.xml
  5. +1 −1 pom.xml
  6. +1 −1 truffle/pom.xml
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.1.0.0-SNAPSHOT
9.1.0.0
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>9.1.0.0</version>
</parent>
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
10 changes: 7 additions & 3 deletions install/jruby.install4j
View file
Original file line number Diff line number Diff line change
@@ -84,13 +84,15 @@
<dirEntry mountPoint="103" file="${compiler:jruby.location}" overwrite="2" shared="false" mode="644" uninstallMode="0" excludeSuffixes="" dirMode="755">
<exclude>
<entry location="bin" fileType="regular" />
<entry location="lib/jni/arm-Linux" fileType="regular" />
<entry location="lib/jni/Darwin" fileType="regular" />
<entry location="lib/jni/i386-FreeBSD" fileType="regular" />
<entry location="lib/jni/arm-Linux" fileType="regular" />
<entry location="lib/jni/i386-Linux" fileType="regular" />
<entry location="lib/jni/i386-OpenBSD" fileType="regular" />
<entry location="lib/jni/i386-SunOS" fileType="regular" />
<entry location="lib/jni/i386-FreeBSD" fileType="regular" />
<entry location="lib/jni/i386-OpenBSD" fileType="regular" />
<entry location="lib/jni/ppc-AIX" fileType="regular" />
<entry location="lib/jni/ppc64-Linux" fileType="regular" />
<entry location="lib/jni/ppc64le-Linux" fileType="regular" />
<entry location="lib/jni/ppc-Linux" fileType="regular" />
<entry location="lib/jni/s390x-Linux" fileType="regular" />
<entry location="lib/jni/sparc-SunOS" fileType="regular" />
@@ -111,6 +113,8 @@
<entry location="lib/jni/i386-OpenBSD" fileType="regular" />
<entry location="lib/jni/i386-SunOS" fileType="regular" />
<entry location="lib/jni/i386-Windows" fileType="regular" />
<entry location="lib/jni/ppc64-Linux" fileType="regular" />
<entry location="lib/jni/ppc64le-Linux" fileType="regular" />
<entry location="lib/jni/ppc-AIX" fileType="regular" />
<entry location="lib/jni/ppc-Linux" fileType="regular" />
<entry location="lib/jni/s390x-Linux" fileType="regular" />
4 changes: 2 additions & 2 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>9.1.0.0</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
@@ -28,7 +28,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>9.1.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ DO NOT MODIFIY - GENERATED CODE
</parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>9.1.0.0</version>
<packaging>pom</packaging>
<name>JRuby</name>
<description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>
2 changes: 1 addition & 1 deletion truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>9.1.0.0</version>
</parent>
<artifactId>jruby-truffle</artifactId>
<name>JRuby Truffle</name>