From 704a0ac3321dd3bd3f56e52216de0643d0dab748 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Fri, 8 Feb 2019 17:31:59 -0800
Subject: [PATCH] tidyup - last bits of maven stuff

---
 .../internal/build/BuildClasspathTest.java    | 40 +++++++++----------
 docs/src/main/resources/local.properties      | 12 ++++++
 pom.xml                                       |  3 ++
 .../org/aspectj/testing/util/TestUtil.java    |  6 ++-
 4 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100644 docs/src/main/resources/local.properties

diff --git a/build/src/test/java/org/aspectj/internal/build/BuildClasspathTest.java b/build/src/test/java/org/aspectj/internal/build/BuildClasspathTest.java
index b8cb4b896..68669df30 100644
--- a/build/src/test/java/org/aspectj/internal/build/BuildClasspathTest.java
+++ b/build/src/test/java/org/aspectj/internal/build/BuildClasspathTest.java
@@ -40,26 +40,26 @@ public class BuildClasspathTest extends TestCase {
             fail("expected \"" + name + "\" got \"" + kind + "\"");
         }
     }
-    public void testClasspath() {
-        Messager handler = new Messager();
-        File baseDir = new File("..");
-        File jarDir = new File("../aj-build/jars");
-        Modules modules = new Modules(baseDir, jarDir, handler);
-        Module module = modules.getModule("ajbrowser");
-        Kind kind = Result.kind(Result.NORMAL, !Result.ASSEMBLE);
-        Result result = module.getResult(kind);
-        print(result);
-    }
-    public void testBuildClasspath() {
-        Messager handler = new Messager();
-        File baseDir = new File("..");
-        File jarDir = new File("../aj-build/jars");
-        Modules modules = new Modules(baseDir, jarDir, handler);
-        Module module = modules.getModule("build");
-        Kind kind = Result.kind(Result.NORMAL, !Result.ASSEMBLE);
-        Result result = module.getResult(kind);
-        print(result);
-    }
+//    public void testClasspath() {
+//        Messager handler = new Messager();
+//        File baseDir = new File("..");
+//        File jarDir = new File("../aj-build/jars");
+//        Modules modules = new Modules(baseDir, jarDir, handler);
+//        Module module = modules.getModule("ajbrowser");
+//        Kind kind = Result.kind(Result.NORMAL, !Result.ASSEMBLE);
+//        Result result = module.getResult(kind);
+//        print(result);
+//    }
+//    public void testBuildClasspath() {
+//        Messager handler = new Messager();
+//        File baseDir = new File("..");
+//        File jarDir = new File("../aj-build/jars");
+//        Modules modules = new Modules(baseDir, jarDir, handler);
+//        Module module = modules.getModule("build");
+//        Kind kind = Result.kind(Result.NORMAL, !Result.ASSEMBLE);
+//        Result result = module.getResult(kind);
+//        print(result);
+//    }
     private void print(Result result) {
         System.out.println(result + " libjars" + result.getLibJars());
         System.out.println(result + " required" + result.getRequired());
diff --git a/docs/src/main/resources/local.properties b/docs/src/main/resources/local.properties
new file mode 100644
index 000000000..a3cd6d2fe
--- /dev/null
+++ b/docs/src/main/resources/local.properties
@@ -0,0 +1,12 @@
+# for non-release builds, versions should all be DEVELOPMENT
+# except for build.version.base
+build.version=${project.version}
+build.version.base=1.5
+build.version.long=${project.version}
+build.version.short=${project.version}
+# Repo version is for maven (as built with 'ant repo')
+repo.version=1.6.4
+java11.home=c:/home/apps/jdk11
+java13.home=c:/home/apps/jdk13
+java14.home=c:/home/apps/jdk14
+java15.home=c:/home/apps/jdk15
diff --git a/pom.xml b/pom.xml
index 00b39a56e..552637c10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
 		<module>org.aspectj.matcher</module>
 		<module>asm</module>
 		<module>testing-client</module>
+		<module>ajbrowser</module>
 		<module>runtime</module>
 		<module>bcel-builder</module>
 		<module>weaver</module>
@@ -63,7 +64,9 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<configuration>
+<!--
 						<testFailureIgnore>true</testFailureIgnore>
+-->
 						<excludes>
 							<exclude>**/*ModuleTests.java</exclude>
 						</excludes>
diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
index a152d8cc9..88a754d67 100644
--- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
+++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
@@ -74,8 +74,10 @@ public final class TestUtil {
 	private static File ASPECTJRT_PATH;
 	static {
 		{
-			String[] paths = { "sp:aspectjrt.path", "sp:aspectjrt.jar", "../lib/test/aspectjrt.jar",
-					"../aj-build/jars/aspectj5rt-all.jar", "../aj-build/jars/runtime.jar", "../runtime/bin" };
+			String[] paths = { "sp:aspectjrt.path", "sp:aspectjrt.jar", "../runtime/target/classes"
+//					"../lib/test/aspectjrt.jar",
+//					"../aj-build/jars/aspectj5rt-all.jar", "../aj-build/jars/runtime.jar", "../runtime/bin"
+					};
 			ASPECTJRT_PATH = FileUtil.getBestFile(paths);
 		}
 		{
-- 
2.39.5