diff options
4 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9aae7dbf9..ab26f1db3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -14,13 +14,16 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - java: [ 1.8, 11 ] + java: [ 8, 9, 10, 11, 12, 13, 14 ] steps: - uses: actions/checkout@v2 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} + - run: java -version + - run: mvn --version - name: Build with Maven run: mvn -Dorg.aspectj.tools.ajc.Ajc.verbose=false -B package --file pom.xml diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/JavadocRunner.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/JavadocRunner.java index ed13fabe4..adf22bf12 100644 --- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/JavadocRunner.java +++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/JavadocRunner.java @@ -14,8 +14,6 @@ package org.aspectj.tools.ajdoc; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.List; import java.util.Vector; diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java index cd5590914..125a9e95c 100644 --- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java +++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java @@ -54,7 +54,7 @@ public class JRockitAgentTest extends TestCase { } public void testJrockitRecursionProtection() { - if (LangUtil.is11VMOrGreater()) { + if (LangUtil.is19VMOrGreater()) { // Skip test, not castable to URLClassLoader return; } diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java index 92aaec667..5af201700 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java @@ -834,13 +834,13 @@ public class JavaRun implements IAjcRun { throw new ExitCalledException(exitCode); } } - @Override + public void checkAwtEventQueueAccess() { if ((null != runThread) && runThread.equals(Thread.currentThread())) { throw new AwtUsedException(); } } - @Override + public void checkSystemClipboardAccess() { // permit } @@ -885,7 +885,7 @@ public class JavaRun implements IAjcRun { @Override public void checkListen(int arg0) { } - @Override + public void checkMemberAccess(Class arg0, int arg1) { } @Override @@ -930,7 +930,7 @@ public class JavaRun implements IAjcRun { @Override public void checkSetFactory() { } - @Override + public boolean checkTopLevelWindow(Object arg0) { return true; } |