Merged post 1.8.5 changes into Java9 branch

diff --cc ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
index afa27b3195f6359755ff6afd55c9d724029eced2,afa27b3195f6359755ff6afd55c9d724029eced2..42e8254ccdfd9160f25c07cbb308c7859cfe5d1f
--- 1/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
--- 2/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
@@@ -17,7 -17,7 +17,7 @@@ import java.util.List
  import org.aspectj.util.FileUtil;
  import org.aspectj.util.LangUtil;
  
--import com.sun.org.apache.xml.internal.serializer.utils.Utils;
++//import com.sun.org.apache.xml.internal.serializer.utils.Utils;
  
  
  /**

diff --cc bcel-builder/src/org/aspectj/apache/bcel/Constants.java
index 41d75a7cfdde5a4aec6c9c52159f7cf46c777c55,0bba78fc41c34303ab5e553c1814aaeb5b08f89b..5f37d106ab87d694f3b944ff1206a9dac637d8c6
--- 1/bcel-builder/src/org/aspectj/apache/bcel/Constants.java
--- 2/bcel-builder/src/org/aspectj/apache/bcel/Constants.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/Constants.java
@@@ -107,10 -105,10 +107,12 @@@ public interface Constants 
        public final static short ACC_INTERFACE = 0x0200;
        public final static short ACC_ABSTRACT = 0x0400;
        public final static short ACC_STRICT = 0x0800;
-       
+ 
+       public final static short ACC_SYNTHETIC = 0x1000;
++
        public final static short ACC_ANNOTATION = 0x2000;
        public final static short ACC_ENUM = 0x4000;
 +      public final static int ACC_MODULE = 0x8000;
        public final static short ACC_BRIDGE = 0x0040;
        public final static short ACC_VARARGS = 0x0080;
  

diff --cc org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
Simple merge

diff --cc org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
Simple merge

diff --cc org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
Simple merge

diff --cc taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
Simple merge

diff --cc weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
index ee315172f406c10c77b30e614f0bb28143b524e9,f176f8880a2510ddbe6ebe5b16d0cb6fdb07e857..d041327aa8628cd1095f515421f8e0e41e18b986
--- 1/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
--- 2/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
+++ b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
@@@ -101,14 -88,10 +106,15 @@@ public class ClassPathManager 
                                return;
                        }
                        try {
 -                              entries.add(new ZipFileEntry(f));
 +                              if (lc.endsWith(LangUtil.JRT_FS)) {
 +                                      // Java9
 +                                      entries.add(new JImageEntry(new File(f.getParentFile()+File.separator+"lib"+File.separator+"modules")));
 +                              } else {
 +                                      entries.add(new ZipFileEntry(f));
 +                              }
                        } catch (IOException ioe) {
-                               MessageUtil.warn(handler, WeaverMessages.format(WeaverMessages.ZIPFILE_ENTRY_INVALID, name, ioe.getMessage()));
+                               MessageUtil.warn(handler,
+                                               WeaverMessages.format(WeaverMessages.ZIPFILE_ENTRY_INVALID, name, ioe.getMessage()));
                                return;
                        }
                } else {
@@@ -175,44 -153,7 +176,42 @@@
  
        public abstract static class Entry {
                public abstract ClassFile find(String name) throws IOException;
- 
-               // public abstract List getAllClassFiles() throws IOException;
        }
 +      
 +      private static class ByteBasedClassFile extends ClassFile {
 +
 +              private byte[] bytes;
 +              private ByteArrayInputStream bais;
 +              private String path;
 +              
 +              public ByteBasedClassFile(byte[] bytes, String path) {
 +                      this.bytes = bytes;                     
 +                      this.path = path;
 +              }
 +              
 +              @Override
 +              public InputStream getInputStream() throws IOException {
 +                      this.bais = new ByteArrayInputStream(bytes);
 +                      return this.bais;
 +              }
 +
 +              @Override
 +              public String getPath() {
 +                      return this.path;
 +              }
 +
 +              @Override
 +              public void close() {
 +                      if (this.bais!=null) {
 +                              try {
 +                                      this.bais.close();
 +                              } catch (IOException e) {
 +                              }
 +                              this.bais = null;
 +                      }
 +              }
 +              
 +      }
  
        private static class FileClassFile extends ClassFile {
                private File file;

diff --cc weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
Simple merge