diff options
| author | Andy Clement <aclement@pivotal.io> | 2019-04-03 10:23:44 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2019-04-03 10:23:44 -0700 |
| commit | 0e2c95a36900fe913f5d768e7f4632034ddf005b (patch) | |
| tree | f7f1bb92dfbae87de0a8998491e863490984aa0a /org.aspectj.ajdt.core | |
| parent | dbb2c59fcfa6837f1fde9e0c1f0d04751c9268ee (diff) | |
| download | aspectj-0e2c95a36900fe913f5d768e7f4632034ddf005b.tar.gz aspectj-0e2c95a36900fe913f5d768e7f4632034ddf005b.zip | |
Updated with Java12 support
Diffstat (limited to 'org.aspectj.ajdt.core')
3 files changed, 4 insertions, 5 deletions
diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties index e9f6b6d65..b6de28ebb 100644 --- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties +++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties @@ -5,7 +5,7 @@ org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. ### AspectJ-specific messages compiler.name = AspectJ Compiler -compiler.version = Eclipse Compiler #6373b82afa49b(1-Oct-2018), 3.16 +compiler.version = Eclipse Compiler #a9ab0710a01b2b(28-Mar-2019), 3.18 compiler.copyright = diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java index a60c9d9f7..776bf1bc2 100644 --- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java @@ -57,18 +57,17 @@ public class AjBuildManagerTest extends TestCase { super(name); } - public void testSimpleStructure() throws IOException /* , CoreException */{ + public void testSimpleStructure() throws IOException { AjBuildManager manager = new AjBuildManager(messageWriter); BuildArgParser parser = new BuildArgParser(messageWriter); String javaClassPath = System.getProperty("java.class.path"); - System.out.println(javaClassPath); String sandboxName = TestUtil.createEmptySandbox().getAbsolutePath(); AjBuildConfig buildConfig = parser.genBuildConfig(new String[] { "-d", sandboxName, "-1.4", "-classpath", javaClassPath, Constants.TESTDATA_PATH + "/src1/A.java", // EajcModuleTests.TESTDATA_PATH + "/src1/Hello.java", }); String err = parser.getOtherMessages(true); - assertTrue(err, null == err); + assertTrue(err, null == err || err.startsWith("incorrect classpath") && err.endsWith("run-all-junit-tests/target/classes")); // manager.setStructureModel(AsmManager.getDefault().getHierarchy()); MessageHandler handler = new MessageHandler(); manager.batchBuild(buildConfig, handler); diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java index c8b61bd49..8d15cdf8f 100644 --- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java @@ -687,7 +687,7 @@ public abstract class AjcTestCase extends TestCase { e.printStackTrace(); } return lastRunResult; - } else if (vmargs!=null && (vmargs.contains("--add-modules") || vmargs.contains("--limit-modules") || vmargs.contains("--add-reads"))) { + } else if (vmargs!=null && (vmargs.contains("--enable-preview") || vmargs.contains("--add-modules") || vmargs.contains("--limit-modules") || vmargs.contains("--add-reads"))) { // If --add-modules supplied, need to fork the test try { // if (mp.indexOf("$runtime") != -1) { |