[3/3] maven-surefire git commit: [SUREFIRE-1262] Add modulepath support
[SUREFIRE-1262] Add modulepath support Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/b436a15e Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b436a15e Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b436a15e Branch: refs/heads/SUREFIRE-1262_3 Commit: b436a15ece40ae4f3eec7612ffbd665ec70200fb Parents: 660a4cf Author: Tibor17Authored: Fri Nov 17 15:09:52 2017 +0100 Committer: Tibor17 Committed: Sat Nov 18 01:16:38 2017 +0100 -- maven-surefire-common/pom.xml | 27 +- .../plugin/surefire/AbstractSurefireMojo.java | 271 ++-- .../surefire/InPluginVMSurefireStarter.java | 5 +- .../AbstractClasspathForkConfiguration.java | 73 +++ .../surefire/booterclient/BooterSerializer.java | 94 +-- .../ClasspathForkConfiguration.java | 59 ++ .../booterclient/DefaultForkConfiguration.java | 344 ++ .../booterclient/ForkConfiguration.java | 367 +-- .../surefire/booterclient/ForkStarter.java | 27 +- .../JarManifestForkConfiguration.java | 139 .../ModularClasspathForkConfiguration.java | 230 +++ .../plugin/surefire/booterclient/Platform.java | 29 +- .../maven/plugin/surefire/util/Relocator.java | 39 +- .../surefire/providerapi/ServiceLoader.java | 2 +- .../surefire/AbstractSurefireMojoTest.java | 641 ++- ...terDeserializerStartupConfigurationTest.java | 8 +- .../booterclient/ForkConfigurationTest.java | 52 +- .../maven/surefire/util/RelocatorTest.java | 6 +- .../plugin/surefire/SurefirePluginTest.java | 3 +- pom.xml | 65 +- .../maven/surefire/util/DefaultScanResult.java | 24 +- .../maven/surefire/util/ScanResultTest.java | 8 +- .../booter/AbstractPathConfiguration.java | 115 .../apache/maven/surefire/booter/Classpath.java | 19 +- .../surefire/booter/ClasspathConfiguration.java | 73 +-- .../maven/surefire/booter/ForkedBooter.java | 22 +- .../maven/surefire/booter/ModularClasspath.java | 70 ++ .../booter/ModularClasspathConfiguration.java | 62 ++ .../surefire/booter/StartupConfiguration.java | 28 +- .../maven/surefire/booter/SystemUtilsTest.java | 5 +- .../apache/maven/surefire/its/ModulePathIT.java | 45 ++ .../src/test/resources/modulepath/pom.xml | 45 ++ .../modulepath/src/main/java/com/app/Main.java | 34 + .../modulepath/src/main/java/module-info.java | 21 + .../src/test/java/com/app/AppTest.java | 36 ++ 35 files changed, 2438 insertions(+), 650 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b436a15e/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 1bcd7c5..7e063c8 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -97,25 +97,36 @@ org.apache.maven.shared maven-common-artifact-filters - 1.3 - - - org.apache.maven.shared - maven-plugin-testing-harness - - org.fusesource.jansi jansi - 1.13 provided + org.codehaus.plexus + plexus-java + + org.mockito mockito-core test + + org.powermock + powermock-core + test + + + org.powermock + powermock-module-junit4 + test + + + org.powermock + powermock-api-mockito2 + test + http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b436a15e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java index 7aa1e37..16b59ca 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java @@ -24,6 +24,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import
[1/3] maven-surefire git commit: [SUREFIRE-1262] Add modulepath support [Forced Update!]
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1262_3 0e41142bf -> b436a15ec (forced update) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b436a15e/surefire-integration-tests/src/test/resources/modulepath/src/main/java/com/app/Main.java -- diff --git a/surefire-integration-tests/src/test/resources/modulepath/src/main/java/com/app/Main.java b/surefire-integration-tests/src/test/resources/modulepath/src/main/java/com/app/Main.java new file mode 100644 index 000..6a44492 --- /dev/null +++ b/surefire-integration-tests/src/test/resources/modulepath/src/main/java/com/app/Main.java @@ -0,0 +1,34 @@ +package com.app; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.joda.time.DateTime; + +public class Main +{ +public static void main( String... args ) +{ +System.out.println( "module path => " + System.getProperty( "jdk.module.path" ) ); +System.out.println( " class path => " + System.getProperty( "java.class.path" ) ); + +DateTime dt = new DateTime(); +System.out.println( dt ); +} +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b436a15e/surefire-integration-tests/src/test/resources/modulepath/src/main/java/module-info.java -- diff --git a/surefire-integration-tests/src/test/resources/modulepath/src/main/java/module-info.java b/surefire-integration-tests/src/test/resources/modulepath/src/main/java/module-info.java new file mode 100644 index 000..5f3eed4 --- /dev/null +++ b/surefire-integration-tests/src/test/resources/modulepath/src/main/java/module-info.java @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +module com.app { +requires joda.time; +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b436a15e/surefire-integration-tests/src/test/resources/modulepath/src/test/java/com/app/AppTest.java -- diff --git a/surefire-integration-tests/src/test/resources/modulepath/src/test/java/com/app/AppTest.java b/surefire-integration-tests/src/test/resources/modulepath/src/test/java/com/app/AppTest.java new file mode 100644 index 000..aa836a4 --- /dev/null +++ b/surefire-integration-tests/src/test/resources/modulepath/src/test/java/com/app/AppTest.java @@ -0,0 +1,36 @@ +package com.app; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.testng.annotations.Test; + +@Test +public class AppTest +{ +public void testNoop() +throws Exception +
[2/3] maven-surefire git commit: [SUREFIRE-1262] Add modulepath support
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b436a15e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java new file mode 100644 index 000..2b47c03 --- /dev/null +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java @@ -0,0 +1,230 @@ +package org.apache.maven.plugin.surefire.booterclient; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.plugin.surefire.booterclient.lazytestprovider.OutputStreamFlushableCommandline; +import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; +import org.apache.maven.surefire.booter.AbstractPathConfiguration; +import org.apache.maven.surefire.booter.Classpath; +import org.apache.maven.surefire.booter.ModularClasspath; +import org.apache.maven.surefire.booter.ModularClasspathConfiguration; +import org.apache.maven.surefire.booter.StartupConfiguration; +import org.apache.maven.surefire.booter.SurefireBooterForkException; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ModuleVisitor; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import static java.io.File.createTempFile; +import static java.io.File.pathSeparatorChar; +import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; +import static org.objectweb.asm.Opcodes.ASM6; + +/** + * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17) + * @since 2.21.0.Jigsaw + */ +public class ModularClasspathForkConfiguration +extends DefaultForkConfiguration +{ +@SuppressWarnings( "checkstyle:parameternumber" ) +public ModularClasspathForkConfiguration( @Nonnull Classpath bootClasspath, + @Nonnull File tempDirectory, + @Nullable String debugLine, + @Nonnull File workingDirectory, + @Nonnull Properties modelProperties, + @Nullable String argLine, + @Nonnull MapenvironmentVariables, + boolean debug, + int forkCount, + boolean reuseForks, + @Nonnull Platform pluginPlatform, + @Nonnull ConsoleLogger log ) +{ +super( bootClasspath, tempDirectory, debugLine, workingDirectory, modelProperties, argLine, +environmentVariables, debug, forkCount, reuseForks, pluginPlatform, log ); +} + +@Override +protected void resolveClasspath( OutputStreamFlushableCommandline cli, String startClass, + StartupConfiguration config ) +throws SurefireBooterForkException +{ +try +{ +AbstractPathConfiguration pathConfig = config.getClasspathConfiguration(); + +ModularClasspathConfiguration modularClasspathConfiguration = +pathConfig.toRealPath( ModularClasspathConfiguration.class ); + +ModularClasspath modularClasspath = modularClasspathConfiguration.getModularClasspath(); + +File descriptor = modularClasspath.getModuleDescriptor(); +List modulePath = modularClasspath.getModulePath(); +
svn commit: r1021042 - /websites/production/maven/components/plugins/maven-jdeprscan-plugin/download.html
Author: hboutemy Date: Sat Nov 18 00:12:16 2017 New Revision: 1021042 Log: added download.html Added: websites/production/maven/components/plugins/maven-jdeprscan-plugin/download.html Added: websites/production/maven/components/plugins/maven-jdeprscan-plugin/download.html == --- websites/production/maven/components/plugins/maven-jdeprscan-plugin/download.html (added) +++ websites/production/maven/components/plugins/maven-jdeprscan-plugin/download.html Sat Nov 18 00:12:16 2017 @@ -0,0 +1,475 @@ + + +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + + + + + +Apache Maven JDeprScan Plugin Download Apache Maven JDeprScan Plugin Source + + + + + + + body{background-image: url('./images/profiles/pre-release.png');} + + + + + + +https://www.google-analytics.com/urchin.js" type="text/javascript"> + + +_uacct = "UA-140879-1"; +urchinTracker(); + + + + + + + + + + +http://www.apache.org/; id="bannerLeft"> + + + + + + + + + + + + + + + +http://www.apache.org/; class="externalLink" title="Apache"> +Apache +/ + + + +Maven +/ + + + +Plugins +/ + + + +Apache Maven JDeprScan Plugin +/ + +Download Apache Maven JDeprScan Plugin Source + + + + | Last Published: 2017-11-12 + +Version: 3.0.0-alpha-1 + + + + + + + + + + + + +Overview + + + + + +Introduction + + + + + + +Goals + + + + + + +Usage + + + + + http://www.apache.org/licenses/; class="externalLink" title="License"> + +License + + + + +Download + + Project Documentation + + + + + +Project Information + + + + + + +Project Reports + + Maven Projects + + + + + +Ant Tasks + + + + + + +Archetype + + + + + + +Doxia + + + + + + +JXR + + + + + + +Maven + + + + + + +Parent POMs + + + + + + +Plugins + + + + + + +Plugin Testing + + + + + + +Plugin Tools + + + + + + +Resource Bundles + + + + + + +SCM + + + + + + +
svn commit: r1815639 - in /maven/plugins/trunk/maven-jmod-plugin/src/site/xdoc: ./ download.xml.vm
Author: hboutemy Date: Fri Nov 17 23:48:35 2017 New Revision: 1815639 URL: http://svn.apache.org/viewvc?rev=1815639=rev Log: added classical download.xml.vm Added: maven/plugins/trunk/maven-jmod-plugin/src/site/xdoc/ maven/plugins/trunk/maven-jmod-plugin/src/site/xdoc/download.xml.vm Added: maven/plugins/trunk/maven-jmod-plugin/src/site/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jmod-plugin/src/site/xdoc/download.xml.vm?rev=1815639=auto == --- maven/plugins/trunk/maven-jmod-plugin/src/site/xdoc/download.xml.vm (added) +++ maven/plugins/trunk/maven-jmod-plugin/src/site/xdoc/download.xml.vm Fri Nov 17 23:48:35 2017 @@ -0,0 +1,126 @@ + + + + + + +Download ${project.name} Source + + + + + ${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build + ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository. + + You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24 + hours to reach all mirrors. + + In order to guard against corrupted downloads/installations, it is highly recommended to + http://www.apache.org/dev/release-signing#verifying-signature;>verify the signature + of the release bundles against the public http://www.apache.org/dist/maven/KEYS;>KEYS used by the Apache Maven + developers. + + ${project.name} is distributed under the http://www.apache.org/licenses/;>Apache License, version 2.0. + + We strongly encourage our users to configure a Maven repository mirror closer to their location, please read How to Use Mirrors for Repositories. + + + + + + [if-any logo] + + + + [end] + The currently selected mirror is + [preferred]. + If you encounter a problem with this mirror, + please select another mirror. + If all mirrors are failing, there are + backup + mirrors + (at the end of the mirrors list) that should be available. + + + + Other mirrors: + +[if-any http] +[for http] +[http] +[end] +[end] +[if-any ftp] +[for ftp] +[ftp] +[end] +[end] +[if-any backup] +[for backup] +[backup] (backup) +[end] +[end] + + + + + + You may also consult the + http://www.apache.org/mirrors/;>complete list of +mirrors. + + + + + + + This is the current stable version of ${project.name}. + + + + + +Link +Checksum +Signature + + + + +${project.name} ${project.version} (Source zip) +maven/plugins/${project.artifactId}-${project.version}-source-release.zip +http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5 +http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc + + + + + + + + Older non-recommended releases can be found on our http://archive.apache.org/dist/maven/plugins/;>archive site. + + + + + +
svn commit: r1815638 - in /maven/plugins/trunk/maven-jlink-plugin/src/site/xdoc: ./ download.xml.vm
Author: hboutemy Date: Fri Nov 17 23:48:04 2017 New Revision: 1815638 URL: http://svn.apache.org/viewvc?rev=1815638=rev Log: added classical download.xml.vm Added: maven/plugins/trunk/maven-jlink-plugin/src/site/xdoc/ maven/plugins/trunk/maven-jlink-plugin/src/site/xdoc/download.xml.vm Added: maven/plugins/trunk/maven-jlink-plugin/src/site/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/site/xdoc/download.xml.vm?rev=1815638=auto == --- maven/plugins/trunk/maven-jlink-plugin/src/site/xdoc/download.xml.vm (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/site/xdoc/download.xml.vm Fri Nov 17 23:48:04 2017 @@ -0,0 +1,126 @@ + + + + + + +Download ${project.name} Source + + + + + ${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build + ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository. + + You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24 + hours to reach all mirrors. + + In order to guard against corrupted downloads/installations, it is highly recommended to + http://www.apache.org/dev/release-signing#verifying-signature;>verify the signature + of the release bundles against the public http://www.apache.org/dist/maven/KEYS;>KEYS used by the Apache Maven + developers. + + ${project.name} is distributed under the http://www.apache.org/licenses/;>Apache License, version 2.0. + + We strongly encourage our users to configure a Maven repository mirror closer to their location, please read How to Use Mirrors for Repositories. + + + + + + [if-any logo] + + + + [end] + The currently selected mirror is + [preferred]. + If you encounter a problem with this mirror, + please select another mirror. + If all mirrors are failing, there are + backup + mirrors + (at the end of the mirrors list) that should be available. + + + + Other mirrors: + +[if-any http] +[for http] +[http] +[end] +[end] +[if-any ftp] +[for ftp] +[ftp] +[end] +[end] +[if-any backup] +[for backup] +[backup] (backup) +[end] +[end] + + + + + + You may also consult the + http://www.apache.org/mirrors/;>complete list of +mirrors. + + + + + + + This is the current stable version of ${project.name}. + + + + + +Link +Checksum +Signature + + + + +${project.name} ${project.version} (Source zip) +maven/plugins/${project.artifactId}-${project.version}-source-release.zip +http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5 +http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc + + + + + + + + Older non-recommended releases can be found on our http://archive.apache.org/dist/maven/plugins/;>archive site. + + + + + +
svn commit: r1815637 - in /maven/plugins/trunk/maven-jdeprscan-plugin/src/site/xdoc: ./ download.xml.vm
Author: hboutemy Date: Fri Nov 17 23:47:16 2017 New Revision: 1815637 URL: http://svn.apache.org/viewvc?rev=1815637=rev Log: added classical download.xml.vm Added: maven/plugins/trunk/maven-jdeprscan-plugin/src/site/xdoc/ maven/plugins/trunk/maven-jdeprscan-plugin/src/site/xdoc/download.xml.vm Added: maven/plugins/trunk/maven-jdeprscan-plugin/src/site/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeprscan-plugin/src/site/xdoc/download.xml.vm?rev=1815637=auto == --- maven/plugins/trunk/maven-jdeprscan-plugin/src/site/xdoc/download.xml.vm (added) +++ maven/plugins/trunk/maven-jdeprscan-plugin/src/site/xdoc/download.xml.vm Fri Nov 17 23:47:16 2017 @@ -0,0 +1,126 @@ + + + + + + +Download ${project.name} Source + + + + + ${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build + ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository. + + You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24 + hours to reach all mirrors. + + In order to guard against corrupted downloads/installations, it is highly recommended to + http://www.apache.org/dev/release-signing#verifying-signature;>verify the signature + of the release bundles against the public http://www.apache.org/dist/maven/KEYS;>KEYS used by the Apache Maven + developers. + + ${project.name} is distributed under the http://www.apache.org/licenses/;>Apache License, version 2.0. + + We strongly encourage our users to configure a Maven repository mirror closer to their location, please read How to Use Mirrors for Repositories. + + + + + + [if-any logo] + + + + [end] + The currently selected mirror is + [preferred]. + If you encounter a problem with this mirror, + please select another mirror. + If all mirrors are failing, there are + backup + mirrors + (at the end of the mirrors list) that should be available. + + + + Other mirrors: + +[if-any http] +[for http] +[http] +[end] +[end] +[if-any ftp] +[for ftp] +[ftp] +[end] +[end] +[if-any backup] +[for backup] +[backup] (backup) +[end] +[end] + + + + + + You may also consult the + http://www.apache.org/mirrors/;>complete list of +mirrors. + + + + + + + This is the current stable version of ${project.name}. + + + + + +Link +Checksum +Signature + + + + +${project.name} ${project.version} (Source zip) +maven/plugins/${project.artifactId}-${project.version}-source-release.zip +http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5 +http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc + + + + + + + + Older non-recommended releases can be found on our http://archive.apache.org/dist/maven/plugins/;>archive site. + + + + + +
svn commit: r1021020 [11/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/javadoc-mojo.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/javadoc-mojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/javadoc-mojo.html Fri Nov 17 17:33:38 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven Javadoc Plugin javadoc:javadoc @@ -77,10 +77,10 @@ javadoc:javadoc - | Last Published: 2017-07-17 + | Last Published: 2017-11-17 | -Version: 3.0.0-M1 +Version: 3.0.0 @@ -459,7 +459,7 @@ Full name: -org.apache.maven.plugins:maven-javadoc-plugin:3.0.0-M1:javadoc +org.apache.maven.plugins:maven-javadoc-plugin:3.0.0:javadoc Description: @@ -475,8 +475,6 @@ Tool. Requires dependency resolution of artifacts in scope: compile. -The goal is thread-safe and supports parallel builds. - Since version: 2.0. Invokes the execution of the http://maven.apache.org/ref/current/maven-core/lifecycles.html;>lifecycle phase generate-sources prior to executing itself. @@ -509,7 +507,7 @@ Tool. Specifies the destination directory where javadoc saves the generated HTML files. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#d;>d. -Default value is: ${project.build.directory}/apidocs.User property is: destDir. +Default value is: ${project.build.directory}/apidocs.User property is: destDir.Alias is: destDir. @@ -521,7 +519,7 @@ See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp;>vmoptions. See http://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html;>Networking -Properties.User property is: additionalJOption. +Properties.User property is: additionalJOption. @@ -610,14 +608,15 @@ via the '-J' option to javadoc. Example: -additionalparam +additionalOptions -String +String[] -2.0 +3.0.0 -Deprecated. Does not properly support multiple options at once and has a bad -nameUser property is: additionalparam. +Set an additional option(s) on the command line. This value should +include quotes as necessary for parameters that include spaces. +Useful for a custom doclet. @@ -629,7 +628,7 @@ nameUser property is: a 2.9.1 To apply the security fix on generated javadoc see -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571Default value is: true.User property is: maven.javadoc.applyJavadocSecurityFix. +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571Default value is: true.User property is: maven.javadoc.applyJavadocSecurityFix. @@ -643,7 +642,7 @@ http://cve.mitre.org/cgi-bin/cvename.cgi Specifies whether or not the author text is included in the generated Javadocs. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#author;>author. -Default value is: true.User property is: author. +Default value is: true.User property is: author. @@ -659,7 +658,7 @@ See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#bootclasspath;>bootclasspath. -User property is: bootclasspath. +User property is: bootclasspath. @@ -688,7 +687,7 @@ Example: See Javadoc. -User property is: bootclasspathArtifacts. +User property is: bootclasspathArtifacts. @@ -707,7 +706,7 @@ eg. ![CDATA[Copyright 2005, href=http://www.mycompany.comMyCompany, Inc.a]] See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#bottom;>bottom. -Default value is: Copyright #169; {inceptionYear}#x2013;{currentYear} {organizationName}. All rights reserved..User property is: bottom. +Default value is: Copyright #169; {inceptionYear}#x2013;{currentYear} {organizationName}. All rights reserved..User property is: bottom. @@ -723,7 +722,7 @@ sentence. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#breakiterator;>breakiterator. Since http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/whatsnew-1.4.html#summary;>Java -1.4. Default value is: false.User property is: breakiterator. +1.4. Default value is: false.User property is: breakiterator. @@ -738,7 +737,7 @@ Since http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#charset;>charset. -User property is: charset. +User property is: charset.
svn commit: r1021020 [12/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/javadoc-no-fork-mojo.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/javadoc-no-fork-mojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/javadoc-no-fork-mojo.html Fri Nov 17 17:33:38 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven Javadoc Plugin javadoc:javadoc-no-fork @@ -77,10 +77,10 @@ javadoc:javadoc-no-fork - | Last Published: 2017-07-17 + | Last Published: 2017-11-17 | -Version: 3.0.0-M1 +Version: 3.0.0 @@ -459,7 +459,7 @@ Full name: -org.apache.maven.plugins:maven-javadoc-plugin:3.0.0-M1:javadoc-no-fork +org.apache.maven.plugins:maven-javadoc-plugin:3.0.0:javadoc-no-fork Description: @@ -477,8 +477,6 @@ site. Requires dependency resolution of artifacts in scope: compile. -The goal is thread-safe and supports parallel builds. - Since version: 2.10. @@ -509,7 +507,7 @@ site. Specifies the destination directory where javadoc saves the generated HTML files. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#d;>d. -Default value is: ${project.build.directory}/apidocs.User property is: destDir. +Default value is: ${project.build.directory}/apidocs.User property is: destDir.Alias is: destDir. @@ -521,7 +519,7 @@ See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp;>vmoptions. See http://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html;>Networking -Properties.User property is: additionalJOption. +Properties.User property is: additionalJOption. @@ -610,14 +608,15 @@ via the '-J' option to javadoc. Example: -additionalparam +additionalOptions -String +String[] -2.10 +3.0.0 -Deprecated. Does not properly support multiple options at once and has a bad -nameUser property is: additionalparam. +Set an additional option(s) on the command line. This value should +include quotes as necessary for parameters that include spaces. +Useful for a custom doclet. @@ -629,7 +628,7 @@ nameUser property is: a 2.9.1 To apply the security fix on generated javadoc see -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571Default value is: true.User property is: maven.javadoc.applyJavadocSecurityFix. +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571Default value is: true.User property is: maven.javadoc.applyJavadocSecurityFix. @@ -643,7 +642,7 @@ http://cve.mitre.org/cgi-bin/cvename.cgi Specifies whether or not the author text is included in the generated Javadocs. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#author;>author. -Default value is: true.User property is: author. +Default value is: true.User property is: author. @@ -659,7 +658,7 @@ See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#bootclasspath;>bootclasspath. -User property is: bootclasspath. +User property is: bootclasspath. @@ -688,7 +687,7 @@ Example: See Javadoc. -User property is: bootclasspathArtifacts. +User property is: bootclasspathArtifacts. @@ -707,7 +706,7 @@ eg. ![CDATA[Copyright 2005, href=http://www.mycompany.comMyCompany, Inc.a]] See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#bottom;>bottom. -Default value is: Copyright #169; {inceptionYear}#x2013;{currentYear} {organizationName}. All rights reserved..User property is: bottom. +Default value is: Copyright #169; {inceptionYear}#x2013;{currentYear} {organizationName}. All rights reserved..User property is: bottom. @@ -723,7 +722,7 @@ sentence. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#breakiterator;>breakiterator. Since http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/whatsnew-1.4.html#summary;>Java -1.4. Default value is: false.User property is: breakiterator. +1.4. Default value is: false.User property is: breakiterator. @@ -738,7 +737,7 @@ Since http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#charset;>charset. -User property is: charset. +User property is: charset. @@ -752,7 +751,7 @@ See @@ -788,7 +787,7 @@ in the output directory.
svn commit: r1021020 [20/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/AbstractJavadocMojoTest.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/AbstractJavadocMojoTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/AbstractJavadocMojoTest.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -Uses of Class org.apache.maven.plugins.javadoc.AbstractJavadocMojoTest (Apache Maven Javadoc Plugin 3.0.0-M1 Test API) +Uses of Class org.apache.maven.plugins.javadoc.AbstractJavadocMojoTest (Apache Maven Javadoc Plugin 3.0.0 Test API) Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/AggregatorJavadocReportTest.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/AggregatorJavadocReportTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/AggregatorJavadocReportTest.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -Uses of Class org.apache.maven.plugins.javadoc.AggregatorJavadocReportTest (Apache Maven Javadoc Plugin 3.0.0-M1 Test API) +Uses of Class org.apache.maven.plugins.javadoc.AggregatorJavadocReportTest (Apache Maven Javadoc Plugin 3.0.0 Test API) Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/FixJavadocMojoTest.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/FixJavadocMojoTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/FixJavadocMojoTest.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -Uses of Class org.apache.maven.plugins.javadoc.FixJavadocMojoTest (Apache Maven Javadoc Plugin 3.0.0-M1 Test API) +Uses of Class org.apache.maven.plugins.javadoc.FixJavadocMojoTest (Apache Maven Javadoc Plugin 3.0.0 Test API) Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/JavadocJarTest.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/JavadocJarTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/JavadocJarTest.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -Uses of Class org.apache.maven.plugins.javadoc.JavadocJarTest (Apache Maven Javadoc Plugin 3.0.0-M1 Test API) +Uses of Class org.apache.maven.plugins.javadoc.JavadocJarTest (Apache Maven Javadoc Plugin 3.0.0 Test API) @@ -211,7 +211,7 @@ extends AbstractJavadocMojo -buildJavadocOptions, canGenerateReport, configureDependencySourceResolution, execute, executeReport, failOnError, getAttachmentClassifier, getDependencyScopeFilter, getDependencySourcePaths, getDoclint, getDoctitle, getExecutionProjectSourceRoots, getFiles, getJavadocDirectory, getJavadocOptionsFile, getOutputDirectory, getOverview, getProject, getProjectBuildOutputDirs, getProjectSourceRoots, getSourcePaths, getWindowtitle, isTest, isValidJavadocLink, logError, resolveDependency +buildJavadocOptions, canGenerateReport, configureDependencySourceResolution, execute, executeReport, failOnError, getAttachmentClassifier, getDependencyScopeFilter, getDependencySourcePaths, getDoclint, getDoctitle, getExecutionProjectSourceRoots, getFiles, getJavadocDirectory, getJavadocOptionsFile, getOutputDirectory, getOverview, getProject, getProjectBuildOutputDirs, getProjectSourceRoots, getSourcePaths, getToolchain, getWindowtitle, isTest, isValidJavadocLink, logError, resolveDependency, verifyRemovedParameter Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJar.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJar.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJar.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -AggregatorTestJavadocJar (Apache Maven Javadoc Plugin 3.0.0-M1 API) +AggregatorTestJavadocJar (Apache Maven Javadoc Plugin 3.0.0 API) @@ -215,7 +215,7 @@ extends AbstractJavadocMojo -buildJavadocOptions, canGenerateReport, execute, executeReport, failOnError, getAttachmentClassifier, getDependencySourcePaths, getDoclint, getFiles, getJavadocOptionsFile, getProject, getSourcePaths, isValidJavadocLink, logError, resolveDependen cy +buildJavadocOptions, canGenerateReport, execute, executeReport, failOnError, getAttachmentClassifier, getDependencySourcePaths, getDoclint, getFiles, getJavadocOptionsFile, getProject, getSourcePaths, getToolchain, isValidJavadocLink, logError, resolveDependency, verifyRemovedParameter Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorTestJavadocReport.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorTestJavadocReport.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorTestJavadocReport.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -AggregatorTestJavadocReport (Apache Maven Javadoc Plugin 3.0.0-M1 API) +AggregatorTestJavadocReport (Apache Maven Javadoc Plugin 3.0.0 API) @@ -223,7 +223,7 @@ extends AbstractJavadocMojo -buildJavadocOptions, canGenerateReport, execute, failOnError,
svn commit: r1021020 [35/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.html Fri Nov 17 17:33:38 2017 @@ -99,58 +99,59 @@ 91 * {@inheritDoc} 92 * @see org.apache.maven.plugin.Mojo#execute() 93 */ -94 public void doExecute() -95 throws MojoExecutionException, MojoFailureException -96 { -97 try -98 { -99 buildJavadocOptions(); -100 } -101 catch ( IOException e ) -102 { -103 throw new MojoExecutionException( "Failed to generate javadoc-options file: " + e.getMessage(), e ); -104 } -105 -106 Archiver archiver; -107 try -108 { -109 archiver = archiverManager.getArchiver( "jar" ); -110 } -111 catch ( NoSuchArchiverException e ) -112 { -113 throw new MojoExecutionException( "Failed to retrieve jar archiver component from manager.", e ); -114 } -115 -116 File optionsFile = getJavadocOptionsFile(); -117 File bundleFile = -118 new File( getProject().getBuild().getDirectory(), finalName + "-" + getAttachmentClassifier() + ".jar" ); -119 try -120 { -121 archiver.addFile( optionsFile, BUNDLE_OPTIONS_PATH ); -122 -123 File javadocDir = getJavadocDirectory(); -124 if ( javadocDir.exists() javadocDir.isDirectory() ) -125 { -126 archiver.addDirectory( javadocDir, RESOURCES_DIR_PATH + "/" ); -127 } -128 -129 archiver.setDestFile( bundleFile ); -130 archiver.createArchive(); -131 } -132 catch ( ArchiverException e ) -133 { -134 throw new MojoExecutionException( "Failed to assemble javadoc-resources bundle archive. Reason: " -135 + e.getMessage(), e ); -136 } -137 catch ( IOException e ) -138 { -139 throw new MojoExecutionException( "Failed to assemble javadoc-resources bundle archive. Reason: " -140 + e.getMessage(), e ); -141 } -142 -143 projectHelper.attachArtifact( getProject(), bundleFile, getAttachmentClassifier() ); -144 } -145 } +94 @Override +95 public void doExecute() +96 throws MojoExecutionException, MojoFailureException +97 { +98 try +99 { +100 buildJavadocOptions(); +101 } +102 catch ( IOException e ) +103 { +104 throw new MojoExecutionException( "Failed to generate javadoc-options file: " + e.getMessage(), e ); +105 } +106 +107 Archiver archiver; +108 try +109 { +110 archiver = archiverManager.getArchiver( "jar" ); +111 } +112 catch ( NoSuchArchiverException e ) +113 { +114 throw new MojoExecutionException( "Failed to retrieve jar archiver component from manager.", e ); +115 } +116 +117 File optionsFile = getJavadocOptionsFile(); +118 File bundleFile = +119 new File( getProject().getBuild().getDirectory(), finalName + "-" + getAttachmentClassifier() + ".jar" ); +120 try +121 { +122 archiver.addFile( optionsFile, BUNDLE_OPTIONS_PATH ); +123 +124 File javadocDir = getJavadocDirectory(); +125 if ( javadocDir.exists() javadocDir.isDirectory() ) +126 { +127 archiver.addDirectory( javadocDir, RESOURCES_DIR_PATH + "/" ); +128 } +129 +130 archiver.setDestFile( bundleFile ); +131 archiver.createArchive(); +132 } +133 catch ( ArchiverException e ) +134 { +135 throw new MojoExecutionException( "Failed to assemble javadoc-resources bundle archive. Reason: " +136 + e.getMessage(), e ); +137 } +138 catch ( IOException e ) +139 { +140 throw new MojoExecutionException( "Failed to assemble javadoc-resources bundle archive. Reason: " +141 + e.getMessage(), e ); +142 } +143 +144 projectHelper.attachArtifact( getProject(), bundleFile, getAttachmentClassifier() ); +145 } +146 } Copyright 20042017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified:
svn commit: r1021020 [26/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/JavadocUtilTest.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/JavadocUtilTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/JavadocUtilTest.html Fri Nov 17 17:33:38 2017 @@ -383,7 +383,7 @@ 375 } 376 } 377 -378 MapString, String authentications = new HashMapString, String(); +378 MapString, String authentications = new HashMap(); 379 authentications.put( "foo", "bar" ); 380 // wrong auth 381 try @@ -532,7 +532,7 @@ 524 assertTrue( output.mkdirs() ); 525 526 JavadocUtil.copyJavadocResources( output, input, null ); -527 ListString expected = new ArrayListString(); +527 ListString expected = new ArrayList(); 528 expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" + File.separator 529 + "sample-excluded1.gif" ); 530 expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir2" + File.separator @@ -542,7 +542,7 @@ 534 expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" + File.separator 535 + "sample-included2.gif" ); 536 assertTrue( EqualsBuilder.reflectionEquals( expected, FileUtils.getFiles( output, null, null, false ) ) ); -537 expected = new ArrayListString(); +537 expected = new ArrayList(); 538 expected.add( "" ); 539 expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" ); 540 expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" ); @@ -564,13 +564,13 @@ 556 assertTrue( output.mkdirs() ); 557 558 JavadocUtil.copyJavadocResources( output, input, "excluded-dir1:excluded-dir2" ); -559 expected = new ArrayListString(); +559 expected = new ArrayList(); 560 expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir1" + File.separator 561 + "sample-included1.gif" ); 562 expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" + File.separator 563 + "sample-included2.gif" ); 564 assertTrue( EqualsBuilder.reflectionEquals( expected, FileUtils.getFiles( output, null, null, false ) ) ); -565 expected = new ArrayListString(); +565 expected = new ArrayList(); 566 expected.add( "" ); 567 expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir1" ); 568 expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" ); @@ -588,12 +588,12 @@ 580 public void testPruneDirs() 581 throws Exception 582 { -583 ListString list = new ArrayListString(); +583 ListString list = new ArrayList(); 584 list.add( getBasedir() + "/target/classes" ); 585 list.add( getBasedir() + "/target/classes" ); 586 list.add( getBasedir() + "/target/classes" ); 587 -588 ListString expected = new ArrayListString(); +588 ListString expected = new ArrayList(); 589 expected.add( getBasedir() + "/target/classes" ); 590 591 assertTrue( EqualsBuilder.reflectionEquals( expected, JavadocUtil.pruneDirs( null, list ) ) ); Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/ProxyServer.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/ProxyServer.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/ProxyServer.html Fri Nov 17 17:33:38 2017 @@ -196,58 +196,59 @@ 188 } 189 190 /** {@inheritDoc} */ -191 public void service( ServletRequest req, ServletResponse res ) -192 throws ServletException, IOException -193 { -194 final HttpServletRequest request = (HttpServletRequest) req; -195 final HttpServletResponse response = (HttpServletResponse) res; -196 -197 if ( this.authentications != null !this.authentications.isEmpty() ) -198 { -199 String proxyAuthorization = request.getHeader( "Proxy-Authorization" ); -200 if ( proxyAuthorization != null
svn commit: r1021020 [28/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/JavadocPluginArtifactStub.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/JavadocPluginArtifactStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/JavadocPluginArtifactStub.html Fri Nov 17 17:33:38 2017 @@ -62,93 +62,105 @@ 54 } 55 56 /** {@inheritDoc} */ -57 public void setGroupId( String groupId ) -58 { -59 this.groupId = groupId; -60 } -61 -62 /** {@inheritDoc} */ -63 public String getGroupId() -64 { -65 return groupId; -66 } -67 -68 /** {@inheritDoc} */ -69 public void setArtifactId( String artifactId ) -70 { -71 this.artifactId = artifactId; -72 } -73 -74 /** {@inheritDoc} */ -75 public String getArtifactId() -76 { -77 return artifactId; -78 } -79 -80 /** {@inheritDoc} */ -81 public void setVersion( String version ) -82 { -83 this.version = version; -84 } -85 -86 /** {@inheritDoc} */ -87 public String getVersion() -88 { -89 return version; -90 } -91 -92 /** -93 * @param packaging -94 */ -95 public void setPackaging( String packaging ) -96 { -97 this.packaging = packaging; -98 } -99 -100 /** -101 * @return -102 */ -103 public String getPackaging() -104 { -105 return packaging; -106 } -107 -108 /** {@inheritDoc} */ -109 public VersionRange getVersionRange() +57 @Override +58 public void setGroupId( String groupId ) +59 { +60 this.groupId = groupId; +61 } +62 +63 /** {@inheritDoc} */ +64 @Override +65 public String getGroupId() +66 { +67 return groupId; +68 } +69 +70 /** {@inheritDoc} */ +71 @Override +72 public void setArtifactId( String artifactId ) +73 { +74 this.artifactId = artifactId; +75 } +76 +77 /** {@inheritDoc} */ +78 @Override +79 public String getArtifactId() +80 { +81 return artifactId; +82 } +83 +84 /** {@inheritDoc} */ +85 @Override +86 public void setVersion( String version ) +87 { +88 this.version = version; +89 } +90 +91 /** {@inheritDoc} */ +92 @Override +93 public String getVersion() +94 { +95 return version; +96 } +97 +98 /** +99 * @param packaging +100 */ +101 public void setPackaging( String packaging ) +102 { +103 this.packaging = packaging; +104 } +105 +106 /** +107 * @return +108 */ +109 public String getPackaging() 110 { -111 return versionRange; +111 return packaging; 112 } 113 114 /** {@inheritDoc} */ -115 public void setVersionRange( VersionRange versionRange ) -116 { -117 this.versionRange = versionRange; -118 } -119 -120 /** {@inheritDoc} */ -121 public ArtifactHandler getArtifactHandler() -122 { -123 return handler; -124 } -125 -126 /** {@inheritDoc} */ -127 public void setArtifactHandler( ArtifactHandler handler ) -128 { -129 this.handler = handler; -130 } -131 -132 /** {@inheritDoc} */ -133 public String getBaseVersion() -134 { -135 return baseVersion; -136 } -137 -138 /** {@inheritDoc} */ -139 public void setBaseVersion( String string ) -140 { -141 this.baseVersion = string; -142 } -143 } +115 @Override +116 public VersionRange getVersionRange() +117 { +118 return versionRange; +119 } +120 +121 /** {@inheritDoc} */ +122 @Override +123 public void setVersionRange( VersionRange versionRange ) +124 { +125 this.versionRange = versionRange; +126 } +127 +128 /** {@inheritDoc} */ +129 @Override +130 public ArtifactHandler getArtifactHandler() +131 { +132 return handler; +133 } +134 +135 /** {@inheritDoc} */ +136 @Override +137 public void setArtifactHandler( ArtifactHandler handler ) +138 { +139 this.handler = handler; +140 } +141 +142 /** {@inheritDoc} */ +143 @Override +144 public String getBaseVersion() +145 { +146 return baseVersion; +147 } +148 +149 /** {@inheritDoc} */ +150 @Override +151 public void setBaseVersion( String string ) +152 { +153 this.baseVersion = string; +154 } +155 } Copyright 20042017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved.
svn commit: r1021020 [13/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/pmd.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/pmd.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/pmd.html Fri Nov 17 17:33:38 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven Javadoc Plugin PMD Results @@ -77,10 +77,10 @@ PMD Results - | Last Published: 2017-07-17 + | Last Published: 2017-11-17 | -Version: 3.0.0-M1 +Version: 3.0.0 @@ -568,169 +568,163 @@ Line Useless parentheses. -1194 +1221 -These nested if statements could be combined -23432346 - Avoid using a branching statement as the last in a loop. -2785 - +2811 + Useless parentheses. -2848 +2886 org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java - + Violation Line - -Too many static imports may lead to messy code -15959 -Useless parentheses. -1862 +Too many static imports may lead to messy code +16067 Useless parentheses. -1870 +1879 Useless parentheses. -1878 +1887 Useless parentheses. -2057 +1895 Useless parentheses. -2058 +2091 Useless parentheses. -2885 +2092 Useless parentheses. -28852886 +29592960 Useless parentheses. -28862887 +2959 Useless parentheses. -2982 +29602961 Useless parentheses. -2982 +3056 Useless parentheses. -29832984 +3056 Useless parentheses. -2983 +30573058 Useless parentheses. -29982999 +3057 Useless parentheses. -2998 +3072 Useless parentheses. -29993000 +30723073 Useless parentheses. -30003001 +30733074 Useless parentheses. -3396 +30743075 Useless parentheses. -33963397 +34703471 Useless parentheses. -3397 +3470 Useless parentheses. -3611 +3471 Useless parentheses. -3612 +3685 Useless parentheses. -4517 +3686 Useless parentheses. -4603 +4591 Useless parentheses. -4603 +4705 Useless parentheses. -4618 +4705 Useless parentheses. -4618 +4720 Useless parentheses. -4859 +4720 Useless parentheses. -4859 +4967 Useless parentheses. -4924 +4967 Useless parentheses. -49244925 +50325033 Useless parentheses. -4925 - -Unnecessary use of fully qualified name 'IOUtil.close' due to existing static import 'org.codehaus.plexus.util.IOUtil.close' -5133 - -Unnecessary use of fully qualified name 'IOUtil.close' due to existing static import 'org.codehaus.plexus.util.IOUtil.close' -5322 +5032 Useless parentheses. -5376 +5033 Unnecessary use of fully qualified name 'IOUtil.close' due to existing static import 'org.codehaus.plexus.util.IOUtil.close' -5600 +5241 Unnecessary use of fully qualified name 'IOUtil.close' due to existing static import 'org.codehaus.plexus.util.IOUtil.close' -5601 +5430 Useless parentheses. -5806 +5484 + +Unnecessary use of fully qualified name 'IOUtil.close' due to existing static import 'org.codehaus.plexus.util.IOUtil.close' +5708 + +Unnecessary use of fully qualified name 'IOUtil.close' due to existing static import 'org.codehaus.plexus.util.IOUtil.close' +5709 Useless parentheses. -5806 +5914 Useless parentheses. -5813 +5914 Useless parentheses. -5813 +5921 Useless parentheses. -5814 +5921 + +Useless parentheses. +5922 org/apache/maven/plugins/javadoc/JavadocReport.java - + Violation Line - + Useless parentheses. -230 +236 org/apache/maven/plugins/javadoc/JavadocUtil.java - + Violation Line - + Avoid unused local variables such as 'aSubpackagesList'. 200 - -Useless parentheses. -516 Useless parentheses. 516 @@ -738,30 +732,33 @@ Useless parentheses. 516 -These nested if statements could be combined -12251230 +Useless parentheses. +516 These nested if statements could be combined -12951299 +12351240 + +These nested if statements could be combined +13051309 org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java - + Violation Line - + Avoid unused private fields such as 'dependencyResolver'. 74 - + Avoid unused private fields such as 'artifactMetadataSource'. 77 - + Avoid unused method parameters such as 'artifact'. 183 - + Avoid unused method parameters such as 'config'. 353 - + Useless parentheses. 388 Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/project-info.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/project-info.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/project-info.html Fri Nov 17 17:33:38
svn commit: r1021020 [1/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plug
Author: rfscholte Date: Fri Nov 17 17:33:38 2017 New Revision: 1021020 Log: Site checkin for project Apache Maven Javadoc Plugin Removed: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.PrivateAbstractInheritableJavaEntity.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/testapidocs/org/apache/maven/plugins/javadoc/class-use/AbstractFixJavadocMojoTest.PrivateAbstractInheritableJavaEntity.html Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/aggregate-jar-mojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/aggregate-mojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/allclasses-frame.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/allclasses-noframe.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/constant-values.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/deprecated-list.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/help-doc.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/index-all.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/index.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AdditionalDependency.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorJavadocJar.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorJavadocReport.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJar.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/AggregatorTestJavadocReport.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/FixJavadocMojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/HelpMojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/JavadocArchiveConfiguration.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/JavadocJar.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/JavadocNoForkReport.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/JavadocReport.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/JavadocUtil.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/JavadocVersion.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestFixJavadocMojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestJavadocJar.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestJavadocNoForkReport.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestJavadocReport.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.html websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/class-use/AbstractFixJavadocMojo.html
svn commit: r1021020 [30/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.html Fri Nov 17 17:33:38 2017 @@ -27,3764 +27,3777 @@ 19 * under the License. 20 */ 21 -22 import com.thoughtworks.qdox.JavaDocBuilder; -23 import com.thoughtworks.qdox.model.AbstractInheritableJavaEntity; -24 import com.thoughtworks.qdox.model.AbstractJavaEntity; -25 import com.thoughtworks.qdox.model.Annotation; -26 import com.thoughtworks.qdox.model.DocletTag; -27 import com.thoughtworks.qdox.model.JavaClass; -28 import com.thoughtworks.qdox.model.JavaField; -29 import com.thoughtworks.qdox.model.JavaMethod; -30 import com.thoughtworks.qdox.model.JavaParameter; -31 import com.thoughtworks.qdox.model.Type; -32 import com.thoughtworks.qdox.model.TypeVariable; -33 import com.thoughtworks.qdox.parser.ParseException; -34 import org.apache.commons.io.IOUtils; -35 import org.apache.commons.lang3.ClassUtils; -36 import org.apache.maven.artifact.Artifact; -37 import org.apache.maven.artifact.DependencyResolutionRequiredException; -38 import org.apache.maven.artifact.repository.ArtifactRepository; -39 import org.apache.maven.plugin.AbstractMojo; -40 import org.apache.maven.plugin.MojoExecutionException; -41 import org.apache.maven.plugin.MojoFailureException; -42 import org.apache.maven.plugins.annotations.Component; -43 import org.apache.maven.plugins.annotations.Parameter; -44 import org.apache.maven.project.MavenProject; -45 import org.apache.maven.settings.Settings; -46 import org.apache.maven.shared.invoker.MavenInvocationException; -47 import org.codehaus.plexus.components.interactivity.InputHandler; -48 import org.codehaus.plexus.util.FileUtils; -49 import org.codehaus.plexus.util.IOUtil; -50 import org.codehaus.plexus.util.ReaderFactory; -51 import org.codehaus.plexus.util.StringUtils; -52 import org.codehaus.plexus.util.WriterFactory; -53 -54 import java.io.BufferedReader; -55 import java.io.File; -56 import java.io.IOException; -57 import java.io.InputStream; -58 import java.io.StringReader; -59 import java.io.StringWriter; -60 import java.io.Writer; -61 import java.lang.reflect.Method; -62 import java.net.MalformedURLException; -63 import java.net.URL; -64 import java.net.URLClassLoader; -65 import java.util.ArrayList; -66 import java.util.Arrays; -67 import java.util.Collections; -68 import java.util.Iterator; -69 import java.util.LinkedHashMap; -70 import java.util.LinkedList; -71 import java.util.List; -72 import java.util.Locale; -73 import java.util.Map; -74 import java.util.Properties; -75 import java.util.StringTokenizer; -76 import java.util.regex.Matcher; -77 import java.util.regex.Pattern; -78 -79 /** -80 * Abstract class to fix Javadoc documentation and tags in source files. -81 * br/ -82 * See a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html; target="alexandria_uri">http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#wheretags"Where Tags -83 * Can Be Used/a. -84 * -85 * @author a href="mailto:vincent.sive...@gmail.com; target="alexandria_uri">mailto:vincent.sive...@gmail.com"Vincent Siveton/a -86 * @version $Id: AbstractFixJavadocMojo.java 1801354 2017-07-09 08:49:46Z rfscholte $ -87 * @since 2.6 -88 */ -89 public abstract class AbstractFixJavadocMojo -90 extends AbstractMojo -91 { -92 /** -93 * The vm line separator -94 */ -95 private static final String EOL = System.getProperty( "line.separator" ); -96 -97 /** -98 * Tag name for #64;author * -99 */ -100 private static final String AUTHOR_TAG = "author"; -101 -102 /** -103 * Tag name for #64;version * -104 */ -105 private static final String VERSION_TAG = "version"; -106 -107 /** -108 * Tag name for #64;since * -109 */ -110 private static final String SINCE_TAG = "since"; -111 -112 /** -113 * Tag name for #64;param * -114 */ -115 private static final String PARAM_TAG = "param"; -116 -117 /** -118 * Tag name for #64;return * -119 */ -120 private static final String RETURN_TAG = "return"; -121 -122 /** -123 * Tag name for #64;throws * -124 */ -125 private static final String THROWS_TAG = "throws"; -126 -127 /** -128 * Tag name for #64;link * -129 */ -130 private static final String LINK_TAG = "link"; -131 -132 /** -133 * Tag name for {#64;inheritDoc} * -134
svn commit: r1021020 [31/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.html Fri Nov 17 17:33:38 2017 @@ -40,5931 +40,6039 @@ 32 import java.io.InputStream; 33 import java.io.OutputStream; 34 import java.io.Writer; -35 import java.net.MalformedURLException; -36 import java.net.URI; -37 import java.net.URISyntaxException; -38 import java.net.URL; -39 import java.net.URLClassLoader; -40 import java.util.ArrayList; -41 import java.util.Arrays; -42 import java.util.Calendar; -43 import java.util.Collection; -44 import java.util.Collections; -45 import java.util.HashMap; -46 import java.util.HashSet; -47 import java.util.LinkedHashSet; -48 import java.util.LinkedList; -49 import java.util.List; -50 import java.util.Locale; -51 import java.util.Map; -52 import java.util.Properties; -53 import java.util.Set; -54 import java.util.StringTokenizer; -55 import java.util.regex.Matcher; -56 import java.util.regex.Pattern; -57 -58 import org.apache.commons.lang3.ClassUtils; -59 import org.apache.commons.lang3.JavaVersion; -60 import org.apache.commons.lang3.SystemUtils; -61 import org.apache.maven.artifact.Artifact; -62 import org.apache.maven.artifact.handler.ArtifactHandler; -63 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; -64 import org.apache.maven.artifact.repository.ArtifactRepository; -65 import org.apache.maven.artifact.resolver.ArtifactNotFoundException; -66 import org.apache.maven.artifact.resolver.ArtifactResolutionException; -67 import org.apache.maven.artifact.versioning.ArtifactVersion; -68 import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -69 import org.apache.maven.execution.MavenSession; -70 import org.apache.maven.model.Dependency; -71 import org.apache.maven.model.Plugin; -72 import org.apache.maven.model.Resource; -73 import org.apache.maven.plugin.AbstractMojo; -74 import org.apache.maven.plugin.MojoExecutionException; -75 import org.apache.maven.plugin.MojoFailureException; -76 import org.apache.maven.plugin.descriptor.PluginDescriptor; -77 import org.apache.maven.plugins.javadoc.options.BootclasspathArtifact; -78 import org.apache.maven.plugins.javadoc.options.DocletArtifact; -79 import org.apache.maven.plugins.javadoc.options.Group; -80 import org.apache.maven.plugins.javadoc.options.JavadocOptions; -81 import org.apache.maven.plugins.javadoc.options.JavadocPathArtifact; -82 import org.apache.maven.plugins.javadoc.options.OfflineLink; -83 import org.apache.maven.plugins.javadoc.options.ResourcesArtifact; -84 import org.apache.maven.plugins.javadoc.options.Tag; -85 import org.apache.maven.plugins.javadoc.options.Taglet; -86 import org.apache.maven.plugins.javadoc.options.TagletArtifact; -87 import org.apache.maven.plugins.javadoc.options.io.xpp3.JavadocOptionsXpp3Writer; -88 import org.apache.maven.plugins.annotations.Component; -89 import org.apache.maven.plugins.annotations.Parameter; -90 import org.apache.maven.plugins.javadoc.resolver.JavadocBundle; -91 import org.apache.maven.plugins.javadoc.resolver.ResourceResolver; -92 import org.apache.maven.plugins.javadoc.resolver.SourceResolverConfig; -93 import org.apache.maven.project.MavenProject; -94 import org.apache.maven.project.ProjectBuilder; -95 import org.apache.maven.project.ProjectBuildingException; -96 import org.apache.maven.reporting.MavenReportException; -97 import org.apache.maven.settings.Proxy; -98 import org.apache.maven.settings.Settings; -99 import org.apache.maven.shared.artifact.DefaultArtifactCoordinate; -100 import org.apache.maven.shared.artifact.filter.resolve.AndFilter; -101 import org.apache.maven.shared.artifact.filter.resolve.PatternExclusionsFilter; -102 import org.apache.maven.shared.artifact.filter.resolve.PatternInclusionsFilter; -103 import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter; -104 import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter; -105 import org.apache.maven.shared.artifact.resolve.ArtifactResolver; -106 import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; -107 import org.apache.maven.shared.artifact.resolve.ArtifactResult; -108 import org.apache.maven.shared.dependencies.DefaultDependableCoordinate; -109 import org.apache.maven.shared.dependencies.resolve.DependencyResolver; -110 import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; -111 import
svn commit: r1021020 [10/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/jar-mojo.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/jar-mojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/jar-mojo.html Fri Nov 17 17:33:38 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven Javadoc Plugin javadoc:jar @@ -77,10 +77,10 @@ javadoc:jar - | Last Published: 2017-07-17 + | Last Published: 2017-11-17 | -Version: 3.0.0-M1 +Version: 3.0.0 @@ -457,7 +457,7 @@ Full name: -org.apache.maven.plugins:maven-javadoc-plugin:3.0.0-M1:jar +org.apache.maven.plugins:maven-javadoc-plugin:3.0.0:jar Description: @@ -474,8 +474,6 @@ Tool. Requires dependency resolution of artifacts in scope: compile. -The goal is thread-safe and supports parallel builds. - Since version: 2.0. Binds by default to the http://maven.apache.org/ref/current/maven-core/lifecycles.html;>lifecycle phase: package. @@ -505,7 +503,7 @@ Tool. 2.10 -(no description)Default value is: javadoc.User property is: maven.javadoc.classifier. +(no description)Default value is: javadoc.User property is: maven.javadoc.classifier. @@ -519,7 +517,7 @@ Tool. Specifies the destination directory where javadoc saves the generated HTML files. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#d;>d. -Default value is: ${project.build.directory}/apidocs.User property is: destDir. +Default value is: ${project.build.directory}/apidocs.User property is: destDir.Alias is: destDir. @@ -584,7 +582,7 @@ See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp;>vmoptions. See http://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html;>Networking -Properties.User property is: additionalJOption. +Properties.User property is: additionalJOption. @@ -608,14 +606,15 @@ via the '-J' option to javadoc. Example: -additionalparam +additionalOptions -String +String[] -2.0 +3.0.0 -Deprecated. Does not properly support multiple options at once and has a bad -nameUser property is: additionalparam. +Set an additional option(s) on the command line. This value should +include quotes as necessary for parameters that include spaces. +Useful for a custom doclet. @@ -627,7 +626,7 @@ nameUser property is: a 2.9.1 To apply the security fix on generated javadoc see -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571Default value is: true.User property is: maven.javadoc.applyJavadocSecurityFix. +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571Default value is: true.User property is: maven.javadoc.applyJavadocSecurityFix. @@ -651,7 +650,7 @@ Archiver Reference. 2.0 Specifies whether to attach the generated artifact to the project -helper. Default value is: true.User property is: attach. +helper. Default value is: true.User property is: attach. @@ -665,7 +664,7 @@ helper. Default value is< Specifies whether or not the author text is included in the generated Javadocs. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#author;>author. -Default value is: true.User property is: author. +Default value is: true.User property is: author. @@ -681,7 +680,7 @@ See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#bootclasspath;>bootclasspath. -User property is: bootclasspath. +User property is: bootclasspath. @@ -710,7 +709,7 @@ Example: See Javadoc. -User property is: bootclasspathArtifacts. +User property is: bootclasspathArtifacts. @@ -729,7 +728,7 @@ eg. ![CDATA[Copyright 2005, href=http://www.mycompany.comMyCompany, Inc.a]] See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#bottom;>bottom. -Default value is: Copyright #169; {inceptionYear}#x2013;{currentYear} {organizationName}. All rights reserved..User property is: bottom. +Default value is: Copyright #169; {inceptionYear}#x2013;{currentYear} {organizationName}. All rights reserved..User property is: bottom. @@ -745,7 +744,7 @@ sentence. See
svn commit: r1021020 [29/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.html Fri Nov 17 17:33:38 2017 @@ -57,17 +57,18 @@ 49 build.setDirectory( super.getBasedir() + "/target/test/unit/tag-test/target" ); 50 setBuild( build ); 51 -52 ListString compileSourceRoots = new ArrayListString(); +52 ListString compileSourceRoots = new ArrayList(); 53 compileSourceRoots.add( getBasedir() + "/src/main/java" ); 54 setCompileSourceRoots( compileSourceRoots ); 55 } 56 57 /** {@inheritDoc} */ -58 public File getBasedir() -59 { -60 return new File( super.getBasedir() + "/src/test/resources/unit/tag-test" ); -61 } -62 } +58 @Override +59 public File getBasedir() +60 { +61 return new File( super.getBasedir() + "/src/test/resources/unit/tag-test" ); +62 } +63 } Copyright 20042017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.html Fri Nov 17 17:33:38 2017 @@ -65,27 +65,29 @@ 57 build.setDirectory( super.getBasedir() + "/target/test/unit/tagletArtifacts-test/target" ); 58 setBuild( build ); 59 -60 ListString compileSourceRoots = new ArrayListString(); +60 ListString compileSourceRoots = new ArrayList(); 61 compileSourceRoots.add( getBasedir() + "/src/main/java" ); 62 setCompileSourceRoots( compileSourceRoots ); 63 } 64 65 /** {@inheritDoc} */ -66 public ListArtifactRepository getRemoteArtifactRepositories() -67 { -68 ArtifactRepository repository = -69 new DefaultArtifactRepository( "central", "http://repo.maven.apache.org/maven2;, -70 new DefaultRepositoryLayout() ); -71 -72 return Collections.singletonList( repository ); -73 } -74 -75 /** {@inheritDoc} */ -76 public File getBasedir() -77 { -78 return new File( super.getBasedir() + "/src/test/resources/unit/tagletArtifacts-test" ); -79 } -80 } +66 @Override +67 public ListArtifactRepository getRemoteArtifactRepositories() +68 { +69 ArtifactRepository repository = +70 new DefaultArtifactRepository( "central", "http://repo.maven.apache.org/maven2;, +71 new DefaultRepositoryLayout() ); +72 +73 return Collections.singletonList( repository ); +74 } +75 +76 /** {@inheritDoc} */ +77 @Override +78 public File getBasedir() +79 { +80 return new File( super.getBasedir() + "/src/test/resources/unit/tagletArtifacts-test" ); +81 } +82 } Copyright 20042017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.html Fri Nov 17 17:33:38 2017 @@ -64,29 +64,32 @@ 56 build.setDirectory( super.getBasedir() + "/target/test/unit/taglet-test/target" ); 57 setBuild( build ); 58 -59 ListString compileSourceRoots = new ArrayListString(); +59 ListString compileSourceRoots = new ArrayList(); 60 compileSourceRoots.add( getBasedir() + "/taglet/test" ); 61 setCompileSourceRoots(
svn commit: r1021020 [32/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/JavadocJar.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/JavadocJar.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref/org/apache/maven/plugins/javadoc/JavadocJar.html Fri Nov 17 17:33:38 2017 @@ -108,215 +108,217 @@ 100 * 101 * @deprecated 102 */ -103 @Parameter( property = "destDir" ) -104 private File destDir; -105 -106 /** -107 * Specifies the directory where the generated jar file will be put. -108 */ -109 @Parameter( property = "project.build.directory" ) -110 private String jarOutputDirectory; -111 -112 /** -113 * Specifies the filename that will be used for the generated jar file. Please note that code-javadoc/code -114 * or code-test-javadoc/code will be appended to the file name. -115 */ -116 @Parameter( property = "project.build.finalName" ) -117 private String finalName; -118 -119 /** -120 * Specifies whether to attach the generated artifact to the project helper. -121 * br/ -122 */ -123 @Parameter( property = "attach", defaultValue = "true" ) -124 private boolean attach; -125 -126 /** -127 * The archive configuration to use. -128 * See a href="http://maven.apache.org/shared/maven-archiver/index.html; target="alexandria_uri">http://maven.apache.org/shared/maven-archiver/index.html"Maven Archiver Reference/a. -129 * -130 * @since 2.5 -131 */ -132 @Parameter -133 private MavenArchiveConfiguration archive = new JavadocArchiveConfiguration(); -134 -135 /** -136 * Path to the default MANIFEST file to use. It will be used if -137 * codeuseDefaultManifestFile/code is set to codetrue/code. -138 * -139 * @since 2.5 -140 */ -141 @Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/MANIFEST.MF", required = true, -142 readonly = true ) -143 private File defaultManifestFile; -144 -145 /** -146 * Set this to codetrue/code to enable the use of the codedefaultManifestFile/code. -147 * br/ -148 * -149 * @since 2.5 -150 */ -151 @Parameter( defaultValue = "false" ) -152 private boolean useDefaultManifestFile; -153 -154 /** -155 * @since 2.10 -156 */ -157 @Parameter( property = "maven.javadoc.classifier", defaultValue = "javadoc", required = true ) -158 private String classifier; -159 -160 /** {@inheritDoc} */ -161 public void doExecute() -162 throws MojoExecutionException -163 { -164 if ( skip ) -165 { -166 getLog().info( "Skipping javadoc generation" ); -167 return; -168 } -169 -170 File innerDestDir = this.destDir; -171 if ( innerDestDir == null ) -172 { -173 innerDestDir = new File( getOutputDirectory() ); -174 } -175 -176 if ( !( "pom".equalsIgnoreCase( project.getPackaging() ) isAggregator() ) ) -177 { -178 ArtifactHandler artifactHandler = project.getArtifact().getArtifactHandler(); -179 if ( !"java".equals( artifactHandler.getLanguage() ) ) -180 { -181 getLog().info( "Not executing Javadoc as the project is not a Java classpath-capable package" ); -182 return; -183 } -184 } -185 -186 try -187 { -188 executeReport( Locale.getDefault() ); -189 } -190 catch ( MavenReportException e ) -191 { -192 failOnError( "MavenReportException: Error while generating Javadoc", e ); -193 } -194 catch ( RuntimeException e ) -195 { -196 failOnError( "RuntimeException: Error while generating Javadoc", e ); -197 } -198 -199 if ( innerDestDir.exists() ) -200 { -201 try -202 { -203 File outputFile = generateArchive( innerDestDir, finalName + "-" + getClassifier() + ".jar" ); -204 -205 if ( !attach ) -206 { -207 getLog().info( "NOT adding javadoc to attached artifacts list." ); -208 } -209 else -210 { -211 // TODO: these introduced dependencies on the project are going to become problematic - can we export it -212 // through metadata instead? -213 projectHelper.attachArtifact( project, "javadoc", getClassifier(), outputFile ); -214 } -215 } -216 catch ( ArchiverException e ) -217 {
svn commit: r1021020 [22/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.html Fri Nov 17 17:33:38 2017 @@ -17,7 +17,7 @@ 9* "License"); you may not use this file except in compliance 10 * with the License. You may obtain a copy of the License at 11 * -12 * http://www.apache.org/licenses/LICENSE-2.; target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0 +12 * http://www.apache.org/licenses/LICENSE-2.; target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0 13 * 14 * Unless required by applicable law or agreed to in writing, 15 * software distributed under the License is distributed on an @@ -27,195 +27,163 @@ 19 * under the License. 20 */ 21 -22 import static org.mockito.Mockito.mock; -23 import static org.mockito.Mockito.spy; -24 import static org.mockito.Mockito.when; -25 -26 import org.apache.maven.plugins.javadoc.AbstractFixJavadocMojo; +22 import java.io.StringReader; +23 +24 import com.thoughtworks.qdox.JavaProjectBuilder; +25 import com.thoughtworks.qdox.model.JavaClass; +26 import com.thoughtworks.qdox.model.JavaSource; 27 28 import junit.framework.TestCase; -29 import junitx.util.PrivateAccessor; -30 -31 import com.thoughtworks.qdox.model.AbstractInheritableJavaEntity; -32 import com.thoughtworks.qdox.model.DocletTag; -33 import com.thoughtworks.qdox.model.IndentBuffer; -34 import com.thoughtworks.qdox.model.JavaClass; -35 -36 public class AbstractFixJavadocMojoTest -37 extends TestCase -38 { -39 -40 public void testReplaceLinkTags_noLinkTag() -41 throws Throwable -42 { -43 String comment = "/** @see ConnectException */"; -44 AbstractInheritableJavaEntity entity = spy( new PrivateAbstractInheritableJavaEntity() ); -45 JavaClass clazz = mock( JavaClass.class ); -46 when( entity.getParentClass() ).thenReturn( clazz ); -47 when( clazz.resolveType( "ConnectException" ) ).thenReturn( "java.net.ConnectException" ); -48 String newComment = -49 (String) PrivateAccessor.invoke( AbstractFixJavadocMojo.class, "replaceLinkTags", new Class[] { -50 String.class, AbstractInheritableJavaEntity.class }, new Object[] { comment, entity } ); -51 assertEquals( "/** @see ConnectException */", newComment ); -52 } -53 -54 public void testReplaceLinkTags_oneLinkTag() -55 throws Throwable -56 { -57 String comment = "/** {@link ConnectException} */"; -58 AbstractInheritableJavaEntity entity = spy( new PrivateAbstractInheritableJavaEntity() ); -59 JavaClass clazz = mock( JavaClass.class ); -60 when( entity.getParentClass() ).thenReturn( clazz ); -61 when( clazz.resolveType( "ConnectException" ) ).thenReturn( "java.net.ConnectException" ); -62 String newComment = -63 (String) PrivateAccessor.invoke( AbstractFixJavadocMojo.class, "replaceLinkTags", new Class[] { -64 String.class, AbstractInheritableJavaEntity.class }, new Object[] { comment, entity } ); -65 assertEquals( "/** {@link java.net.ConnectException} */", newComment ); -66 } -67 -68 public void testReplaceLinkTags_missingEndBrace() -69 throws Throwable -70 { -71 String comment = "/** {@link ConnectException */"; -72 AbstractInheritableJavaEntity entity = spy( new PrivateAbstractInheritableJavaEntity() ); -73 JavaClass clazz = mock( JavaClass.class ); -74 when( entity.getParentClass() ).thenReturn( clazz ); -75 when( clazz.resolveType( "ConnectException" ) ).thenReturn( "java.net.ConnectException" ); -76 String newComment = -77 (String) PrivateAccessor.invoke( AbstractFixJavadocMojo.class, "replaceLinkTags", new Class[] { -78 String.class, AbstractInheritableJavaEntity.class }, new Object[] { comment, entity } ); -79 -80 assertEquals( "/** {@link ConnectException */", newComment ); -81 } -82 -83 public void testReplaceLinkTags_spacesAfterLinkTag() -84 throws Throwable -85 { -86 String comment = "/** {@link ConnectException} */"; -87 AbstractInheritableJavaEntity entity = spy( new PrivateAbstractInheritableJavaEntity() ); -88 JavaClass clazz = mock( JavaClass.class ); -89 when( entity.getParentClass() ).thenReturn(
svn commit: r1021020 [2/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plug
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/aggregate-jar-mojo.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/aggregate-jar-mojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/aggregate-jar-mojo.html Fri Nov 17 17:33:38 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven Javadoc Plugin javadoc:aggregate-jar @@ -77,10 +77,10 @@ javadoc:aggregate-jar - | Last Published: 2017-07-17 + | Last Published: 2017-11-17 | -Version: 3.0.0-M1 +Version: 3.0.0 @@ -457,7 +457,7 @@ Full name: -org.apache.maven.plugins:maven-javadoc-plugin:3.0.0-M1:aggregate-jar +org.apache.maven.plugins:maven-javadoc-plugin:3.0.0:aggregate-jar Description: @@ -506,7 +506,7 @@ Tool. 2.10 -(no description)Default value is: javadoc.User property is: maven.javadoc.classifier. +(no description)Default value is: javadoc.User property is: maven.javadoc.classifier. @@ -520,7 +520,7 @@ Tool. Specifies the destination directory where javadoc saves the generated HTML files. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#d;>d. -Default value is: ${project.build.directory}/apidocs.User property is: destDir. +Default value is: ${project.build.directory}/apidocs.User property is: destDir.Alias is: destDir. @@ -585,7 +585,7 @@ See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp;>vmoptions. See http://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html;>Networking -Properties.User property is: additionalJOption. +Properties.User property is: additionalJOption. @@ -609,14 +609,15 @@ via the '-J' option to javadoc. Example: -additionalparam +additionalOptions -String +String[] -2.6 +3.0.0 -Deprecated. Does not properly support multiple options at once and has a bad -nameUser property is: additionalparam. +Set an additional option(s) on the command line. This value should +include quotes as necessary for parameters that include spaces. +Useful for a custom doclet. @@ -628,7 +629,7 @@ nameUser property is: a 2.9.1 To apply the security fix on generated javadoc see -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571Default value is: true.User property is: maven.javadoc.applyJavadocSecurityFix. +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571Default value is: true.User property is: maven.javadoc.applyJavadocSecurityFix. @@ -652,7 +653,7 @@ Archiver Reference. 2.6 Specifies whether to attach the generated artifact to the project -helper. Default value is: true.User property is: attach. +helper. Default value is: true.User property is: attach. @@ -666,7 +667,7 @@ helper. Default value is< Specifies whether or not the author text is included in the generated Javadocs. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#author;>author. -Default value is: true.User property is: author. +Default value is: true.User property is: author. @@ -682,7 +683,7 @@ See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#bootclasspath;>bootclasspath. -User property is: bootclasspath. +User property is: bootclasspath. @@ -711,7 +712,7 @@ Example: See Javadoc. -User property is: bootclasspathArtifacts. +User property is: bootclasspathArtifacts. @@ -730,7 +731,7 @@ eg. ![CDATA[Copyright 2005, href=http://www.mycompany.comMyCompany, Inc.a]] See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#bottom;>bottom. -Default value is: Copyright #169; {inceptionYear}#x2013;{currentYear} {organizationName}. All rights reserved..User property is: bottom. +Default value is: Copyright #169; {inceptionYear}#x2013;{currentYear} {organizationName}. All rights reserved..User property is: bottom. @@ -746,7 +747,7 @@ sentence. See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#breakiterator;>breakiterator. Since http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/whatsnew-1.4.html#summary;>Java -1.4. Default value is: false.User property is: breakiterator. +1.4. Default value is: false.User property is: breakiterator.
svn commit: r1021020 [5/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plug
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestJavadocReport.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestJavadocReport.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestJavadocReport.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -TestJavadocReport (Apache Maven Javadoc Plugin 3.0.0-M1 API) +TestJavadocReport (Apache Maven Javadoc Plugin 3.0.0 API) @@ -244,7 +244,7 @@ extends getOverview() -protected http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">Listhttp://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +protected http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">Listhttp://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true; title="class or interface in java.io">File getProjectBuildOutputDirs(http://maven.apache.org/maven-compat/apidocs/org/apache/maven/project/MavenProject.html?is-external=true; title="class or interface in org.apache.maven.project">MavenProjectp) @@ -288,7 +288,7 @@ extends AbstractJavadocMojo -buildJavadocOptions, canGenerateReport, execute, failOnError, getAttachmentClassifier, getDependencySourcePaths, getDoclint, getFiles, getJavadocOptionsFile, getOutputDirectory, getProject, getSourcePaths, isAggregator, isValidJavadocLink, logError, resolveDependency +buildJavadocOptions, canGenerateReport, execute, failOnError, getAttachmentClassifier, getDependencySourcePaths, getDoclint, getFiles, getJavadocOptionsFile, getOutputDirectory, getProject, getSourcePaths, getToolchain, isAggregator, isValidJavadocLink, logError, resolveDependency, verifyRemovedParameter @@ -453,7 +453,7 @@ extends getProjectBuildOutputDirs -protectedhttp://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">Listhttp://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetProjectBuildOutputDirs(http://maven.apache.org/maven-compat/apidocs/org/apache/maven/project/MavenProject.html?is-external=true; title="class or interface in org.apache.maven.project">MavenProjectp) +protectedhttp://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">Listhttp://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true; title="class or interface in java.io">FilegetProjectBuildOutputDirs(http://maven.apache.org/maven-compat/apidocs/org/apache/maven/project/MavenProject.html?is-external=true; title="class or interface in org.apache.maven.project">MavenProjectp) Overrides: getProjectBuildOutputDirsin classAbstractJavadocMojo Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -TestResourcesBundleMojo (Apache Maven Javadoc Plugin 3.0.0-M1 API) +TestResourcesBundleMojo (Apache Maven Javadoc Plugin 3.0.0 API) @@ -221,7 +221,7 @@ extends AbstractJavadocMojo -buildJavadocOptions, canGenerateReport, configureDependencySourceResolution, execute, executeReport, failOnError, getDependencyScopeFilter, getDependencySourcePaths, getDoclint, getDoctitle, getExecutionProjectSourceRoots, getFiles, getJavadocOptionsFile, getOutputDirectory, getOverview, getProject, getProjectBuildOutputDirs, getProjectSourceRoots, getSourcePaths, getWindowtitle, isAggregator,
svn commit: r1021020 [23/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plu
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/xref-test/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.html Fri Nov 17 17:33:38 2017 @@ -32,739 +32,709 @@ 24 import java.io.Reader; 25 import java.io.StringReader; 26 import java.util.ArrayList; -27 import java.util.List; -28 -29 import junitx.util.PrivateAccessor; +27 import java.util.Arrays; +28 import java.util.List; +29 import java.util.Properties; 30 -31 import org.apache.maven.plugin.logging.Log; -32 import org.apache.maven.plugin.testing.AbstractMojoTestCase; -33 import org.apache.maven.plugin.testing.stubs.MavenProjectStub; -34 import org.apache.maven.plugins.javadoc.AbstractFixJavadocMojo; -35 import org.apache.maven.plugins.javadoc.FixJavadocMojo; -36 import org.apache.maven.plugins.javadoc.JavadocUtil; -37 import org.apache.maven.plugins.javadoc.AbstractFixJavadocMojo.JavaEntityTags; -38 import org.apache.maven.shared.invoker.MavenInvocationException; -39 import org.codehaus.plexus.util.FileUtils; -40 import org.codehaus.plexus.util.IOUtil; -41 import org.codehaus.plexus.util.ReaderFactory; -42 import org.codehaus.plexus.util.StringUtils; -43 -44 import com.thoughtworks.qdox.JavaDocBuilder; -45 import com.thoughtworks.qdox.model.AbstractInheritableJavaEntity; -46 import com.thoughtworks.qdox.model.AbstractJavaEntity; -47 import com.thoughtworks.qdox.model.DocletTag; -48 import com.thoughtworks.qdox.model.JavaClass; -49 import com.thoughtworks.qdox.model.JavaMethod; -50 -51 /** -52 * @author a href="mailto:vincent.sive...@gmail.com; target="alexandria_uri">mailto:vincent.sive...@gmail.com"Vincent Siveton/a -53 * @version $Id: FixJavadocMojoTest.java 1752069 2016-07-10 09:58:59Z rfscholte $ -54 */ -55 public class FixJavadocMojoTest -56 extends AbstractMojoTestCase -57 { -58 /** The vm line separator */ -59 private static final String EOL = System.getProperty( "line.separator" ); -60 -61 /** flag to copy repo only one time */ -62 private static boolean TEST_REPO_CREATED = false; -63 -64 /** {@inheritDoc} */ -65 protected void setUp() -66 throws Exception -67 { -68 super.setUp(); -69 -70 createTestRepo(); -71 } -72 -73 /** -74 * Create test repository in target directory. -75 * -76 * @throws IOException if any -77 */ -78 private void createTestRepo() -79 throws IOException -80 { -81 if ( TEST_REPO_CREATED ) -82 { -83 return; -84 } -85 -86 File localRepo = new File( getBasedir(), "target/local-repo/" ); -87 localRepo.mkdirs(); -88 -89 // -- -90 // fix-test-1.0.jar -91 // -- -92 -93 File sourceDir = new File( getBasedir(), "src/test/resources/unit/fix-test/repo/" ); -94 assertTrue( sourceDir.exists() ); -95 FileUtils.copyDirectoryStructure( sourceDir, localRepo ); -96 -97 // -- -98 // fix-jdk5-test-1.0.jar -99 // -- -100 -101 sourceDir = new File( getBasedir(), "src/test/resources/unit/fix-jdk5-test/repo/" ); -102 assertTrue( sourceDir.exists() ); -103 FileUtils.copyDirectoryStructure( sourceDir, localRepo ); -104 -105 // -- -106 // fix-jdk6-test-1.0.jar -107 // -- -108 -109 sourceDir = new File( getBasedir(), "src/test/resources/unit/fix-jdk6-test/repo/" ); -110 assertTrue( sourceDir.exists() ); -111 FileUtils.copyDirectoryStructure( sourceDir, localRepo ); -112 -113 // Remove SCM files -114 ListString files = -115 FileUtils.getFileAndDirectoryNames( localRepo, FileUtils.getDefaultExcludesAsString(), null, true, -116 true, true, true ); -117 for ( String filename : files ) -118 { -119 File file = new File( filename ); -120 -121 if ( file.isDirectory() ) -122 { -123 FileUtils.deleteDirectory( file ); -124 } -125
svn commit: r1021020 [6/35] - in /websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/javadoc/ apidocs/org/apache/maven/plug
Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-summary.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-summary.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-summary.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -org.apache.maven.plugins.javadoc.options (Apache Maven Javadoc Plugin 3.0.0-M1 API) +org.apache.maven.plugins.javadoc.options (Apache Maven Javadoc Plugin 3.0.0 API) Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-tree.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-tree.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-tree.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -org.apache.maven.plugins.javadoc.options Class Hierarchy (Apache Maven Javadoc Plugin 3.0.0-M1 API) +org.apache.maven.plugins.javadoc.options Class Hierarchy (Apache Maven Javadoc Plugin 3.0.0 API) Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-use.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-use.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/options/package-use.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -Uses of Package org.apache.maven.plugins.javadoc.options (Apache Maven Javadoc Plugin 3.0.0-M1 API) +Uses of Package org.apache.maven.plugins.javadoc.options (Apache Maven Javadoc Plugin 3.0.0 API) Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/package-frame.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/package-frame.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/package-frame.html Fri Nov 17 17:33:38 2017 @@ -3,7 +3,7 @@ -org.apache.maven.plugins.javadoc (Apache Maven Javadoc Plugin 3.0.0-M1 API) +org.apache.maven.plugins.javadoc (Apache Maven Javadoc Plugin 3.0.0 API) Modified: websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/package-summary.html == --- websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/package-summary.html (original) +++ websites/production/maven/components/plugins-archives/maven-javadoc-plugin-LATEST/apidocs/org/apache/maven/plugins/javadoc/package-summary.html Fri Nov 17 17:33:38 2017 @@ -3,13 +3,13 @@ -org.apache.maven.plugins.javadoc (Apache Maven Javadoc Plugin 3.0.0-M1 API) +org.apache.maven.plugins.javadoc (Apache Maven Javadoc Plugin 3.0.0 API)