jruby · Apr 30, 2015 · May 1, 2015 · May 1, 2015 · May 1, 2015 · May 1, 2015
Showing 6,453 changed files with 319,345 additions and 145,696 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,9 @@
 *.versionsBackup
 *.zip
 *~
+*.tokens
+*.su
+*.ll
 
 .DS_Store
 .debug.properties
@@ -21,6 +24,9 @@
 build
 build.properties
 build_graph.png
+mx*/*pyc
+mx*/env
+mxbuild
 core/src/main/java/org/jruby/runtime/Constants.java
 dependency-reduced-pom.xml
 dev_null
@@ -43,11 +49,14 @@ lib/ruby/gems
 lib/ruby/stdlib/*jopenssl*.jar
 lib/ruby/stdlib/bcpkix-jdk15on-*.jar
 lib/ruby/stdlib/bcprov-jdk15on-*.jar
+lib/ruby/stdlib/did_you_mean*
 lib/ruby/stdlib/gauntlet_rdoc.rb
 lib/ruby/stdlib/jar*
 lib/ruby/stdlib/jline
 lib/ruby/stdlib/jopenssl*
 lib/ruby/stdlib/krypt*
+lib/ruby/stdlib/net-telnet.rb
+lib/ruby/stdlib/net/telnet*
 lib/ruby/stdlib/openssl*
 lib/ruby/stdlib/org/
 lib/ruby/stdlib/readline/*readline*.jar
@@ -70,6 +79,7 @@ test/prawn
 test/rails
 test/testapp/testapp
 test/truffle/*.methods
+test/truffle/integration/gem-testing
 tool/nailgun/Makefile
 tool/nailgun/config.log
 tool/nailgun/config.status
@@ -78,6 +88,7 @@ reference.txt
 rubyspec_temp
 .polyglot.pom.rb
 tool/truffle/jruby_truffle_runner/jruby+truffle_runner-*.gem
+test/truffle/cexts/**/Makefile
 
 # binaries
 !bin/gem

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.11</version>
+    <version>0.1.15</version>
   </extension>
 </extensions>
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.1/apache-maven-3.3.1-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,18 @@ language: java
 
 sudo: false
 
-#cache:
-#  directories:
-#    - $HOME/.m2
+cache:
+ directories:
+   - $HOME/.m2
 
-before_script:
+before_install:
   - export MAVEN_SKIP_RC=true
-  - export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=512m"
+  - mvn -Xmx32M -v | grep 1.7.0; if [ $? = 0 ]; then export MAVEN_OPTS="-XX:MaxPermSize=240M"; else export MAVEN_OPTS="-XX:MaxMetaspaceSize=240M -XX:CompressedClassSpaceSize=240M"; fi
+  - export MAVEN_OPTS="-Xmx512M $MAVEN_OPTS"
+
+before_script:
   - unset GEM_PATH GEM_HOME IRBRC JRUBY_OPTS
-  - "export PATH=`pwd`/bin:$PATH"
+  - export PATH="`pwd`/bin:$PATH"
   - echo $HOME
 
 jdk:
@@ -22,29 +25,27 @@ os:
 
 env:
   global:
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmn48M -Xmx512M"
     - MALLOC_ARENA_MAX=2
   matrix:
     - PHASE='-Ptest'
     - PHASE='-Prake -Dtask=test:jruby'
+    - PHASE='-Prake -Dtask=test:jruby:fullint'
     - PHASE='-Prake -Dtask=test:jruby:jit'
     - PHASE='-Prake -Dtask=test:mri'
+    - PHASE='-Prake -Dtask=test:mri:fullint'
     - PHASE='-Prake -Dtask=test:mri:jit'
     - PHASE='-Prake -Dtask=test:slow_suites'
     - PHASE='-Prake -Dtask=test:tracing'
     - PHASE='-Prake -Dtask=spec:ji'
     - PHASE='-Prake -Dtask=spec:compiler'
+    - PHASE='-Prake -Dtask=spec:compiler' JRUBY_OPTS=-Xcompile.invokedynamic
     - PHASE='-Prake -Dtask=spec:ffi'
     - PHASE='-Prake -Dtask=spec:regression'
     - PHASE='-Prake -Dtask=spec:ruby:fast'
     - PHASE='-Prake -Dtask=spec:jruby'
     - PHASE='-Prake -Dtask=spec:jrubyc'
     - PHASE='-Prake -Dtask=spec:profiler'
-    - PHASE='-Ptruffle-specs-language'
-    - PHASE='-Ptruffle-specs-core'
-    - PHASE='-Ptruffle-specs-library'
-    - PHASE='-Ptruffle-specs-truffle'
-    - PHASE='-Ptruffle-mri-tests'
 
 matrix:
   include:
@@ -70,11 +71,41 @@ matrix:
       jdk: oraclejdk8
     - env: COMMAND=test/check_versions.sh
       jdk: oraclejdk8
