JAMES-2486 Update com.thoughtworks.qdox:qdox
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0c641e74 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0c641e74 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0c641e74 Branch: refs/heads/master Commit: 0c641e74d8f207b331279e5dfbbd75475d28c376 Parents: 6e1bbee Author: Gautier DI FOLCO <[email protected]> Authored: Tue Jul 17 16:38:31 2018 +0200 Committer: benwa <[email protected]> Committed: Tue Jul 31 09:25:23 2018 +0700 ---------------------------------------------------------------------- .../mailet/DefaultDescriptorsExtractor.java | 22 ++++++++++---------- pom.xml | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0c641e74/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java index 3ffe793..f43ae24 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java @@ -25,11 +25,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Collections; +import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Set; -import java.util.stream.Stream; import org.apache.james.mailet.MailetMatcherDescriptor.Type; import org.apache.mailet.Experimental; @@ -40,7 +39,8 @@ import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; -import com.thoughtworks.qdox.JavaDocBuilder; +import com.thoughtworks.qdox.JavaProjectBuilder; +import com.thoughtworks.qdox.model.JavaAnnotation; import com.thoughtworks.qdox.model.JavaClass; /** @@ -67,7 +67,7 @@ public class DefaultDescriptorsExtractor { } public DefaultDescriptorsExtractor extract(MavenProject project, Log log) { - final JavaClass[] classes = javaClasses(project); + final Collection<JavaClass> classes = javaClasses(project); final URLClassLoader classLoader = classLoader(project, log); logProjectDependencies(project, log); @@ -182,8 +182,9 @@ public class DefaultDescriptorsExtractor { private boolean isExperimental(JavaClass javaClass) { - return Stream.of(javaClass.getAnnotations()) - .anyMatch(annotation -> annotation.getType().getValue() + return javaClass.getAnnotations() + .stream() + .anyMatch((JavaAnnotation annotation) -> annotation.getType().getCanonicalName() .equals(Experimental.class.getName())); } @@ -252,8 +253,8 @@ public class DefaultDescriptorsExtractor { @SuppressWarnings("unchecked") - private JavaClass[] javaClasses(MavenProject project) { - JavaDocBuilder builder = new JavaDocBuilder(); + private Collection<JavaClass> javaClasses(MavenProject project) { + JavaProjectBuilder builder = new JavaProjectBuilder(); for (String s : (Iterable<String>) project.getCompileSourceRoots()) { builder.addSourceTree(new File(s)); } @@ -286,9 +287,8 @@ public class DefaultDescriptorsExtractor { private List<JavaClass> getAllInterfacesQdox(JavaClass javaClass) { List<JavaClass> res = new LinkedList<>(); - if (javaClass.getImplementedInterfaces() != null) { - JavaClass[] interfaces = javaClass.getImplementedInterfaces(); - Collections.addAll(res, interfaces); + if (javaClass.getInterfaces() != null) { + res.addAll(javaClass.getInterfaces()); } if (javaClass.getSuperJavaClass() != null) { res.addAll(getAllInterfacesQdox(javaClass.getSuperJavaClass())); http://git-wip-us.apache.org/repos/asf/james-project/blob/0c641e74/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 90f543c..1ba0db8 100644 --- a/pom.xml +++ b/pom.xml @@ -650,7 +650,8 @@ <maven-plugin-api.version>3.2.5</maven-plugin-api.version> <maven-reporting-impl.version>2.2</maven-reporting-impl.version> <maven-reporting-api.version>3.0</maven-reporting-api.version> - <qdox.version>1.12.1</qdox.version> + <qdox.version>2.0-M9</qdox.version> + <ical4j.version>2.0.2</ical4j.version> <guavate.version>1.0.0</guavate.version> <javax.activation.groupId>javax.activation</javax.activation.groupId> <javax.activation.artifactId>activation</javax.activation.artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
