From 161a507fc98d7eb13f9f197d0859216d33a4b939 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 23 Feb 2023 17:12:16 +0100 Subject: [PATCH] [MJAVADOC-743] Drop deprecated mojo parameter The type is deprecated and parameter is redundant as LRM that is already present has the value. --- https://issues.apache.org/jira/browse/MJAVADOC-743 --- .../maven/plugins/javadoc/AbstractFixJavadocMojo.java | 9 +-------- .../maven/plugins/javadoc/AbstractJavadocMojo.java | 9 +-------- .../maven/plugins/javadoc/FixJavadocMojoTest.java | 7 +++++++ .../apache/maven/plugins/javadoc/JavadocJarTest.java | 11 ++++++++++- .../all/pom.xml | 1 - .../aggregate-resources-test-plugin-config.xml | 1 - .../aggregate-test/aggregate-test-plugin-config.xml | 1 - .../custom-configuration-plugin-config.xml | 1 - .../default-configuration-plugin-config.xml | 1 - .../docfiles-test/docfiles-test-plugin-config.xml | 1 - .../docfiles-with-java-test-plugin-config.xml | 1 - .../doclet-path-test-plugin-config.xml | 1 - .../unit/doclet-test/doclet-test-plugin-config.xml | 1 - .../file-include-exclude-plugin-config.xml | 1 - src/test/resources/unit/fix-test/pom.xml | 1 - .../header-footer-test-plugin-config.xml | 1 - .../1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom | 1 - src/test/resources/unit/helpfile-test/pom.xml | 1 - .../javaHome-test/javaHome-test-plugin-config.xml | 1 - .../javadocjar-archive-config.xml | 1 - .../javadocjar-default-plugin-config.xml | 1 - .../javadocjar-failonerror-plugin-config.xml | 1 - .../javadocjar-invalid-destdir-plugin-config.xml | 1 - .../unit/jdk5-test/jdk5-test-plugin-config.xml | 1 - .../unit/jdk6-test/jdk6-test-plugin-config.xml | 1 - .../unit/newline-test/newline-test-plugin-config.xml | 1 - .../optionsumlautencoding-test-plugin-config.xml | 1 - .../unit/pom-test/pom-test-plugin-config.xml | 1 - .../unit/proxy-test/proxy-test-plugin-config.xml | 1 - .../quotedpath'test/quotedpath-test-plugin-config.xml | 1 - .../resources-test/resources-test-plugin-config.xml | 1 - .../resources-with-excludes-test-plugin-config.xml | 1 - .../1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom | 1 - src/test/resources/unit/stylesheetfile-test/pom.xml | 1 - .../subpackages-test-plugin-config.xml | 1 - .../unit/tag-test/tag-test-plugin-config.xml | 1 - .../unit/taglet-test/taglet-test-plugin-config.xml | 1 - .../tagletArtifacts-test-plugin-config.xml | 1 - .../test-javadoc-test-plugin-config.xml | 1 - .../conflict-options-test-plugin-config.xml | 1 - .../wrong-charset-test-plugin-config.xml | 1 - .../wrong-docencoding-test-plugin-config.xml | 1 - .../wrong-encoding-test-plugin-config.xml | 1 - .../wrong-locale-test-plugin-config.xml | 1 - .../wrong-locale-with-variant-test-plugin-config.xml | 1 - 45 files changed, 19 insertions(+), 58 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java index 62426c266..4b17ffaf1 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java @@ -69,7 +69,6 @@ import org.apache.commons.text.StringEscapeUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DependencyResolutionRequiredException; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -350,12 +349,6 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo { @Parameter(property = "level", defaultValue = "protected") private String level; - /** - * The local repository where the artifacts are located, used by the tests. - */ - @Parameter(property = "localRepository") - private ArtifactRepository localRepository; - /** * Output directory where Java classes will be rewritten. */ @@ -657,7 +650,7 @@ private void executeClirr() throws MavenInvocationException { JavadocUtil.invokeMaven( getLog(), - new File(localRepository.getBasedir()), + session.getRepositorySession().getLocalRepository().getBasedir(), project.getFile(), Collections.singletonList(clirrGoal), properties, diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 2fdb2f0cd..a2ba79fd3 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -63,7 +63,6 @@ import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.execution.MavenSession; @@ -416,12 +415,6 @@ public abstract class AbstractJavadocMojo extends AbstractMojo { @Parameter(property = "resourcesArtifacts") private ResourcesArtifact[] resourcesArtifacts; - /** - * The local repository where the artifacts are located. - */ - @Parameter(property = "localRepository") - private ArtifactRepository localRepository; - /** * The projects in the reactor for aggregation report. */ @@ -5476,7 +5469,7 @@ private List getModulesLinks() throws MavenReportException { try { JavadocUtil.invokeMaven( getLog(), - new File(localRepository.getBasedir()), + session.getRepositorySession().getLocalRepository().getBasedir(), p.getFile(), Collections.singletonList(javadocGoal), null, diff --git a/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java b/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java index 84cd03e31..1488d6302 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java @@ -39,6 +39,9 @@ import org.apache.maven.shared.invoker.MavenInvocationException; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; +import org.eclipse.aether.repository.LocalRepository; import static org.apache.commons.lang3.reflect.MethodUtils.invokeMethod; @@ -496,6 +499,10 @@ private void executeMojoAndTest(File testPomBasedir, String[] clazzToCompare) th assertNotNull(mojo); MavenSession session = newMavenSession(mojo.getProject()); + ((DefaultRepositorySystemSession) session.getRepositorySession()) + .setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory() + .newInstance( + session.getRepositorySession(), new LocalRepository(new File("target/local-repo")))); // Ensure remote repo connection uses SSL File globalSettingsFile = new File(getBasedir(), "target/test-classes/unit/settings.xml"); session.getRequest().setGlobalSettingsFile(globalSettingsFile); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java index c36668f75..1e0aa19b7 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java @@ -25,12 +25,16 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.plugin.testing.stubs.MavenProjectStub; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.languages.java.version.JavaVersion; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; +import org.eclipse.aether.repository.LocalRepository; import static org.assertj.core.api.Assertions.assertThat; @@ -50,7 +54,12 @@ private JavadocJar lookupMojo(File testPom) throws Exception { currentProject.setGroupId("GROUPID"); currentProject.setArtifactId("ARTIFACTID"); - setVariableValueToObject(mojo, "session", newMavenSession(currentProject)); + MavenSession session = newMavenSession(currentProject); + ((DefaultRepositorySystemSession) session.getRepositorySession()) + .setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory() + .newInstance( + session.getRepositorySession(), new LocalRepository(new File("target/local-repo")))); + setVariableValueToObject(mojo, "session", session); return mojo; } diff --git a/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml b/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml index 6cbef91b8..2d35f1459 100644 --- a/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml +++ b/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml @@ -37,7 +37,6 @@ under the License. ISO-8859-1 - ${localRepository} ${basedir}/target/test/unit/aggregate-modules-not-in-subfolders-test/target/site/apidocs ${basedir}/target/test/unit/aggregate-modules-not-in-subfolders-test/target/javadoc-bundle-options Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API diff --git a/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml b/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml index 4b8fd43b2..b85d1179e 100644 --- a/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml +++ b/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml @@ -35,7 +35,6 @@ under the License. ISO-8859-1 - ${localRepository} ${basedir}/target/test/unit/aggregate-resources-test/target/site/apidocs ${basedir}/target/test/unit/aggregate-resources-test/target/javadoc-bundle-options Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API diff --git a/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml b/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml index 38c4014c1..a0c318b67 100644 --- a/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml +++ b/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml @@ -35,7 +35,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/aggregate-test/target/site/apidocs ${basedir}/target/test/unit/aggregate-test/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml b/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml index 097a1d247..d9d0ec174 100644 --- a/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml +++ b/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/custom-configuration/target/site/apidocs ${basedir}/target/test/unit/custom-configuration/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml b/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml index 3a1a1e5ea..ea9799f7f 100644 --- a/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml +++ b/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/default-configuration/target/site/apidocs ${basedir}/target/test/unit/default-configuration/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml b/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml index ee16ed338..a77c595e1 100644 --- a/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml +++ b/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/docfiles-test/target/site/apidocs ${basedir}/target/test/unit/docfiles-test/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml b/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml index c8fdaa560..cb7d63102 100644 --- a/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml +++ b/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/docfiles-with-java-test/target/site/apidocs ${basedir}/target/test/unit/docfiles-with-java-test/target/javadoc-bundle-options ${basedir}/src/test/resources/unit/docfiles-with-java-test/src/main diff --git a/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml b/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml index 48013b045..e3ced1510 100644 --- a/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml +++ b/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/doclet-path-test/target/site/apidocs ${basedir}/target/test/unit/doclet-path-test/target/javadoc-bundle-options UmlGraph diff --git a/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml b/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml index bd72bcedf..bf3f197ea 100644 --- a/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml +++ b/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/doclet-test/target/site/apidocs ${basedir}/target/test/unit/doclet-test/target/javadoc-bundle-options UmlGraph diff --git a/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml b/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml index 27ace18bf..628999936 100644 --- a/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml +++ b/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/file-include-exclude-test/target/site/apidocs ${basedir}/target/test/unit/file-include-exclude-test/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/fix-test/pom.xml b/src/test/resources/unit/fix-test/pom.xml index ba0273573..4ecea4f4e 100644 --- a/src/test/resources/unit/fix-test/pom.xml +++ b/src/test/resources/unit/fix-test/pom.xml @@ -43,7 +43,6 @@ maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/fix-test/target/generated 1.1-SNAPSHOT UTF-8 diff --git a/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml b/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml index b1a415be9..3793d1272 100644 --- a/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml +++ b/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/header-footer-test/target/site/apidocs ${basedir}/target/test/unit/header-footer-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/helpfile-test/artifact-helpfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom b/src/test/resources/unit/helpfile-test/artifact-helpfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom index 0d1d5e82d..0a0da4f0a 100644 --- a/src/test/resources/unit/helpfile-test/artifact-helpfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom +++ b/src/test/resources/unit/helpfile-test/artifact-helpfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom @@ -35,7 +35,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/helpfile-test/target/site/apidocs ${basedir}/src/test/resources/unit/helpfile-test/src/main/javadoc false diff --git a/src/test/resources/unit/helpfile-test/pom.xml b/src/test/resources/unit/helpfile-test/pom.xml index d3cd157cf..014927a93 100644 --- a/src/test/resources/unit/helpfile-test/pom.xml +++ b/src/test/resources/unit/helpfile-test/pom.xml @@ -35,7 +35,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/helpfile-test/target/site/apidocs ${basedir}/target/test/unit/helpfile-test/target/javadoc-bundle-options ${basedir}/src/test/resources/unit/helpfile-test/src/main/javadoc diff --git a/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml b/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml index b677a8ae4..65ef5ee35 100644 --- a/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml +++ b/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/javaHome-test/target/site/apidocs ${basedir}/target/test/unit/javaHome-test/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml b/src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml index 967e79dda..f669fd3ca 100644 --- a/src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml +++ b/src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/javadocjar-archive-config/target ${basedir}/target/test/unit/javadocjar-archive-config/target/site/apidocs ${basedir}/target/test/unit/javadocjar-archive-config/target/javadoc-bundle-options diff --git a/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml b/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml index ca525553d..28300521b 100644 --- a/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml +++ b/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/javadocjar-default/target ${basedir}/target/test/unit/javadocjar-default/target/site/apidocs ${basedir}/target/test/unit/javadocjar-default/target/javadoc-bundle-options diff --git a/src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml b/src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml index af96cfb04..a91920fce 100644 --- a/src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml +++ b/src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/javadocjar-failonerror/target ${basedir}/target/test/unit/javadocjar-failonerror/target/site/apidocs ${basedir}/target/test/unit/javadocjar-failonerror/target/javadoc-bundle-options diff --git a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml b/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml index f3b861802..638c4d24c 100644 --- a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml +++ b/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/javadocjar-invalid-destdir/target/invalid ${basedir}/target/test/unit/javadocjar-invalid-destdir/target ${basedir}/target/test/unit/javadocjar-invalid-destdir/target/site/apidocs diff --git a/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml b/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml index 3e3ce3b1f..ff0d75dbe 100644 --- a/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml +++ b/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/jdk5-test/target/site/apidocs ${basedir}/target/test/unit/jdk5-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml b/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml index 890041b86..5221029c2 100644 --- a/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml +++ b/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/jdk6-test/target/site/apidocs ${basedir}/target/test/unit/jdk6-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/newline-test/newline-test-plugin-config.xml b/src/test/resources/unit/newline-test/newline-test-plugin-config.xml index e2cf55b07..447134e23 100644 --- a/src/test/resources/unit/newline-test/newline-test-plugin-config.xml +++ b/src/test/resources/unit/newline-test/newline-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/newline-test/target/site/apidocs ${basedir}/target/test/unit/newline-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml b/src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml index 3a242f0d3..88a45552f 100644 --- a/src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml +++ b/src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/optionsumlautencoding-test/target/site/apidocs ${basedir}/target/test/unit/optionsumlautencoding-test/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/pom-test/pom-test-plugin-config.xml b/src/test/resources/unit/pom-test/pom-test-plugin-config.xml index 2f257756a..592770664 100644 --- a/src/test/resources/unit/pom-test/pom-test-plugin-config.xml +++ b/src/test/resources/unit/pom-test/pom-test-plugin-config.xml @@ -40,7 +40,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/pom-test/target/site/apidocs ${basedir}/target/test/unit/pom-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml b/src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml index b39866fdd..48307907e 100644 --- a/src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml +++ b/src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml @@ -35,7 +35,6 @@ under the License. - ${localRepository} ${basedir}/target/test/unit/proxy-test/target/site/apidocs ${basedir}/target/test/unit/proxy-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml b/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml index aa04cff5a..7e38262cc 100644 --- a/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml +++ b/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/quotedpath'test/target/site/apidocs ${basedir}/target/test/unit/quotedpath'test/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/resources-test/resources-test-plugin-config.xml b/src/test/resources/unit/resources-test/resources-test-plugin-config.xml index a3008d8e9..f379b7e8d 100644 --- a/src/test/resources/unit/resources-test/resources-test-plugin-config.xml +++ b/src/test/resources/unit/resources-test/resources-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/resources-test/target/site/apidocs ${basedir}/target/test/unit/resources-test/target/javadoc-bundle-options Maven Javadoc Plugin resources 1.0-SNAPSHOT API diff --git a/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml b/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml index 117895c69..4ebfbf1cd 100644 --- a/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml +++ b/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/resources-with-excludes-test/target/site/apidocs ${basedir}/target/test/unit/resources-with-excludes-test/target/javadoc-bundle-options Maven Javadoc Plugin resources 1.0-SNAPSHOT API diff --git a/src/test/resources/unit/stylesheetfile-test/artifact-stylesheetfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom b/src/test/resources/unit/stylesheetfile-test/artifact-stylesheetfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom index 226bf39b1..58c7b9854 100644 --- a/src/test/resources/unit/stylesheetfile-test/artifact-stylesheetfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom +++ b/src/test/resources/unit/stylesheetfile-test/artifact-stylesheetfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom @@ -35,7 +35,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/stylesheetfile-test/target/site/apidocs ${basedir}/src/test/resources/unit/stylesheetfile-test/src/main/javadoc false diff --git a/src/test/resources/unit/stylesheetfile-test/pom.xml b/src/test/resources/unit/stylesheetfile-test/pom.xml index 0caded248..978e62a2b 100644 --- a/src/test/resources/unit/stylesheetfile-test/pom.xml +++ b/src/test/resources/unit/stylesheetfile-test/pom.xml @@ -35,7 +35,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/stylesheetfile-test/target/site/apidocs ${basedir}/target/test/unit/stylesheetfile-test/target/javadoc-bundle-options ${basedir}/src/test/resources/unit/stylesheetfile-test/src/main/javadoc diff --git a/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml b/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml index 2ec1e043e..a6b046760 100644 --- a/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml +++ b/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/subpackages-test/target/site/apidocs ${basedir}/target/test/unit/subpackages-test/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/tag-test/tag-test-plugin-config.xml b/src/test/resources/unit/tag-test/tag-test-plugin-config.xml index b49d5042f..eb8b6e5ed 100644 --- a/src/test/resources/unit/tag-test/tag-test-plugin-config.xml +++ b/src/test/resources/unit/tag-test/tag-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/tag-test/target/site/apidocs ${basedir}/target/test/unit/tag-test/target/javadoc-bundle-options Maven Javadoc Plugin tag 1.0-SNAPSHOT API diff --git a/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml b/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml index c9d398823..ef6dbcacb 100644 --- a/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml +++ b/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/taglet-test/target/site/apidocs ${basedir}/target/test/unit/taglet-test/target/javadoc-bundle-options org.tullmann.taglets.ToDo diff --git a/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml b/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml index 8639b5575..99845e3c7 100644 --- a/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml +++ b/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/tagletArtifacts-test/target/site/apidocs ${basedir}/target/test/unit/tagletArtifacts-test/target/javadoc-bundle-options false diff --git a/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml b/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml index 0cb21dab0..815532972 100644 --- a/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml +++ b/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml @@ -40,7 +40,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/test-javadoc-test/target/site/apidocs ${basedir}/target/test/unit/test-javadoc-test/target/javadoc-bundle-options Maven Test Javadoc Plugin aggregate resources 1.0-SNAPSHOT API diff --git a/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml index 07c343c56..4999e7d77 100644 --- a/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/validate-options-test/target/site/apidocs ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml index 2b4381bfb..c65279d50 100644 --- a/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/validate-options-test/target/site/apidocs ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml index 5b744bbb2..35e1686c6 100644 --- a/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/validate-options-test/target/site/apidocs ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml index a60ddfdc6..a484eb857 100644 --- a/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/validate-options-test/target/site/apidocs ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml index d94e0c8ab..f8c564af9 100644 --- a/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/validate-options-test/target/site/apidocs ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml index 55e8965e2..4ddf68eaa 100644 --- a/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml @@ -34,7 +34,6 @@ under the License. maven-javadoc-plugin - ${localRepository} ${basedir}/target/test/unit/validate-options-test/target/site/apidocs ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected