fix release jars including testing-*

diff --git a/build/src/org/aspectj/internal/tools/build/Result.java b/build/src/org/aspectj/internal/tools/build/Result.java
index ebf61394d7623c77763eadea628727e797a7a1e9..bd1cbc125326e35ae39bcba7b3dcd6e5452ee24f 100644 (file)
--- a/build/src/org/aspectj/internal/tools/build/Result.java
+++ b/build/src/org/aspectj/internal/tools/build/Result.java
@@ -329,7 +329,7 @@ public class Result {
     }
 
     private void initRequiredResults() {
-        Module module = getModule();
+        final Module module = getModule();
         final Kind kind = getKind();
         if (kind.assemble) {
             if (kind.normal) {
@@ -348,18 +348,18 @@ public class Result {
         }
         // externally-required:
         List modules = module.requiredModules(this);
-        final boolean thisIsTestingModule = isTestingModule(module);
+        final boolean adoptTests = !kind.normal || isTestingModule(module);
         for (Iterator iter = modules.iterator(); iter.hasNext();) {
-            module = (Module) iter.next();
-            if (thisIsTestingModule || !kind.normal) {
+            Module required = (Module) iter.next();
+            if (adoptTests) {
                 // testing builds can rely on other release and test results
-                requiredResults.add(module.getResult(TEST));
-                requiredResults.add(module.getResult(RELEASE));
-            } else {
+                requiredResults.add(required.getResult(TEST));
+                requiredResults.add(required.getResult(RELEASE));
+            } else if (!isTestingModule(required)){
                 // release builds can only rely on non-testing results
                 // from non-testing modules
-                requiredResults.add(module.getResult(RELEASE));
-            }
+                requiredResults.add(required.getResult(RELEASE));
+            } // else skip release dependencies on testing-* (testing-util)
         }
     }
 

diff --git a/lib/build/build.jar b/lib/build/build.jar
index ac9f2686a16ff3427b588e7ab1707195111c27c2..8cf4d61009ed413f2666cb0112d844ff930e2ecc 100644 (file)
Binary files a/lib/build/build.jar and b/lib/build/build.jar differ