.gitignore

@@ -81,7 +81,7 @@ target
 test/pom.xml
 test/prawn
 test/rails
-test/testapp/testapp
+test/jruby/testapp/testapp
 tool/nailgun/Makefile
 tool/nailgun/config.log
 tool/nailgun/config.status

.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.15</version>
+    <version>0.3.0</version>
   </extension>
 </extensions>

.travis.yml

@@ -7,13 +7,17 @@ cache:
    - $HOME/.m2
 
 before_install:
+  - unset _JAVA_OPTIONS
   - rm ~/.m2/settings.xml
   - export MAVEN_SKIP_RC=true
-  - mvn -Xmx32M -v | grep 1.7.0; if [ $? = 0 ]; then export MAVEN_OPTS="-XX:MaxPermSize=180M"; else export MAVEN_OPTS="-XX:MaxMetaspaceSize=180M -XX:CompressedClassSpaceSize=180M"; fi
-  - export MAVEN_OPTS="-Xmx500M $MAVEN_OPTS"
+  - mvn -Xmx32M -v | grep 1.7.0; if [ $? = 0 ]; then export MAVEN_OPTS="-XX:MaxPermSize=160M"; else export MAVEN_OPTS="-XX:MaxMetaspaceSize=144M -XX:CompressedClassSpaceSize=96M"; fi
+  - export MAVEN_OPTS="-Xms64M -Xmx512M $MAVEN_OPTS"
+  - export JAVA_OPTS="$JAVA_OPTS"
+
 
 before_script:
   - unset GEM_PATH GEM_HOME IRBRC JRUBY_OPTS
+  - unset _JAVA_OPTIONS # travis/travis#8408
   - export PATH="`pwd`/bin:$PATH"
   - echo $HOME
   - echo $JAVA_OPTS
@@ -21,14 +25,13 @@ before_script:
 
 jdk:
   - openjdk7
-#  - oraclejdk8
 
 os:
   - linux
 
 env:
   global:
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmn36M -Xmx512M"
+    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xms48M -Xmx640M -XX:InitialCodeCacheSize=40M -XX:ReservedCodeCacheSize=120M -Djava.security.egd=file:/dev/./urandom"
     - MALLOC_ARENA_MAX=2
   matrix:
     - PHASE='-Ptest'
@@ -66,6 +69,8 @@ matrix:
       jdk: openjdk7
     - env: PHASE='-Pj2ee'
       jdk: oraclejdk8
+    - env: PHASE='-Prake -Dtask=test:mri'
+      jdk: oraclejdk8
     # These next two started crashing on JDK7 in March 2015, possibly due to JVM issues on Travis's Docker-based env
     - env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
       jdk: oraclejdk8
@@ -75,15 +80,23 @@ matrix:
       jdk: oraclejdk8
     - env: COMMAND=test/check_versions.sh
       jdk: oraclejdk8
+    - env: PHASE='-Prake -Dtask=test:jruby:jit'
+      jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=test:mri:jit'
+      jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=spec:ruby:fast'
+      jdk: oraclejdk9
+    - env: PHASE='-Pmain'
+      jdk: oraclejdk9
+    - env: PHASE='-Pcomplete'
+      jdk: oraclejdk9
   allow_failures:
-    #- env: PHASE='-Pj2ee'
-    #  jdk: oraclejdk7
-    # NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
-    #- env: PHASE='-Pmain'
-    #  sudo: required
-    #  dist: trusty
-    #  group: edge
-    #  jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=test:jruby:jit'
+      jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=test:mri:jit'
+      jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=spec:ruby:fast'
+      jdk: oraclejdk9
 
 install: tool/travis-install.sh
 script: tool/travis-script.sh
@@ -104,3 +117,10 @@ notifications:
 
 services:
   - redis-server
+  - haveged
+
+addons:
+  apt:
+    packages:
+#      - oracle-java9-installer
+      - haveged

BUILDING.md

@@ -123,19 +123,21 @@ from MRI's tests (under test/mri), use one of the following commands:
 The MRI suite (under `test/mri`) has a runner script in `test/mri/runner.rb` that sets up
 an appropriate test environment. Many of the MRI tests will need to be run via this script.
 ```
-jruby -r ./test/mri_test_env.rb test/mri/runner.rb test/mri/<path to test>
+jruby test/mri/runner.rb test/mri/<path to test>
 ```
 
-You can pass `-v` to the runner for verbose output or `-n test_method_name` to only run a single test method.  If you are interested in all failures you can exlude the -r option (of mri_test_env.rb).  Some excluded tests are inherent limitations of JRuby and some are just problems we have not gotten to yet.
+You can pass `-v` to the runner for verbose output or `-n test_method_name` to only run a single test method.
 
 #### Run a test file with known-failing tests excluded
 
