You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/30 00:26:48 UTC
[maven-javadoc-plugin] branch master updated (ff9aee5 -> beb6dd9)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
from ff9aee5 [MJAVADOC-508] add it test and fix bloody checkstyle :-)
add 95463dc Switch from List to Collection to make it easier to use Sets when preferred
add e1aedb7 Group sets of sourcepaths per project, in prepare of usage of module-source-path.
add 74170db Add project/artifact key to set of sourcePaths to recognize reactor projects versus dependencies
add 6719499 session is required parameter, so cannot be null. Fix related unittests
add ce99130 MJAVADOC-502 Update DEFAULT_JAVA_API_LINKS
add 7ab4eb5 unittest should prefer JAVA_HOME when executing from cmdline When running with Java9+ no need to switch from jre to jdk directory (jep220)
add e071bd5 Improve TestJavadocReportTest#testTestJavadoc J8 warns and continues with missing dependency, J9 fails. In fact test was wrong: dependency should have been on classpath
add 5f21bae Upgrade mockito to remove warning about illegal reflective access
add 57a5539 JDK-8032205 was closed as not an issue, so not solved in Java9. Need to review the conclusion
add 920ec58 Skip several unittests for Java9
add 8023d89 [MJAVADOC-498] "module not found" when Java 9 module-info present Support aggrated javadoc
add 36b16ca [maven-release-plugin] prepare release maven-javadoc-plugin-3.0.0
add 9232f9c [maven-release-plugin] prepare for next development iteration
new beb6dd9 Merge modifications done during partial git migration
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../bar/pom.xml | 0
.../bar/src/main/java/com/bar/OtherClass.java | 0
.../bar/src/main/java/module-info.java | 3 +
.../baz}/pom.xml | 30 ++-
.../baz/src/main/java/com/baz/LonelyClass.java} | 6 +-
.../baz}/src/main/java/module-info.java | 7 +-
.../foo/pom.xml | 0
.../foo}/src/main/java/com/foo/MyClass.java | 0
.../foo/src/main/java/module-info.java | 0
.../invoker.properties | 0
.../pom.xml | 1 +
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 257 ++++++++++++++-------
.../maven/plugins/javadoc/JavadocReport.java | 5 +-
.../apache/maven/plugins/javadoc/JavadocUtil.java | 36 +--
.../plugins/javadoc/resolver/ResourceResolver.java | 102 ++++----
...pi-package-list-1.8 => java-api-package-list-9} | 106 ++++++++-
.../javadoc/AggregatorJavadocReportTest.java | 16 +-
.../maven/plugins/javadoc/FixJavadocMojoTest.java | 7 +
.../maven/plugins/javadoc/JavadocJarTest.java | 21 +-
.../maven/plugins/javadoc/JavadocReportTest.java | 27 ++-
.../maven/plugins/javadoc/JavadocUtilTest.java | 8 +-
.../plugins/javadoc/TestJavadocReportTest.java | 12 +-
...egateResourcesProject1TestMavenProjectStub.java | 5 +-
...egateResourcesProject2TestMavenProjectStub.java | 5 +-
.../javadoc/stubs/TestJavadocMavenProjectStub.java | 17 +-
26 files changed, 493 insertions(+), 180 deletions(-)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-498_aggr_modulepath}/bar/pom.xml (100%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-498_aggr_modulepath}/bar/src/main/java/com/bar/OtherClass.java (100%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-498_aggr_modulepath}/bar/src/main/java/module-info.java (94%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/bar => MJAVADOC-498_aggr_modulepath/baz}/pom.xml (61%)
copy src/it/projects/{MJAVADOC-498_modulepath/src/main/java/com/foo/MyClass.java => MJAVADOC-498_aggr_modulepath/baz/src/main/java/com/baz/LonelyClass.java} (91%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo => MJAVADOC-498_aggr_modulepath/baz}/src/main/java/module-info.java (90%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-498_aggr_modulepath}/foo/pom.xml (100%)
copy src/it/projects/{MJAVADOC-498_modulepath => MJAVADOC-498_aggr_modulepath/foo}/src/main/java/com/foo/MyClass.java (100%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-498_aggr_modulepath}/foo/src/main/java/module-info.java (100%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-498_aggr_modulepath}/invoker.properties (100%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-498_aggr_modulepath}/pom.xml (98%)
copy src/main/resources/org/apache/maven/plugins/javadoc/{java-api-package-list-1.8 => java-api-package-list-9} (66%)
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].
[maven-javadoc-plugin] 01/01: Merge modifications done during
partial git migration
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit beb6dd9b2178baadce4c27ea4f509807a070faa7
Merge: ff9aee5 9232f9c
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Dec 30 00:59:16 2017 +0100
Merge modifications done during partial git migration
Conflicts:
src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
pom.xml | 2 +-
.../MJAVADOC-498_aggr_modulepath/bar/pom.xml | 41 +++
.../bar/src/main/java/com/bar/OtherClass.java | 25 ++
.../bar/src/main/java/module-info.java | 25 ++
.../MJAVADOC-498_aggr_modulepath/baz/pom.xml | 61 ++++
.../baz/src/main/java/com/baz/LonelyClass.java | 25 ++
.../baz/src/main/java/module-info.java | 25 ++
.../MJAVADOC-498_aggr_modulepath/foo/pom.xml | 32 +++
.../foo/src/main/java/com/foo/MyClass.java | 25 ++
.../foo/src/main/java/module-info.java | 22 ++
.../invoker.properties | 18 ++
.../projects/MJAVADOC-498_aggr_modulepath/pom.xml | 68 +++++
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 257 +++++++++++------
.../maven/plugins/javadoc/JavadocReport.java | 5 +-
.../apache/maven/plugins/javadoc/JavadocUtil.java | 36 ++-
.../plugins/javadoc/resolver/ResourceResolver.java | 102 ++++---
.../maven/plugins/javadoc/java-api-package-list-9 | 315 +++++++++++++++++++++
.../javadoc/AggregatorJavadocReportTest.java | 16 +-
.../maven/plugins/javadoc/FixJavadocMojoTest.java | 7 +
.../maven/plugins/javadoc/JavadocJarTest.java | 21 +-
.../maven/plugins/javadoc/JavadocReportTest.java | 27 +-
.../maven/plugins/javadoc/JavadocUtilTest.java | 8 +-
.../plugins/javadoc/TestJavadocReportTest.java | 12 +-
...egateResourcesProject1TestMavenProjectStub.java | 5 +-
...egateResourcesProject2TestMavenProjectStub.java | 5 +-
.../javadoc/stubs/TestJavadocMavenProjectStub.java | 17 +-
26 files changed, 1036 insertions(+), 166 deletions(-)
diff --cc src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 9897f83,91abfad..afe3654
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@@ -96,44 -137,6 +97,46 @@@ import org.codehaus.plexus.util.cli.Com
import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
++import java.nio.file.Files;
++import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
++import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.apache.maven.plugins.javadoc.JavadocUtil.toRelative;
+import static org.apache.maven.plugins.javadoc.JavadocUtil.toList;
+import static org.apache.maven.plugins.javadoc.JavadocUtil.isEmpty;
+import static org.apache.maven.plugins.javadoc.JavadocUtil.isNotEmpty;
- import static org.codehaus.plexus.util.IOUtil.close;
+
/**
* Base class with majority of Javadoc functionalities.
*
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.