rebuilt internal dependencies

29 files changed, 89 insertions, 1 deletions

diff --git a/bcel-builder/testsrc/Play.java b/bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java
index 9fef2fa6c..9fef2fa6c 100644
--- a/bcel-builder/testsrc/Play.java
+++ b/bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java
diff --git a/lib/asm/asm-6.0_BETA.renamed.jar b/lib/asm/asm-6.0_BETA.renamed.jar
index 9fbae494b..680ab7733 100644
--- a/lib/asm/asm-6.0_BETA.renamed.jar
+++ b/lib/asm/asm-6.0_BETA.renamed.jar
diff --git a/lib/asm/build.xml b/lib/asm/build.xml
index 07a5e9863..5f9693b56 100644
--- a/lib/asm/build.xml
+++ b/lib/asm/build.xml
@@ -5,7 +5,7 @@
 
 	<target name="package" description="Jarjar asm-5.0.4.jar and prefix package name with aj">
 	        <jarjar destfile="asm-6.0_BETA.renamed.jar">
-	          <zipfileset src="asm-6.0_BETA.jar"/>
+	          <zipfileset src="asm-6.0_BETA.jar" excludes="module-info.class"/>
 	          <rule pattern="org.objectweb.asm.**" result="aj.org.objectweb.asm.@1"/>
 	        </jarjar>
 	</target> 