-The runner script provides a mechanism for "excluding" known failing tests. Ruby scripts under `test/mri/exclude`, named based on the name of the test case's class, exclude with comment tests known to fail.
+The runner script provides a mechanism for "excluding" known failing tests. These are usually features that JRuby has not yet implemented or can't implement on the JVM.
 
-To run a given test with these excludes enabled, you can use the EXCLUDES environment variable:
+Excludes are in the form of Ruby scripts under `test/mri/exclude`, named based on the name of the test case's class, exclude with comment tests known to fail.
+
+To run a given test with these excludes enabled, you can use the --excludes flag:
 
 ```
-EXCLUDES=test/mri/excludes bin/jruby test/mri/runner.rb <test file>
+bin/jruby test/mri/runner.rb --excludes=test/mri/excludes <test file>
 ```
 
 #### Run a single Ruby spec

README.md

@@ -76,6 +76,6 @@ Project Contact: Thomas E Enebo <tom.enebo@gmail.com>
 
 ## License
 
-JRuby is licensed to you under three licenses - the EPL 1.0, GPL 2 and LGPL 2.1.
+JRuby is licensed to you under three licenses - the EPL 2.0, GPL 2 and LGPL 2.1.
 Some components have other licenses and copyright. See the [COPYING](COPYING)
 file for more specifics.

VERSION

-9.1.13.0
+9.1.17.0

bin/jgem

@@ -12,7 +12,7 @@ require 'rubygems/exceptions'
 required_version = Gem::Requirement.new ">= 1.8.7"
 
 unless required_version.satisfied_by? Gem.ruby_version then
-  abort "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"
+  abort "Expected Ruby Version #{required_version}, is #{Gem.ruby_version}"
 end
 
 args = ARGV.clone

bin/jruby.bash

@@ -20,6 +20,14 @@ case "`uname`" in
   MINGW*) jruby.exe "$@"; exit $?;;
 esac
 
+# ----- Determine how to call expr (jruby/jruby#5091) -------------------------
+# On Alpine linux, expr takes no -- arguments, and 'expr --' echoes '--'.
+_expr_dashed=$(expr -- 2>/dev/null)
+if [ "$_expr_dashed" != '--' ] ; then
+  alias expr="expr --"
+fi
+unset _expr_dashed
+
 # ----- Verify and Set Required Environment Variables -------------------------
 if [ -z "$JAVA_VM" ]; then
   JAVA_VM=-client
@@ -180,6 +188,14 @@ fi
 # ----- Execute The Requested Command -----------------------------------------
 JAVA_ENCODING=""
 
+if [ -r "/dev/urandom" ]; then
+  # OpenJDK tries really hard to prevent you from using urandom.
+  # See https://bugs.openjdk.java.net/browse/JDK-6202721
+  # Non-file URL causes fallback to slow threaded SeedGenerator.
+  # See https://bz.apache.org/bugzilla/show_bug.cgi?id=56139
+  JAVA_SECURITY_EGD="file:/dev/urandom"
+fi
+
 declare -a java_args
 declare -a ruby_args
 mode=""
@@ -219,23 +235,16 @@ do
             CP="$CP$CP_DELIMITER$2"
             CLASSPATH=""
             shift
-        elif [ "${val:0:3}" = "-G:" ]; then # Graal options
-            opt=${val:3}
-            case $opt in
-              +*)
-                opt="${opt:1}=true" ;;
-              -*)
-                opt="${opt:1}=false" ;;
-            esac
-            echo "$1 is deprecated - use -J-Dgraal.$opt instead" >&2
-            java_args=("${java_args[@]}" "-Dgraal.$opt")
         else
             if [ "${val:0:3}" = "-ea" ]; then
                 VERIFY_JRUBY="yes"
             elif [ "${val:0:16}" = "-Dfile.encoding=" ]; then
-                JAVA_ENCODING=$val
+                JAVA_ENCODING=$val${val:16}
+            elif [ "${val:0:20}" = "-Djava.security.egd=" ]; then
+                JAVA_SECURITY_EGD=${val:20}
+            else
+                java_args=("${java_args[@]}" "${1:2}")
             fi
-            java_args=("${java_args[@]}" "${1:2}")
         fi
         ;;
      # Pass -X... and -X? search options through
@@ -313,6 +322,14 @@ done
 # Force file.encoding to UTF-8 when on Mac, since Apple JDK defaults to MacRoman (JRUBY-3576)
 if [[ $darwin && -z "$JAVA_ENCODING" ]]; then
   java_args=("${java_args[@]}" "-Dfile.encoding=UTF-8")
