[maven-javadoc-plugin] 01/01: Merge modifications done during partial git migration

[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>.