From: Lars Grefer <eclipse@larsgrefer.de>
Date: Thu, 13 Aug 2020 22:28:34 +0000 (+0200)
Subject: Merge branch 'feature/simplify-ajdoc' of github.com:larsgrefer/org.aspectj into featu... 
X-Git-Tag: V1_9_7M1~22^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=26d18421daf10c69858b8a5745d9d7473fac9981;p=aspectj.git

Merge branch 'feature/simplify-ajdoc' of github.com:larsgrefer/org.aspectj into feature/github-actions

Signed-off-by: Lars Grefer <eclipse@larsgrefer.de>
---

26d18421daf10c69858b8a5745d9d7473fac9981
diff --cc .github/workflows/maven.yml
index 1e09e7ae5,9aae7dbf9..ab26f1db3
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@@ -23,7 -22,5 +23,7 @@@ jobs
        uses: actions/setup-java@v1
        with:
          java-version: ${{ matrix.java }}
 +    - run: java -version
 +    - run: mvn --version
      - name: Build with Maven
-       run: mvn -B package --file pom.xml
+       run: mvn -Dorg.aspectj.tools.ajc.Ajc.verbose=false -B package --file pom.xml
diff --cc ajdoc/src/main/java/org/aspectj/tools/ajdoc/JavadocRunner.java
index 20ec37f2f,ed13fabe4..adf22bf12
--- 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,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;