+elif [[ -n "$JAVA_ENCODING" ]]; then
+  java_args=("${java_args[@]}" "-Dfile.encoding=$JAVA_ENCODING")
+fi
+
+# Force OpenJDK-based JVMs to use /dev/urandom for random number generation
+# See https://github.com/jruby/jruby/issues/4685 among others.
+if [[ -n "$JAVA_SECURITY_EGD" ]]; then
+  java_args=("${java_args[@]}" "-Djava.security.egd=$JAVA_SECURITY_EGD")
 fi
 
 # Append the rest of the arguments

bin/jruby.sh

@@ -26,9 +26,9 @@ progname=`basename "$0"`
 
 while [ -h "$PRG" ] ; do
   ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '.*/.*' > /dev/null; then
-    if expr "$link" : '/' > /dev/null; then
+  link=`expr -- "$ls" : '.*-> \(.*\)$'`
+  if expr -- "$link" : '.*/.*' > /dev/null; then
+    if expr -- "$link" : '/' > /dev/null; then
       PRG="$link"
     else
       PRG="`dirname ${PRG}`/${link}"
@@ -202,7 +202,7 @@ do
      # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
      -X*)
      val=${1:2}
-     if expr "$val" : '.*[.]' > /dev/null; then
+     if expr -- "$val" : '.*[.]' > /dev/null; then
        java_args="${java_args} -Djruby.${val}"
      else
        ruby_args="${ruby_args} -X${val}"

core/pom.rb

@@ -46,18 +46,18 @@ project 'JRuby Core' do
   jar 'com.github.jnr:jnr-enxio:0.16', :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.17', :exclusions => ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-posix:3.0.41', :exclusions => ['com.github.jnr:jnr-ffi']
+  jar 'com.github.jnr:jnr-posix:3.0.44', :exclusions => ['com.github.jnr:jnr-ffi']
   jar 'com.github.jnr:jnr-constants:0.9.9', :exclusions => ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-ffi:2.1.6'
+  jar 'com.github.jnr:jnr-ffi:2.1.7'
   jar 'com.github.jnr:jffi:${jffi.version}'
   jar 'com.github.jnr:jffi:${jffi.version}:native'
 
-  jar 'org.jruby.joni:joni:2.1.11'
+  jar 'org.jruby.joni:joni:2.1.15'
   jar 'org.jruby.extras:bytelist:1.0.15'
-  jar 'org.jruby.jcodings:jcodings:1.0.18'
+  jar 'org.jruby.jcodings:jcodings:1.0.27'
   jar 'org.jruby:dirgra:0.3'
 
-  jar 'com.headius:invokebinder:1.7'
+  jar 'com.headius:invokebinder:1.10'
   jar 'com.headius:options:1.4'
   jar 'com.headius:unsafe-fences:1.0'
 
@@ -78,6 +78,8 @@ project 'JRuby Core' do
 
   jar 'me.qmx.jitescript:jitescript:0.4.1', :exclusions => ['org.ow2.asm:asm-all']
 
+  jar 'com.headius:modulator:1.0'
+
   plugin_management do
     plugin( 'org.eclipse.m2e:lifecycle-mapping:1.0.0',
             'lifecycleMappingMetadata' => {
@@ -262,12 +264,16 @@ project 'JRuby Core' do
     execute_goals( 'shade',
                    :id => 'create lib/jruby.jar',
                    :phase => 'package',
-                   'relocations' => [ { 'pattern' => 'org.objectweb',
-                                        'shadedPattern' => 'org.jruby.org.objectweb' } ],
+                   relocations: [
+                       {pattern: 'org.objectweb', shadedPattern: 'org.jruby.org.objectweb' },
+                   ],
                    'outputFile' => '${jruby.basedir}/lib/jruby.jar',
                    'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
                                          'mainClass' => 'org.jruby.Main' } ],
-                   'createSourcesJar' => '${create.sources.jar}' )
+                   'createSourcesJar' => '${create.sources.jar}',
+                   filters:
+                       {filter: {artifact: 'com.headius:invokebinder', excludes: {exclude: '**/module-info.class'}}}
+    )
   end
 
   [:all, :release, :main, :osgi, :j2ee, :complete, :dist, :'jruby_complete_jar_extended', :'jruby-jars' ].each do |name|
@@ -286,8 +292,13 @@ project 'JRuby Core' do
                                          'me.qmx.jitescript:jitescript',
                                          'org.ow2.asm:*' ]
                        },
-                       'relocations' => [ { 'pattern' =>  'org.objectweb',
-                                            'shadedPattern' =>  'org.jruby.org.objectweb' } ] )
+                       relocations: [
+                           {pattern: 'org.objectweb', shadedPattern: 'org.jruby.org.objectweb' },
+                           {pattern: 'me.qmx.jitescript', shadedPattern: 'org.jruby.me.qmx.jitescript'},
+                       ],
+                       filters:
+                           {filter: {artifact: 'com.headius:invokebinder', excludes: {exclude: '**/module-info.class'}}}
+        )
       end
     end
   end

core/pom.xml

@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.1.13.0</version>
+    <version>9.1.17.0</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>
@@ -29,7 +29,7 @@ DO NOT MODIFIY - GENERATED CODE
     <prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
     <version.ruby.minor>3</version.ruby.minor>
     <tzdata.version>2013d</tzdata.version>
-    <install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
+    <install4j.executable>/Applications/install4j7/bin/install4jc</install4j.executable>
     <jay.bin>jay</jay.bin>
     <polyglot.dump.readonly>true</polyglot.dump.readonly>
     <dest.lib.dir>${lib.dir}</dest.lib.dir>
@@ -135,7 +135,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.0.41</version>
+      <version>3.0.44</version>
       <exclusions>
         <exclusion>
           <artifactId>jnr-ffi</artifactId>
@@ -157,7 +157,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-ffi</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -173,7 +173,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby.joni</groupId>
       <artifactId>joni</artifactId>
-      <version>2.1.11</version>
+      <version>2.1.15</version>
     </dependency>
     <dependency>
       <groupId>org.jruby.extras</groupId>
@@ -183,7 +183,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby.jcodings</groupId>
       <artifactId>jcodings</artifactId>
-      <version>1.0.18</version>
+      <version>1.0.27</version>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
@@ -193,7 +193,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.headius</groupId>
       <artifactId>invokebinder</artifactId>
-      <version>1.7</version>
+      <version>1.10</version>
     </dependency>
     <dependency>
       <groupId>com.headius</groupId>
@@ -273,6 +273,11 @@ DO NOT MODIFIY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.headius</groupId>
+      <artifactId>modulator</artifactId>
+      <version>1.0</version>
+    </dependency>
   </dependencies>
   <build>
     <defaultGoal>package</defaultGoal>
@@ -618,6 +623,14 @@ DO NOT MODIFIY - GENERATED CODE
                 </transformer>
               </transformers>
               <createSourcesJar>${create.sources.jar}</createSourcesJar>
+              <filters>
+                <filter>
+                  <artifact>com.headius:invokebinder</artifact>
+                  <excludes>
+                    <exclude>**/module-info.class</exclude>
+                  </excludes>
+                </filter>
+              </filters>
             </configuration>
           </execution>
         </executions>
@@ -677,7 +690,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>
@@ -711,7 +736,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>
@@ -745,7 +782,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>
@@ -779,7 +828,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>
@@ -813,7 +874,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>
@@ -847,7 +920,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>
@@ -881,7 +966,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>
@@ -915,7 +1012,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>
@@ -949,7 +1058,19 @@ DO NOT MODIFIY - GENERATED CODE
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>org.jruby.org.objectweb</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>me.qmx.jitescript</pattern>
+                      <shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
+                    </relocation>
                   </relocations>
+                  <filters>
+                    <filter>
+                      <artifact>com.headius:invokebinder</artifact>
+                      <excludes>
+                        <exclude>**/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+                  </filters>
                 </configuration>
               </execution>
             </executions>

core/src/main/java/org/jruby/AbstractRubyMethod.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/epl-v10.html
  *
@@ -100,7 +100,7 @@ public abstract class AbstractRubyMethod extends RubyObject implements DataType
 
     @JRubyMethod(name = "owner")
     public IRubyObject owner(ThreadContext context) {
-        return method.getDefinedClass();
+        return implementationModule;
     }
 
     @JRubyMethod(name = "source_location")

core/src/main/java/org/jruby/BasicObjectStub.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/epl-v10.html
  *

core/src/main/java/org/jruby/Finalizable.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/epl-v10.html
  *

core/src/main/java/org/jruby/IncludedModuleWrapper.java

 /*
  ***** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/epl-v10.html
  *

core/src/main/java/org/jruby/JarBootstrapMain.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/epl-v10.html
  *

core/src/main/java/org/jruby/Main.java

 /*
  ***** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/epl-v10.html
  *

core/src/main/java/org/jruby/MetaClass.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/epl-v10.html
  *

core/src/main/java/org/jruby/NativeException.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
- * License Version 1.0 (the "License"); you may not use this file
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/epl-v10.html
  *