diff --git a/lib/bcel/bcel-verifier.jar b/lib/bcel/bcel-verifier.jar
index 724cb9b99..0153468a9 100644
--- a/lib/bcel/bcel-verifier.jar
+++ b/lib/bcel/bcel-verifier.jar
diff --git a/lib/bcel/bcel.jar b/lib/bcel/bcel.jar
index 38ecbc51f..acadafd3e 100644
--- a/lib/bcel/bcel.jar
+++ b/lib/bcel/bcel.jar
diff --git a/lib/build/build.jar b/lib/build/build.jar
index 8a6f93714..a203ada4c 100644
--- a/lib/build/build.jar
+++ b/lib/build/build.jar
diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar
index ef06aa7fd..f0c7d5f7c 100644
--- a/lib/test/aspectjrt.jar
+++ b/lib/test/aspectjrt.jar
diff --git a/tests/bugs190/modules/aaa/com/foo1/C1.java b/tests/bugs190/modules/aaa/com/foo1/C1.java
new file mode 100644
index 000000000..eb087840d
--- /dev/null
+++ b/tests/bugs190/modules/aaa/com/foo1/C1.java
@@ -0,0 +1,3 @@
+package com.foo1;
+
+public class C1 {}
diff --git a/tests/bugs190/modules/aaa/module-info.java b/tests/bugs190/modules/aaa/module-info.java
new file mode 100644
index 000000000..b6bd69405
--- /dev/null
+++ b/tests/bugs190/modules/aaa/module-info.java
@@ -0,0 +1,3 @@
+module e.f.g {
+  exports com.foo1;
+}
diff --git a/tests/bugs190/modules/bbb/aaa/bbb/A.java b/tests/bugs190/modules/bbb/aaa/bbb/A.java
new file mode 100644
index 000000000..09935dc54
--- /dev/null
+++ b/tests/bugs190/modules/bbb/aaa/bbb/A.java
@@ -0,0 +1,7 @@
+package aaa.bbb;
+
+public class A {
+  public static void main(String []argv) {
+	  System.out.println("A running");
+  }
+}
diff --git a/tests/bugs190/modules/bbb/module-info.java b/tests/bugs190/modules/bbb/module-info.java
new file mode 100644
index 000000000..60e9fdc99
--- /dev/null
+++ b/tests/bugs190/modules/bbb/module-info.java
@@ -0,0 +1,3 @@
+module my.module {
+  exports aaa.bbb;
+}
diff --git a/tests/bugs190/modules/ccc/InvokeA.java b/tests/bugs190/modules/ccc/InvokeA.java
new file mode 100644
index 000000000..5c07384e9
--- /dev/null
+++ b/tests/bugs190/modules/ccc/InvokeA.java
@@ -0,0 +1,6 @@
+import aaa.bbb.A;
+public class InvokeA {
+	public static void main(String[] argv) {
+		A.main(argv);
+	}
+}
diff --git a/tests/bugs190/modules/ccc/aaa/bbb/A.java b/tests/bugs190/modules/ccc/aaa/bbb/A.java
new file mode 100644
index 000000000..09935dc54
--- /dev/null
+++ b/tests/bugs190/modules/ccc/aaa/bbb/A.java
@@ -0,0 +1,7 @@
+package aaa.bbb;
+
+public class A {
+  public static void main(String []argv) {
+	  System.out.println("A running");
+  }
+}
diff --git a/tests/bugs190/modules/ccc/module-info.java b/tests/bugs190/modules/ccc/module-info.java
new file mode 100644
index 000000000..60e9fdc99
--- /dev/null
+++ b/tests/bugs190/modules/ccc/module-info.java
@@ -0,0 +1,3 @@
+module my.module {
+  exports aaa.bbb;
+}
diff --git a/tests/bugs190/modules/ddd/InvokeA.java b/tests/bugs190/modules/ddd/InvokeA.java
new file mode 100644
index 000000000..5c07384e9
--- /dev/null
+++ b/tests/bugs190/modules/ddd/InvokeA.java
@@ -0,0 +1,6 @@
+import aaa.bbb.A;
+public class InvokeA {
+	public static void main(String[] argv) {
+		A.main(argv);
+	}
+}
diff --git a/tests/bugs190/modules/ddd/aaa/bbb/A.java b/tests/bugs190/modules/ddd/aaa/bbb/A.java
new file mode 100644
index 000000000..09935dc54
--- /dev/null
+++ b/tests/bugs190/modules/ddd/aaa/bbb/A.java
@@ -0,0 +1,7 @@
+package aaa.bbb;
+
+public class A {
+  public static void main(String []argv) {
+	  System.out.println("A running");
+  }
+}
diff --git a/tests/bugs190/modules/ddd/module-info.java b/tests/bugs190/modules/ddd/module-info.java
new file mode 100644
index 000000000..57dd04566
--- /dev/null
+++ b/tests/bugs190/modules/ddd/module-info.java
@@ -0,0 +1,2 @@
+module my.module {
+}
diff --git a/tests/bugs190/modules/eee/Azpect.java b/tests/bugs190/modules/eee/Azpect.java
new file mode 100644
index 000000000..5dd4aa342
--- /dev/null
+++ b/tests/bugs190/modules/eee/Azpect.java
@@ -0,0 +1,7 @@
+package aspects;
+
+public aspect Azpect {
+	before(): execution(* main(..)) {
+		System.out.println("Azpect running");
+	}
+}
diff --git a/tests/bugs190/modules/eee/aaa/bbb/A.java b/tests/bugs190/modules/eee/aaa/bbb/A.java
new file mode 100644
index 000000000..09935dc54
--- /dev/null
+++ b/tests/bugs190/modules/eee/aaa/bbb/A.java
@@ -0,0 +1,7 @@
+package aaa.bbb;
+
+public class A {
+  public static void main(String []argv) {
+	  System.out.println("A running");
+  }
+}
diff --git a/tests/bugs190/modules/eee/module-info.java b/tests/bugs190/modules/eee/module-info.java
new file mode 100644
index 000000000..60e9fdc99
--- /dev/null
+++ b/tests/bugs190/modules/eee/module-info.java
@@ -0,0 +1,3 @@
+module my.module {
+  exports aaa.bbb;
+}
diff --git a/tests/bugs190/modules/fff/aspects.jar b/tests/bugs190/modules/fff/aspects.jar
new file mode 100644
index 000000000..246cab5f5
--- /dev/null
+++ b/tests/bugs190/modules/fff/aspects.jar
diff --git a/tests/bugs190/modules/fff/demo.jar b/tests/bugs190/modules/fff/demo.jar
new file mode 100644
index 000000000..f00e0337d
--- /dev/null
+++ b/tests/bugs190/modules/fff/demo.jar
diff --git a/tests/bugs190/modules/fff/extra/AnotherAzpect.java b/tests/bugs190/modules/fff/extra/AnotherAzpect.java
new file mode 100644
index 000000000..16b8c16d6
--- /dev/null
+++ b/tests/bugs190/modules/fff/extra/AnotherAzpect.java
@@ -0,0 +1,7 @@
+package extra;
+
+public aspect AnotherAzpect {
+		before(): execution(* *(..)) && !within(*Azpect) {
+					System.out.println("AnotherAzpect running");
+						}
+}
diff --git a/tests/bugs190/modules/fff/module-info.java b/tests/bugs190/modules/fff/module-info.java
new file mode 100644
index 000000000..6f03752e8
--- /dev/null
+++ b/tests/bugs190/modules/fff/module-info.java
@@ -0,0 +1,4 @@
+module demo {
+	exports pkg;
+	requires org.aspectj.runtime;
+}
diff --git a/tests/bugs190/modules/fff/newdemo.jar b/tests/bugs190/modules/fff/newdemo.jar
new file mode 100644
index 000000000..c32ca378a
--- /dev/null
+++ b/tests/bugs190/modules/fff/newdemo.jar
diff --git a/tests/bugs190/modules/fff/otherpkg/Azpect.java b/tests/bugs190/modules/fff/otherpkg/Azpect.java
new file mode 100644
index 000000000..af53fdf49
--- /dev/null
+++ b/tests/bugs190/modules/fff/otherpkg/Azpect.java
@@ -0,0 +1,7 @@
+package otherpkg;
+
+public aspect Azpect {
+	before(): execution(* *(..)) && !within(Azpect) {
+		System.out.println("Azpect running");
+	}
+}
diff --git a/tests/bugs190/modules/fff/pkg/Demo.java b/tests/bugs190/modules/fff/pkg/Demo.java
new file mode 100644
index 000000000..694595053
--- /dev/null
+++ b/tests/bugs190/modules/fff/pkg/Demo.java
@@ -0,0 +1,6 @@
+package pkg;
+public class Demo {
+	public static void main(String[] argv) {
+		System.out.println("Demo running");
+	}
+}
diff --git a/tests/bugs190/modules/module1/a/b/c/Code.class b/tests/bugs190/modules/module1/a/b/c/Code.class
deleted file mode 100644
index 5d5e514b8..000000000
--- a/tests/bugs190/modules/module1/a/b/c/Code.class
+++ /dev/null
diff --git a/tests/bugs190/modules/module1/module-info.class b/tests/bugs190/modules/module1/module-info.class
deleted file mode 100644
index 0088bd13a..000000000
--- a/tests/bugs190/modules/module1/module-info.class
+++ /dev/null