diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index fba6ea99..d6fbcd5f 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -6067,9 +6067,11 @@ private URL getResource( final List classPath, final String resource ) } } URL resourceURL = null; - try ( URLClassLoader javadocClassLoader = new URLClassLoader( urls.toArray( new URL[urls.size()] ), null ) ) { + try ( URLClassLoader javadocClassLoader = new URLClassLoader( urls.toArray( new URL[urls.size()] ), null ) ) + { resourceURL = javadocClassLoader.getResource( resource ); - } catch ( IOException e ) { + } catch ( IOException e ) + { // ignore } return resourceURL; diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java index 5f4d2e1c..f9a4982d 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java @@ -275,7 +275,9 @@ protected static String quotedPathArgument( String value ) } pathBuilder.append( '\'' ); path = pathBuilder.toString(); - } else { + } + else + { path = "'" + path + "'"; } } @@ -534,7 +536,8 @@ else if ( StringUtils.isNotEmpty( out.getOutput() ) ) throw new IllegalArgumentException( "No output found from the command line 'javadoc -J-version'" ); } - private static final Pattern EXTRACT_JAVADOC_VERSION_PATTERN = Pattern.compile( "(?s).*?[^a-zA-Z](([0-9]+\\.?[0-9]*)(\\.[0-9]+)?).*" ); + private static final Pattern EXTRACT_JAVADOC_VERSION_PATTERN = + Pattern.compile( "(?s).*?[^a-zA-Z](([0-9]+\\.?[0-9]*)(\\.[0-9]+)?).*" ); /** * Parse the output for 'javadoc -J-version' and return the javadoc version recognized.
@@ -596,15 +599,20 @@ protected static String extractJavadocVersion( String output ) return matcher.group( 1 ); } - private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_0 = Pattern.compile( "^\\s*(\\d+)\\s*?\\s*$" ); + private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_0 = + Pattern.compile( "^\\s*(\\d+)\\s*?\\s*$" ); - private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_1 = Pattern.compile( "^\\s*(\\d+)\\s*k(b)?\\s*$", Pattern.CASE_INSENSITIVE ); + private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_1 = + Pattern.compile( "^\\s*(\\d+)\\s*k(b)?\\s*$", Pattern.CASE_INSENSITIVE ); - private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_2 = Pattern.compile( "^\\s*(\\d+)\\s*m(b)?\\s*$", Pattern.CASE_INSENSITIVE ); + private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_2 = + Pattern.compile( "^\\s*(\\d+)\\s*m(b)?\\s*$", Pattern.CASE_INSENSITIVE ); - private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_3 = Pattern.compile( "^\\s*(\\d+)\\s*g(b)?\\s*$", Pattern.CASE_INSENSITIVE ); + private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_3 = + Pattern.compile( "^\\s*(\\d+)\\s*g(b)?\\s*$", Pattern.CASE_INSENSITIVE ); - private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_4 = Pattern.compile( "^\\s*(\\d+)\\s*t(b)?\\s*$", Pattern.CASE_INSENSITIVE ); + private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_4 = + Pattern.compile( "^\\s*(\\d+)\\s*t(b)?\\s*$", Pattern.CASE_INSENSITIVE ); /** * Parse a memory string which be used in the JVM arguments -Xms or -Xmx.