-    - env: COMMAND=tool/truffle-findbugs.sh
+    # JRuby+Truffle needs Java 8
+    - env: JT='test specs :command_line'
+      jdk: oraclejdk8
+    - env: JT='test specs :language'
+      jdk: oraclejdk8
+    - env: JT='test specs :core'
+      jdk: oraclejdk8
+    - env: JT='test specs :library'
+      jdk: oraclejdk8
+    - env: JT='test specs :truffle'
       jdk: oraclejdk8
-    - env: COMMAND='ruby tool/jt.rb check_ambiguous_arguments'
+    - env: JT='test integration'
       jdk: oraclejdk8
-    - env: COMMAND=test/truffle/integration-tests.sh
+    - env:
+      - COMMAND=test/truffle/gems/install-gems.sh
+      - JT='test gems'
+      jdk: oraclejdk8
+    - env:
+      - JAVA_OPTS="$JAVA_OPTS -Xmx512m"
+      - HAS_REDIS=true
+      - JT='test ecosystem'
+      jdk: oraclejdk8
+    - env: JT='test tck'
+      jdk: oraclejdk8
+    - env:
+      - JT=check_ambiguous_arguments
+      - SKIP_BUILD=true
+      jdk: oraclejdk8
+    - env:
+      - USE_BUILD_PACK=yes
+      - JT='test fast'
+      jdk: oraclejdk8
+  allow_failures:
+    - env: PHASE='-Prake -Dtask=test:mri:fullint'
+    - env: JT='test mri'
       jdk: oraclejdk8
     # NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
     #- env: PHASE='-Pmain'
@@ -83,16 +114,8 @@ matrix:
     #  group: edge
     #  jdk: oraclejdk9
 
-branches:
-  only:
-    - master
-    - jruby-1_7
-    - truffle-head
-    - /^test-.*$/
-    - /^ha-feature/
-
-script: if [[ -v COMMAND ]]; then $COMMAND; else ./mvnw install -Dinvoker.skip=false $PHASE | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$' ; [ ${PIPESTATUS[0]} == 0 ]; fi
-install: travis_retry ./mvnw -Pbootstrap clean install -Dinvoker.skip -Dmaven.test.skip
+install: tool/travis-install.sh
+script: tool/travis-script.sh
 
 notifications:
   irc:
@@ -111,3 +134,6 @@ notifications:
 # we are on a branch
     on_success: always
     on_failure: never
+
+services:
+  - redis-server
diff --git a/COPYING b/COPYING
@@ -1,4 +1,4 @@
-JRuby is Copyright (c) 2007-2015 The JRuby project, and is released
+JRuby is Copyright (c) 2007-2016 The JRuby project, and is released
 under a tri EPL/GPL/LGPL license. You can use it, redistribute it
 and/or modify it under the terms of the:
 
@@ -12,7 +12,7 @@ bytelist (http://github.com/jruby/bytelist),
 yydebug (http://svn.codehaus.org/jruby/trunk/jay/yydebug)
 are released under the same copyright/license.
 
-The Truffle component is copyright (c) 2013-2015 Oracle and/or its
+The Truffle component is copyright (c) 2013-2016 Oracle and/or its
 affiliates and is released under the same licenses.
 
 Some additional libraries distributed with JRuby are not covered by

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,20 @@
+### Environment
+
+Provide at least:
+* JRuby version (`jruby -v`) and command line (flags, JRUBY_OPTS, etc)
+* Operating system and platform (e.g. `uname -a`)
+
+Other relevant info you may wish to add:
+* Installed or activated gems
+* Application/framework version (e.g. Rails, Sinatra)
+* Environment variables
+
+### Expected Behavior
+
+* Describe your expectation of how JRuby should behave, perhaps by showing how CRuby/MRI behaves.
+* Provide an executable Ruby script or a link to an example repository.
+
+### Actual Behavior
+
+* Describe or show the actual behavior.
+* Provide text or screen capture showing the behavior.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ It aims to be a complete, correct and fast implementation of Ruby, at the same
 time as providing powerful new features such as concurrency without a
 [global-interpreter-lock](http://en.wikipedia.org/wiki/Global_Interpreter_Lock),
 true parallelism, and tight integration to the Java language to allow you to
-uses Java classes in your Ruby program and to allow JRuby to be embedded into a
+use Java classes in your Ruby program and to allow JRuby to be embedded into a
 Java application.
 
 You can use JRuby simply as a faster version of Ruby, you can use it to run Ruby
@@ -40,7 +40,7 @@ For [`rbenv`](https://github.com/sstephenson/rbenv) you will need the
 package manager can provide these. Then you can run:
 
 ```
-$ rbenv install jruby-9.0.0.0-dev
+$ rbenv install jruby-9.0.5.0
 ```
 
 For [`rvm`](https://rvm.io) you can simply do:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9.0.5.0-SNAPSHOT
+9.1.3.0-SNAPSHOT
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,8 +4,6 @@ build: off
 
 environment:
   matrix:
-    - JAVA_HOME: C:\Program Files\Java\jdk1.7.0
-    - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0
     - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
     - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
 

diff --git a/bench/yarv/bm_app_answer.rb → bench/mri/bm_app_answer.rb b/bench/yarv/bm_app_answer.rb → bench/mri/bm_app_answer.rb
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.1/apache-maven-3.3.1-bin.zip
		distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip