Merge branch 'test/java9-jigsaw'

diff --cc javassist.jar
index 3fb75e6a87bf5fd931555fa9aefba0c2bcf107db,20b45c6cb44d9abdd00012ac2fa2bc95db316631..40f6a4482c365393a4dbaa118fc72b66f0971707
Binary files differ

diff --cc pom.xml
index 49ba6657330dcf895212802e7a54204885750a2e,6b780fcddec40e9e732c2e3810299d187db4cb75..f43906282aa7fd769aac092f6f83a2ceef0bbc10
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -7,7 -7,7 +7,7 @@@
        Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation
      simple.  It is a class library for editing bytecodes in Java.
    </description>
-   <version>3.21.0-GA</version>
 -  <version>3.21.0</version>
++  <version>3.22.0-CR1</version>
    <name>Javassist</name>
    <url>http://www.javassist.org/</url>
  

diff --cc src/main/javassist/CtClass.java
index 31e86044a907cb1f6f53f2bc6ca807a096a33d66,162ce48f783909153dd5e4ce3fc4ab82cfb3a673..4ff04c0ed888710c797419d05a8b294c1f062925
--- 1/src/main/javassist/CtClass.java
--- 2/src/main/javassist/CtClass.java
+++ b/src/main/javassist/CtClass.java
@@@ -69,7 -69,7 +69,7 @@@ public abstract class CtClass 
      /**
       * The version number of this release.
       */
-     public static final String version = "3.21.0-GA";
 -    public static final String version = "3.21.0-java9beta2";
++    public static final String version = "3.22.0-CR1";
  
      /**
       * Prints the version number and the copyright notice.

diff --cc src/main/javassist/CtField.java
Simple merge

diff --cc src/main/javassist/bytecode/ClassFile.java
Simple merge

diff --cc src/test/javassist/JvstTest5.java
index c20a85f2cc5074228242a33c543678ebe2e7c604,9d22c47cc9d1f8b1077ba2e01cd4d989feb54d10..26474bb781a6ce870abfdec5a4a3e9a6cd068f8d
--- 1/src/test/javassist/JvstTest5.java
--- 2/src/test/javassist/JvstTest5.java
+++ b/src/test/javassist/JvstTest5.java
@@@ -237,6 -237,12 +237,13 @@@ public class JvstTest5 extends JvstTest
          assertEquals(1, invoke(obj, "run"));
      }
  
+     public void testLoaderClassPath() throws Exception {
+         ClassPool cp = new ClassPool();
+         cp.appendClassPath(new LoaderClassPath(new Loader()));
+         assertNotNull(cp.get(Object.class.getName()));
+         assertNotNull(cp.get(this.getClass().getName()));
++    }
+ 
      public void testAddDefaultMethod() throws Exception {
          CtClass cc = sloader.makeInterface("test5.AddDefaultMethod");
          cc.addMethod(CtNewMethod.make("static int foo() { return 1; }", cc));