This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
The following commit(s) were added to refs/heads/master by this push:
new ecd4bae Migrate to JUnit 5, drop usage of AbstractMojoTestCase
ecd4bae is described below
commit ecd4bae4288685f5cdee6187d812ac7e3bd78768
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Wed Dec 31 18:22:54 2025 +0100
Migrate to JUnit 5, drop usage of AbstractMojoTestCase
---
maven-jxr-plugin/pom.xml | 45 ++--
.../maven/plugin/jxr/AbstractJxrTestCase.java | 179 --------------
.../plugin/jxr/DependencyArtifactStubFactory.java | 70 ------
.../org/apache/maven/plugin/jxr/JxrReportTest.java | 259 +++++++++++++++------
.../apache/maven/plugin/jxr/JxrTestReportTest.java | 45 +++-
.../stubs/AggregateSubmodule1MavenProjectStub.java | 49 ----
.../stubs/AggregateSubmodule2MavenProjectStub.java | 59 -----
.../jxr/stubs/AggregateTestMavenProjectStub.java | 82 -------
.../jxr/stubs/DefaultArtifactHandlerStub.java | 40 ----
.../DefaultConfigurationMavenProjectStub.java | 81 -------
.../ExcludeConfigurationMavenProjectStub.java | 81 -------
.../IncludeConfigurationMavenProjectStub.java | 81 -------
.../plugin/jxr/stubs/JxrPluginArtifactStub.java | 97 --------
.../maven/plugin/jxr/stubs/JxrProjectStub.java | 65 ------
.../jxr/stubs/NoJavadocDirMavenProjectStub.java | 81 -------
...NoJavadocLinkConfigurationMavenProjectStub.java | 81 -------
.../plugin/jxr/stubs/PomMavenProjectStub.java | 95 --------
.../jxr/stubs/TestSourceDirMavenProjectStub.java | 71 ------
.../aggregate-test-plugin-config.xml | 13 +-
.../submodule1/aggregate-test-plugin-config.xml | 33 ---
.../submodule2/aggregate-test-plugin-config.xml | 33 ---
.../default-configuration-plugin-config-4.xml | 7 +-
.../default-configuration-plugin-config-6.xml | 7 +-
.../default-configuration-plugin-config-7.xml | 7 +-
.../default-configuration-plugin-config-8.xml | 7 +-
.../default-configuration-plugin-config.xml | 7 +-
.../exception-test-plugin-config.xml | 7 +-
.../exclude-configuration-plugin-config.xml | 7 +-
.../include-configuration-plugin-config.xml | 7 +-
.../nojavadocdir-test-plugin-config.xml | 7 +-
.../nojavadoclink-configuration-plugin-config.xml | 7 +-
.../unit/pom-test/pom-test-plugin-config.xml | 40 ----
.../unit/pom-test/src/main/java/maven/App.java | 32 ---
.../unit/pom-test/src/test/java/maven/AppTest.java | 25 --
.../testsourcedir-test-plugin-config.xml | 6 +-
35 files changed, 269 insertions(+), 1544 deletions(-)
diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index 8194d1f..34f9278 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -114,64 +114,46 @@ under the License.
<!-- testing -->
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-api</artifactId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-impl</artifactId>
+ <artifactId>maven-resolver-transport-file</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-connector-basic</artifactId>
+ <artifactId>maven-resolver-transport-http</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-wagon</artifactId>
- <version>${resolverVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>${wagonVersion}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>4.11.0</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@@ -221,7 +203,12 @@ under the License.
</goals>
<configuration>
<failOnWarning>true</failOnWarning>
-
<ignoredDependencies>org.apache.maven:maven-compat:*,org.apache.maven.resolver:maven-resolver-connector-basic:*,org.apache.maven.resolver:maven-resolver-transport-wagon:*,org.apache.maven.wagon:wagon-http-lightweight:*,org.junit.vintage:*,org.slf4j:slf4j-simple</ignoredDependencies>
+ <ignoredUnusedDeclaredDependencies>
+
<dependency>org.apache.maven.resolver:maven-resolver-connector-basic</dependency>
+
<dependency>org.apache.maven.resolver:maven-resolver-transport-file</dependency>
+
<dependency>org.apache.maven.resolver:maven-resolver-transport-http</dependency>
+ <dependency>org.slf4j:slf4j-simple</dependency>
+ </ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
</executions>
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/AbstractJxrTestCase.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/AbstractJxrTestCase.java
deleted file mode 100644
index c7a7c6a..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/AbstractJxrTestCase.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.LegacySupport;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.ArtifactStubFactory;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
-import org.eclipse.aether.repository.LocalRepository;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * Abstract class to test reports generation.
- */
-public abstract class AbstractJxrTestCase extends AbstractMojoTestCase {
- private ArtifactStubFactory artifactStubFactory;
-
- /**
- * The current project to be test.
- */
- private MavenProject testMavenProject;
-
- @BeforeEach
- public void setUp() throws Exception {
- // required for mojo lookups to work
- super.setUp();
-
- artifactStubFactory = new
DependencyArtifactStubFactory(getTestFile("target"), true, false);
- artifactStubFactory.getWorkingDir().mkdirs();
- }
-
- @AfterEach
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- /**
- * Gets the current Maven project.
- *
- * @return the maven project
- */
- protected MavenProject getTestMavenProject() {
- return testMavenProject;
- }
-
- /**
- * Gets the generated report as file in the test maven project.
- *
- * @param name the name of the report
- * @return the generated report as file
- * @throws IOException if the return file doesnt exist
- */
- protected File getGeneratedReport(String name) throws IOException {
- String outputDirectory =
- getBasedir() + "/target/test/unit/" +
getTestMavenProject().getArtifactId();
-
- File report = new File(outputDirectory, name);
- if (!report.exists()) {
- throw new IOException("File not found. Attempted: " + report);
- }
-
- return report;
- }
-
- /**
- * Generate the report and return the generated file
- *
- * @param goal the mojo goal
- * @param pluginXml the name of the XML file in
"src/test/resources/plugin-configs/".
- * @return the generated HTML file
- * @throws Exception if any
- */
- protected File generateReport(String goal, String pluginXml) throws
Exception {
- File pluginXmlFile = new File(getBasedir(), "src/test/resources/unit/"
+ pluginXml);
- AbstractJxrReport mojo = createReportMojo(goal, pluginXmlFile);
- return generateReport(mojo, pluginXmlFile);
- }
-
- protected AbstractJxrReport createReportMojo(String goal, File
pluginXmlFile) throws Exception {
- AbstractJxrReport mojo = (AbstractJxrReport) lookupMojo(goal,
pluginXmlFile);
- assertNotNull("Mojo not found.", mojo);
-
- LegacySupport legacySupport = lookup(LegacySupport.class);
- legacySupport.setSession(newMavenSession(new MavenProjectStub()));
- DefaultRepositorySystemSession repoSession =
- (DefaultRepositorySystemSession)
legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager(new
SimpleLocalRepositoryManagerFactory()
- .newInstance(repoSession, new
LocalRepository(artifactStubFactory.getWorkingDir())));
-
- List<MavenProject> reactorProjects =
- mojo.getReactorProjects() != null ? mojo.getReactorProjects()
: Collections.emptyList();
-
- setVariableValueToObject(mojo, "mojoExecution",
getMockMojoExecution());
- setVariableValueToObject(mojo, "session", legacySupport.getSession());
- setVariableValueToObject(mojo, "repoSession",
legacySupport.getRepositorySession());
- setVariableValueToObject(mojo, "reactorProjects", reactorProjects);
- setVariableValueToObject(
- mojo, "remoteProjectRepositories",
mojo.getProject().getRemoteProjectRepositories());
- setVariableValueToObject(
- mojo, "siteDirectory", new
File(mojo.getProject().getBasedir(), "src/site"));
- return mojo;
- }
-
- protected File generateReport(AbstractJxrReport mojo, File pluginXmlFile)
throws Exception {
- mojo.execute();
-
- ProjectBuilder builder = lookup(ProjectBuilder.class);
-
- ProjectBuildingRequest buildingRequest = new
DefaultProjectBuildingRequest();
-
buildingRequest.setRepositorySession(lookup(LegacySupport.class).getRepositorySession());
-
- testMavenProject = builder.build(pluginXmlFile,
buildingRequest).getProject();
-
- File outputDir = mojo.getReportOutputDirectory();
- String filename = mojo.getOutputPath() + ".html";
-
- return new File(outputDir, filename);
- }
-
- /**
- * Read the contents of the specified file object into a string.
- */
- protected String readFile(File xrefTestDir, String fileName) throws
IOException {
- return new
String(Files.readAllBytes(xrefTestDir.toPath().resolve(fileName)));
- }
-
- private MojoExecution getMockMojoExecution() {
- MojoDescriptor md = new MojoDescriptor();
- md.setGoal(getGoal());
-
- MojoExecution me = new MojoExecution(md);
-
- PluginDescriptor pd = new PluginDescriptor();
- Plugin p = new Plugin();
- p.setGroupId("org.apache.maven.plugins");
- p.setArtifactId("maven-jxr-plugin");
- pd.setPlugin(p);
- md.setPluginDescriptor(pd);
-
- return me;
- }
-
- protected abstract String getGoal();
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/DependencyArtifactStubFactory.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/DependencyArtifactStubFactory.java
deleted file mode 100644
index 7c7ce08..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/DependencyArtifactStubFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.plugin.testing.ArtifactStubFactory;
-
-public class DependencyArtifactStubFactory extends ArtifactStubFactory {
- private boolean flattenedPath = true;
-
- public DependencyArtifactStubFactory(File theWorkingDir, boolean
theCreateFiles, boolean flattenedPath) {
- this(theWorkingDir, theCreateFiles);
- this.flattenedPath = flattenedPath;
- }
-
- public DependencyArtifactStubFactory(File theWorkingDir, boolean
theCreateFiles) {
- super(theWorkingDir, theCreateFiles);
- }
-
- @Override
- public Artifact createArtifact(
- String groupId,
- String artifactId,
- VersionRange versionRange,
- String scope,
- String type,
- String classifier,
- boolean optional)
- throws IOException {
- File workingDir = getWorkingDir();
-
- if (!flattenedPath) {
- // don't use flatten directories, won't happen at runtime
- String path = groupId.replace('.', '/')
- + '/'
- + artifactId
- + '/'
- + ArtifactUtils.toSnapshotVersion(
- versionRange.getRecommendedVersion().toString());
- setWorkingDir(new File(workingDir, path));
- }
-
- Artifact artifact = super.createArtifact(groupId, artifactId,
versionRange, scope, type, classifier, optional);
-
- setWorkingDir(workingDir);
-
- return artifact;
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
index b7aa189..3db5b1f 100644
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
+++
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
@@ -18,37 +18,72 @@
*/
package org.apache.maven.plugin.jxr;
+import javax.inject.Inject;
+
import java.io.File;
+import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
import java.util.Locale;
+import org.apache.maven.api.plugin.testing.Basedir;
+import org.apache.maven.api.plugin.testing.InjectMojo;
+import org.apache.maven.api.plugin.testing.MojoTest;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
+import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
+import static org.apache.maven.api.plugin.testing.MojoExtension.getTestFile;
+import static org.apache.maven.api.plugin.testing.MojoExtension.getTestPath;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.when;
/**
* @author <a href="mailto:[email protected]">Maria Odea Ching</a>
* @author <a href="mailto:[email protected]">Dennis Lundberg</a>
*/
-class JxrReportTest extends AbstractJxrTestCase {
+@MojoTest(realRepositorySession = true)
+class JxrReportTest {
+
+ @Inject
+ private MavenSession session;
+
+ @BeforeEach
+ void setUp() {
+ // Set a local repository path to common location for all tests
+ session.getRequest()
+ .setLocalRepositoryPath(Paths.get(getBasedir())
+ .getParent()
+ .resolve("local-repo-unit")
+ .toString());
+ }
+
/**
* Test the plugin with original configuration
*/
@Test
- void defaultConfiguration() throws Exception {
- File resourcesDir = new File(getBasedir(),
"src/test/resources/unit/default-configuration");
-
- File outputDir = new File(getBasedir(),
"target/test/unit/default-configuration/target/site");
+ @Basedir("/unit/default-configuration")
+ @InjectMojo(goal = "jxr", pom = "default-configuration-plugin-config.xml")
+ void defaultConfiguration(JxrReport mojo) throws Exception {
+ File outputDir = getTestFile("target/site");
File xrefDir = new File(outputDir, "xref");
- FileUtils.copyDirectory(new File(resourcesDir, "javadoc-files"),
outputDir);
+ FileUtils.copyDirectory(getTestFile("javadoc-files"), outputDir);
- generateReport(getGoal(),
"default-configuration/default-configuration-plugin-config.xml");
+ mojo.execute();
// check if xref files were generated
assertTrue(new File(xrefDir, "allclasses-frame.html").exists());
@@ -76,15 +111,16 @@ class JxrReportTest extends AbstractJxrTestCase {
* Test the plugin with jdk-4 configuration
*/
@Test
- void jdk4Configuration() throws Exception {
- File resourcesDir = new File(getBasedir(),
"src/test/resources/unit/default-configuration");
+ @Basedir("/unit/default-configuration")
+ @InjectMojo(goal = "jxr", pom =
"default-configuration-plugin-config-4.xml")
+ void jdk4Configuration(JxrReport mojo) throws Exception {
- File outputDir = new File(getBasedir(),
"target/test/unit/default-configuration/target/site/4");
+ File outputDir = getTestFile("target/site/4");
File xrefDir = new File(outputDir, "xref");
- FileUtils.copyDirectory(new File(resourcesDir, "javadoc-files"),
outputDir);
+ FileUtils.copyDirectory(getTestFile("javadoc-files"), outputDir);
- generateReport(getGoal(),
"default-configuration/default-configuration-plugin-config-4.xml");
+ mojo.execute();
// check if xref files were generated
assertTrue(new File(xrefDir, "allclasses-frame.html").exists());
@@ -112,15 +148,16 @@ class JxrReportTest extends AbstractJxrTestCase {
* Test the plugin with jdk-6 configuration
*/
@Test
- void jdk6Configuration() throws Exception {
- File resourcesDir = new File(getBasedir(),
"src/test/resources/unit/default-configuration");
+ @Basedir("/unit/default-configuration")
+ @InjectMojo(goal = "jxr", pom =
"default-configuration-plugin-config-6.xml")
+ void jdk6Configuration(JxrReport mojo) throws Exception {
- File outputDir = new File(getBasedir(),
"target/test/unit/default-configuration/target/site/6");
+ File outputDir = getTestFile("target/site/6");
File xrefDir = new File(outputDir, "xref");
- FileUtils.copyDirectory(new File(resourcesDir, "javadoc-files"),
outputDir);
+ FileUtils.copyDirectory(getTestFile("javadoc-files"), outputDir);
- generateReport(getGoal(),
"default-configuration/default-configuration-plugin-config-6.xml");
+ mojo.execute();
// check if xref files were generated
assertTrue(new File(xrefDir, "allclasses-frame.html").exists());
@@ -148,15 +185,16 @@ class JxrReportTest extends AbstractJxrTestCase {
* Test the plugin with jdk-7 configuration
*/
@Test
- void jdk7Configuration() throws Exception {
- File resourcesDir = new File(getBasedir(),
"src/test/resources/unit/default-configuration");
+ @Basedir("/unit/default-configuration")
+ @InjectMojo(goal = "jxr", pom =
"default-configuration-plugin-config-7.xml")
+ void jdk7Configuration(JxrReport mojo) throws Exception {
- File outputDir = new File(getBasedir(),
"target/test/unit/default-configuration/target/site/7");
+ File outputDir = getTestFile("target/site/7");
File xrefDir = new File(outputDir, "xref");
- FileUtils.copyDirectory(new File(resourcesDir, "javadoc-files"),
outputDir);
+ FileUtils.copyDirectory(getTestFile("javadoc-files"), outputDir);
- generateReport(getGoal(),
"default-configuration/default-configuration-plugin-config-7.xml");
+ mojo.execute();
// check if xref files were generated
assertTrue(new File(xrefDir, "allclasses-frame.html").exists());
@@ -188,15 +226,16 @@ class JxrReportTest extends AbstractJxrTestCase {
* Test the plugin with jdk-8 configuration
*/
@Test
- void jdk8Configuration() throws Exception {
- File resourcesDir = new File(getBasedir(),
"src/test/resources/unit/default-configuration");
+ @Basedir("/unit/default-configuration")
+ @InjectMojo(goal = "jxr", pom =
"default-configuration-plugin-config-8.xml")
+ void jdk8Configuration(JxrReport mojo) throws Exception {
- File outputDir = new File(getBasedir(),
"target/test/unit/default-configuration/target/site/8");
+ File outputDir = getTestFile("target/site/8");
File xrefDir = new File(outputDir, "xref");
- FileUtils.copyDirectory(new File(resourcesDir, "javadoc-files"),
outputDir);
+ FileUtils.copyDirectory(getTestFile("javadoc-files"), outputDir);
- generateReport(getGoal(),
"default-configuration/default-configuration-plugin-config-8.xml");
+ mojo.execute();
// check if xref files were generated
assertTrue(new File(xrefDir, "allclasses-frame.html").exists());
@@ -224,10 +263,12 @@ class JxrReportTest extends AbstractJxrTestCase {
* Test when javadocLink is disabled in the configuration
*/
@Test
- void noJavadocLink() throws Exception {
- generateReport(getGoal(),
"nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml");
+ @Basedir("/unit/nojavadoclink-configuration")
+ @InjectMojo(goal = "jxr", pom =
"nojavadoclink-configuration-plugin-config.xml")
+ void noJavadocLink(JxrReport mojo) throws Exception {
+ mojo.execute();
- File xrefDir = new File(getBasedir(),
"target/test/unit/nojavadoclink-configuration/target/site/xref");
+ File xrefDir = getTestFile("target/site/xref");
// check if xref files were generated
assertTrue(new File(xrefDir, "allclasses-frame.html").exists());
@@ -258,36 +299,90 @@ class JxrReportTest extends AbstractJxrTestCase {
assertTrue(str.contains("text/html; charset=ISO-8859-1"));
}
- /**
- * Method for testing plugin when aggregate parameter is set to true
- */
- @Test
- void aggregate() throws Exception {
- generateReport(getGoal(),
"aggregate-test/aggregate-test-plugin-config.xml");
-
- File xrefDir = new File(getBasedir(),
"target/test/unit/aggregate-test/target/site/xref");
-
- // check if xref files were generated for submodule1
- assertTrue(new File(xrefDir,
"aggregate/test/submodule1/package-frame.html").exists());
- assertTrue(new File(xrefDir,
"aggregate/test/submodule1/package-summary.html").exists());
- assertTrue(new File(xrefDir,
"aggregate/test/submodule1/Submodule1App.html").exists());
- assertTrue(new File(xrefDir,
"aggregate/test/submodule1/Submodule1AppSample.html").exists());
-
- // check if xref files were generated for submodule2
- assertTrue(new File(xrefDir,
"aggregate/test/submodule2/package-frame.html").exists());
- assertTrue(new File(xrefDir,
"aggregate/test/submodule2/package-summary.html").exists());
- assertTrue(new File(xrefDir,
"aggregate/test/submodule2/Submodule2App.html").exists());
- assertTrue(new File(xrefDir,
"aggregate/test/submodule2/Submodule2AppSample.html").exists());
- }
+ @Nested
+ class AggregateTest {
+
+ @Inject
+ private MavenProject project;
+
+ @Inject
+ private MavenSession session;
+
+ @Inject
+ private ArtifactHandlerManager artifactHandlerManager;
+
+ @BeforeEach
+ void setup() {
+ project.setExecutionRoot(true);
+ project.setArtifact(new DefaultArtifact(
+ project.getGroupId(),
+ project.getArtifactId(),
+ project.getVersion(),
+ "compile",
+ "pom",
+ null,
+ artifactHandlerManager.getArtifactHandler("pom")));
+
+ MavenProject stub1 = new MavenProject();
+ stub1.setArtifact(new DefaultArtifact(
+ project.getGroupId(),
+ "sub1",
+ project.getVersion(),
+ "compile",
+ "jr",
+ null,
+ artifactHandlerManager.getArtifactHandler("jar")));
+ stub1.addCompileSourceRoot(getTestPath("submodule1"));
+
+ MavenProject stub2 = new MavenProject();
+ stub2.setArtifact(new DefaultArtifact(
+ project.getGroupId(),
+ "sub2",
+ project.getVersion(),
+ "compile",
+ "jar",
+ null,
+ artifactHandlerManager.getArtifactHandler("jar")));
+ stub2.addCompileSourceRoot(getTestPath("submodule2"));
+
+ when(session.getProjects()).thenReturn(Arrays.asList(project,
stub1, stub2));
+ }
+ /**
+ * Method for testing plugin when aggregate parameter is set to true
+ */
+ @Test
+ @Basedir("/unit/aggregate-test")
+ @InjectMojo(goal = "aggregate", pom =
"aggregate-test-plugin-config.xml")
+ void aggregate(AggregatorJxrReport mojo) throws Exception {
+
+ mojo.execute();
+
+ File xrefDir = getTestFile("target/site/xref");
+
+ // check if xref files were generated for submodule1
+ assertTrue(new File(xrefDir,
"aggregate/test/submodule1/package-frame.html").exists());
+ assertTrue(new File(xrefDir,
"aggregate/test/submodule1/package-summary.html").exists());
+ assertTrue(new File(xrefDir,
"aggregate/test/submodule1/Submodule1App.html").exists());
+ assertTrue(new File(xrefDir,
"aggregate/test/submodule1/Submodule1AppSample.html").exists());
+
+ // check if xref files were generated for submodule2
+ assertTrue(new File(xrefDir,
"aggregate/test/submodule2/package-frame.html").exists());
+ assertTrue(new File(xrefDir,
"aggregate/test/submodule2/package-summary.html").exists());
+ assertTrue(new File(xrefDir,
"aggregate/test/submodule2/Submodule2App.html").exists());
+ assertTrue(new File(xrefDir,
"aggregate/test/submodule2/Submodule2AppSample.html").exists());
+ }
+ }
/**
* Method for testing plugin when the specified javadocDir does not exist
*/
@Test
- void noJavadocDir() throws Exception {
- generateReport(getGoal(),
"nojavadocdir-test/nojavadocdir-test-plugin-config.xml");
+ @Basedir("/unit/nojavadocdir-test")
+ @InjectMojo(goal = "jxr", pom = "nojavadocdir-test-plugin-config.xml")
+ void noJavadocDir(JxrReport mojo) throws Exception {
+ mojo.execute();
- File xrefDir = new File(getBasedir(),
"target/test/unit/nojavadocdir-test/target/site/xref");
+ File xrefDir = getTestFile("target/site/xref");
// check if there's a link to the javadoc files
String str = readFile(xrefDir, "nojavadocdir/test/AppSample.html");
@@ -301,10 +396,12 @@ class JxrReportTest extends AbstractJxrTestCase {
* Test the plugin with an exclude configuration.
*/
@Test
- void exclude() throws Exception {
- generateReport(getGoal(),
"exclude-configuration/exclude-configuration-plugin-config.xml");
+ @Basedir("/unit/exclude-configuration")
+ @InjectMojo(goal = "jxr", pom = "exclude-configuration-plugin-config.xml")
+ void exclude(JxrReport mojo) throws Exception {
+ mojo.execute();
- Path xrefDir = new File(getBasedir(),
"target/test/unit/exclude-configuration/target/site/xref").toPath();
+ Path xrefDir = getTestFile("target/site/xref").toPath();
// check that the non-excluded xref files were generated
assertTrue(Files.exists(xrefDir.resolve("exclude/configuration/App.html")));
@@ -317,10 +414,12 @@ class JxrReportTest extends AbstractJxrTestCase {
* Test the plugin with an include configuration.
*/
@Test
- void include() throws Exception {
- generateReport(getGoal(),
"include-configuration/include-configuration-plugin-config.xml");
+ @Basedir("/unit/include-configuration")
+ @InjectMojo(goal = "jxr", pom = "include-configuration-plugin-config.xml")
+ void include(JxrReport mojo) throws Exception {
+ mojo.execute();
- Path xrefDir = new File(getBasedir(),
"target/test/unit/include-configuration/target/site/xref").toPath();
+ Path xrefDir = getTestFile("target/site/xref").toPath();
// check that the included xref files were generated
assertTrue(Files.exists(xrefDir.resolve("include/configuration/App.html")));
@@ -330,28 +429,34 @@ class JxrReportTest extends AbstractJxrTestCase {
}
@Test
- void exceptions() {
- try {
- generateReport(getGoal(),
"default-configuration/exception-test-plugin-config.xml");
+ @Basedir("/unit/default-configuration")
+ @InjectMojo(goal = "jxr", pom = "exception-test-plugin-config.xml")
+ void exceptions(JxrReport mojo) {
+
+ MojoExecutionException exception =
assertThrows(MojoExecutionException.class, mojo::execute);
+
+ boolean hasExpectedMessage = false;
+ Throwable throwable = exception;
+
+ while (throwable != null) {
+ if (throwable.getMessage().contains("Unable to find resource
'temp/index.vm'")) {
+ hasExpectedMessage = true;
+ break;
+ }
+ throwable = throwable.getCause();
+ }
- fail("Must throw exception");
- } catch (Exception e) {
- assertTrue(true);
+ if (!hasExpectedMessage) {
+ fail(
+ "Expected exception message [Unable to find resource
'temp/index.vm'] not found in the exception chain.",
+ exception);
}
}
/**
- * Test the jxr for a POM project.
+ * Read the contents of the specified file object into a string.
*/
- @Test
- void pom() throws Exception {
- generateReport(getGoal(), "pom-test/pom-test-plugin-config.xml");
-
- assertFalse(new File(getBasedir(),
"target/test/unit/pom-test").exists());
- }
-
- @Override
- protected String getGoal() {
- return "jxr";
+ private String readFile(File xrefTestDir, String fileName) throws
IOException {
+ return new
String(Files.readAllBytes(xrefTestDir.toPath().resolve(fileName)));
}
}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java
index 350ab1c..7f5d2a2 100644
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java
+++
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java
@@ -18,25 +18,54 @@
*/
package org.apache.maven.plugin.jxr;
+import javax.inject.Inject;
+
import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import org.apache.maven.api.plugin.testing.Basedir;
+import org.apache.maven.api.plugin.testing.InjectMojo;
+import org.apache.maven.api.plugin.testing.MojoTest;
+import org.apache.maven.execution.MavenSession;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
+import static org.apache.maven.api.plugin.testing.MojoExtension.getTestFile;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author <a href="mailto:[email protected]">Maria Odea Ching</a>
*/
-class JxrTestReportTest extends AbstractJxrTestCase {
+@MojoTest(realRepositorySession = true)
+class JxrTestReportTest {
+
+ @Inject
+ private MavenSession session;
+
+ @BeforeEach
+ void setUp() {
+ // Set a local repository path to common location for all tests
+ session.getRequest()
+ .setLocalRepositoryPath(Paths.get(getBasedir())
+ .getParent()
+ .resolve("local-repo-unit")
+ .toString());
+ }
+
/**
* Method to test when the source dir is the test source dir
*/
@Test
- void sourceDir() throws Exception {
- generateReport(getGoal(),
"testsourcedir-test/testsourcedir-test-plugin-config.xml");
+ @Basedir("/unit/testsourcedir-test")
+ @InjectMojo(goal = "test-jxr", pom =
"testsourcedir-test-plugin-config.xml")
+ void sourceDir(JxrTestReport mojo) throws Exception {
+ mojo.execute();
- File xrefTestDir = new File(getBasedir(),
"target/test/unit/testsourcedir-test/target/site/xref-test");
+ File xrefTestDir = getTestFile("target/site/xref-test");
// check if the jxr docs were generated
assertTrue(new File(xrefTestDir,
"testsourcedir/test/AppSampleTest.html").exists());
@@ -57,8 +86,10 @@ class JxrTestReportTest extends AbstractJxrTestCase {
assertFalse(str.toLowerCase().contains("/apidocs/testsourcedir/test/App.html\"".toLowerCase()));
}
- @Override
- protected String getGoal() {
- return "test-jxr";
+ /**
+ * Read the contents of the specified file object into a string.
+ */
+ private String readFile(File xrefTestDir, String fileName) throws
IOException {
+ return new
String(Files.readAllBytes(xrefTestDir.toPath().resolve(fileName)));
}
}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule1MavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule1MavenProjectStub.java
deleted file mode 100644
index 4b35e5b..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule1MavenProjectStub.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class AggregateSubmodule1MavenProjectStub extends MavenProjectStub {
-
- public AggregateSubmodule1MavenProjectStub() {
- setArtifactId("aggregate-test-submodule1");
- setGroupId("aggregate.test");
- setVersion("1.0-SNAPSHOT");
- setPackaging("jar");
- setInceptionYear("2006");
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(
- basedir +
"/src/test/resources/unit/aggregate-test/submodule1/aggregate/test/submodule1");
- setCompileSourceRoots(compileSourceRoots);
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule2MavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule2MavenProjectStub.java
deleted file mode 100644
index 5560cb0..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule2MavenProjectStub.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class AggregateSubmodule2MavenProjectStub extends MavenProjectStub {
- private List<ReportPlugin> reportPlugins = new ArrayList<>();
-
- public AggregateSubmodule2MavenProjectStub() {
- setArtifactId("aggregate-test-submodule2");
- setGroupId("aggregate.test");
- setVersion("1.0-SNAPSHOT");
- setPackaging("jar");
- setInceptionYear("2006");
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(
- basedir +
"/src/test/resources/unit/aggregate-test/submodule2/aggregate/test/submodule2");
- setCompileSourceRoots(compileSourceRoots);
-
- // set the report plugins
- reportPlugins = new ArrayList<>();
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- }
-
- @Override
- public List<ReportPlugin> getReportPlugins() {
- return reportPlugins;
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java
deleted file mode 100644
index e0bff73..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class AggregateTestMavenProjectStub extends JxrProjectStub {
- private List<ReportPlugin> reportPlugins = new ArrayList<>();
-
- public AggregateTestMavenProjectStub() {
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
-
- try (InputStream is = Files.newInputStream(new File(getBasedir() + "/"
+ getPOM()).toPath())) {
- model = pomReader.read(is);
- setModel(model);
- } catch (Exception ignored) {
- }
-
- setArtifactId(model.getArtifactId());
- setGroupId(model.getGroupId());
- setVersion(model.getVersion());
- setPackaging(model.getPackaging());
- setInceptionYear(model.getInceptionYear());
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir + "/aggregate/test");
- setCompileSourceRoots(compileSourceRoots);
-
- // set the report plugins
- reportPlugins = new ArrayList<>(model.getReporting().getPlugins());
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- setExecutionRoot(true);
- }
-
- @Override
- public List<ReportPlugin> getReportPlugins() {
- return reportPlugins;
- }
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/aggregate-test");
- }
-
- @Override
- protected String getPOM() {
- return "aggregate-test-plugin-config.xml";
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultArtifactHandlerStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultArtifactHandlerStub.java
deleted file mode 100644
index dff3e3e..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultArtifactHandlerStub.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class DefaultArtifactHandlerStub extends DefaultArtifactHandler {
- private String language;
-
- public String getLanguage() {
- if (language == null) {
- language = "java";
- }
-
- return language;
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java
deleted file mode 100644
index 894a062..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class DefaultConfigurationMavenProjectStub extends JxrProjectStub {
- private List<ReportPlugin> reportPlugins = new ArrayList<>();
-
- public DefaultConfigurationMavenProjectStub() {
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
-
- try (InputStream is = Files.newInputStream(new File(getBasedir() + "/"
+ getPOM()).toPath())) {
- model = pomReader.read(is);
- setModel(model);
- } catch (Exception ignored) {
- }
-
- setArtifactId(model.getArtifactId());
- setGroupId(model.getGroupId());
- setVersion(model.getVersion());
- setPackaging(model.getPackaging());
- setInceptionYear(model.getInceptionYear());
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir + "/def/configuration");
- setCompileSourceRoots(compileSourceRoots);
-
- // set the report plugins
- reportPlugins = new ArrayList<>(model.getReporting().getPlugins());
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- }
-
- @Override
- public List<ReportPlugin> getReportPlugins() {
- return reportPlugins;
- }
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/default-configuration");
- }
-
- @Override
- protected String getPOM() {
- return "default-configuration-plugin-config.xml";
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java
deleted file mode 100644
index 2572ee6..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-/**
- * @author <a href="mailto:[email protected]">Dennis Lundberg</a>
- */
-public class ExcludeConfigurationMavenProjectStub extends JxrProjectStub {
- private List<ReportPlugin> reportPlugins = new ArrayList<>();
-
- public ExcludeConfigurationMavenProjectStub() {
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
-
- try (InputStream is = Files.newInputStream(new File(getBasedir() + "/"
+ getPOM()).toPath())) {
- model = pomReader.read(is);
- setModel(model);
- } catch (Exception ignored) {
- }
-
- setArtifactId(model.getArtifactId());
- setGroupId(model.getGroupId());
- setVersion(model.getVersion());
- setPackaging(model.getPackaging());
- setInceptionYear(model.getInceptionYear());
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir + "/exclude/configuration");
- setCompileSourceRoots(compileSourceRoots);
-
- // set the report plugins
- reportPlugins = new ArrayList<>(model.getReporting().getPlugins());
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- }
-
- @Override
- public List<ReportPlugin> getReportPlugins() {
- return reportPlugins;
- }
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/exclude-configuration");
- }
-
- @Override
- protected String getPOM() {
- return "exclude-configuration-plugin-config.xml";
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java
deleted file mode 100644
index 4c0019b..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-/**
- * @author <a href="mailto:[email protected]">Dennis Lundberg</a>
- */
-public class IncludeConfigurationMavenProjectStub extends JxrProjectStub {
- private List<ReportPlugin> reportPlugins = new ArrayList<>();
-
- public IncludeConfigurationMavenProjectStub() {
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
-
- try (InputStream is = Files.newInputStream(new File(getBasedir() + "/"
+ getPOM()).toPath())) {
- model = pomReader.read(is);
- setModel(model);
- } catch (Exception ignored) {
- }
-
- setArtifactId(model.getArtifactId());
- setGroupId(model.getGroupId());
- setVersion(model.getVersion());
- setPackaging(model.getPackaging());
- setInceptionYear(model.getInceptionYear());
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir + "/include/configuration");
- setCompileSourceRoots(compileSourceRoots);
-
- // set the report plugins
- reportPlugins = new ArrayList<>(model.getReporting().getPlugins());
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- }
-
- @Override
- public List<ReportPlugin> getReportPlugins() {
- return reportPlugins;
- }
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/include-configuration");
- }
-
- @Override
- protected String getPOM() {
- return "include-configuration-plugin-config.xml";
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/JxrPluginArtifactStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/JxrPluginArtifactStub.java
deleted file mode 100644
index 7ecb7d4..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/JxrPluginArtifactStub.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class JxrPluginArtifactStub extends ArtifactStub {
-
- private String groupId;
-
- private String artifactId;
-
- private String version;
-
- private String packaging;
-
- private VersionRange versionRange;
-
- private ArtifactHandler handler;
-
- public JxrPluginArtifactStub(String groupId, String artifactId, String
version, String packaging) {
- this.groupId = groupId;
- this.artifactId = artifactId;
- this.version = version;
- this.packaging = packaging;
- versionRange = VersionRange.createFromVersion(version);
- }
-
- public void setGroupId(String groupId) {
- this.groupId = groupId;
- }
-
- public String getGroupId() {
- return groupId;
- }
-
- public void setArtifactId(String artifactId) {
- this.artifactId = artifactId;
- }
-
- public String getArtifactId() {
- return artifactId;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setPackaging(String packaging) {
- this.packaging = packaging;
- }
-
- public String getPackaging() {
- return packaging;
- }
-
- public VersionRange getVersionRange() {
- return versionRange;
- }
-
- public void setVersionRange(VersionRange versionRange) {
- this.versionRange = versionRange;
- }
-
- public ArtifactHandler getArtifactHandler() {
- return handler;
- }
-
- public void setArtifactHandler(ArtifactHandler handler) {
- this.handler = handler;
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/JxrProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/JxrProjectStub.java
deleted file mode 100644
index 57b40ca..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/JxrProjectStub.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.eclipse.aether.repository.RemoteRepository;
-
-public abstract class JxrProjectStub extends MavenProjectStub {
- /**
- * @return the POM file name
- */
- protected abstract String getPOM();
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/src/test/resources/unit/");
- }
-
- @Override
- public File getFile() {
- return new File(getBasedir(), getPOM());
- }
-
- @Override
- public List<ArtifactRepository> getRemoteArtifactRepositories() {
- ArtifactRepository repository = new MavenArtifactRepository(
- "central",
- "https://repo1.maven.org/maven2",
- new DefaultRepositoryLayout(),
- new ArtifactRepositoryPolicy(),
- new ArtifactRepositoryPolicy());
-
- return Collections.singletonList(repository);
- }
-
- @Override
- public List<RemoteRepository> getRemoteProjectRepositories() {
- return RepositoryUtils.toRepos(getRemoteArtifactRepositories());
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java
deleted file mode 100644
index 9d6685c..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class NoJavadocDirMavenProjectStub extends JxrProjectStub {
- private final List<ReportPlugin> reportPlugins;
-
- public NoJavadocDirMavenProjectStub() {
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
-
- try (InputStream is = Files.newInputStream(new File(getBasedir() + "/"
+ getPOM()).toPath())) {
- model = pomReader.read(is);
- setModel(model);
- } catch (Exception ignored) {
- }
-
- setArtifactId(model.getArtifactId());
- setGroupId(model.getGroupId());
- setVersion(model.getVersion());
- setPackaging(model.getPackaging());
- setInceptionYear(model.getInceptionYear());
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir + "/nojavadocdir/test");
- setCompileSourceRoots(compileSourceRoots);
-
- // set the report plugins
- reportPlugins = new ArrayList<>(model.getReporting().getPlugins());
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- }
-
- @Override
- public List<ReportPlugin> getReportPlugins() {
- return reportPlugins;
- }
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/nojavadocdir-test");
- }
-
- @Override
- protected String getPOM() {
- return "nojavadocdir-test-plugin-config.xml";
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java
deleted file mode 100644
index a72cb89..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class NoJavadocLinkConfigurationMavenProjectStub extends JxrProjectStub
{
- List<ReportPlugin> reportPlugins;
-
- public NoJavadocLinkConfigurationMavenProjectStub() {
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
-
- try (InputStream is = Files.newInputStream(new File(getBasedir() + "/"
+ getPOM()).toPath())) {
- model = pomReader.read(is);
- setModel(model);
- } catch (Exception ignored) {
- }
-
- setArtifactId(model.getArtifactId());
- setGroupId(model.getGroupId());
- setVersion(model.getVersion());
- setPackaging(model.getPackaging());
- setInceptionYear(model.getInceptionYear());
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir + "/nojavadoclink/configuration");
- setCompileSourceRoots(compileSourceRoots);
-
- // set the report plugins
- reportPlugins = new ArrayList<>(model.getReporting().getPlugins());
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- }
-
- @Override
- public List<ReportPlugin> getReportPlugins() {
- return reportPlugins;
- }
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/nojavadoclink-configuration");
- }
-
- @Override
- protected String getPOM() {
- return "nojavadoclink-configuration-plugin-config.xml";
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java
deleted file mode 100644
index e672b89..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-/**
- * @author <a href="mailto:[email protected]">Vincent Siveton</a>
- */
-public class PomMavenProjectStub extends JxrProjectStub {
- private Build build;
-
- public PomMavenProjectStub() {
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
-
- try (InputStream is = Files.newInputStream(new File(getBasedir() + "/"
+ getPOM()).toPath())) {
- model = pomReader.read(is);
- setModel(model);
- } catch (Exception ignored) {
- }
-
- setGroupId(model.getGroupId());
- setArtifactId(model.getArtifactId());
- setVersion(model.getVersion());
- setName(model.getName());
- setUrl(model.getUrl());
- setPackaging(model.getPackaging());
-
- Build build = new Build();
- build.setFinalName(model.getArtifactId());
- build.setDirectory(getBasedir() + "/target");
- build.setSourceDirectory(getBasedir() + "/src/main/java");
- build.setOutputDirectory(getBasedir() + "/target/classes");
- build.setTestSourceDirectory(getBasedir() + "/src/test/java");
- build.setTestOutputDirectory(getBasedir() + "/target/test-classes");
- setBuild(build);
-
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(getBasedir() + "/src/main/java");
- setCompileSourceRoots(compileSourceRoots);
-
- List<String> testCompileSourceRoots = new ArrayList<>();
- testCompileSourceRoots.add(getBasedir() + "/src/test/java");
- setTestCompileSourceRoots(testCompileSourceRoots);
- }
-
- /**
- * @see org.apache.maven.plugin.testing.stubs.MavenProjectStub#getBuild()
- */
- public Build getBuild() {
- return build;
- }
-
- /**
- * @see
org.apache.maven.plugin.testing.stubs.MavenProjectStub#setBuild(org.apache.maven.model.Build)
- */
- public void setBuild(Build build) {
- this.build = build;
- }
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/pom-test");
- }
-
- @Override
- protected String getPOM() {
- return "pom-test-plugin-config.xml";
- }
-}
diff --git
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java
b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java
deleted file mode 100644
index 0517f98..0000000
---
a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.
- */
-package org.apache.maven.plugin.jxr.stubs;
-
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-/**
- * @author <a href="mailto:[email protected]">Maria Odea Ching</a>
- */
-public class TestSourceDirMavenProjectStub extends JxrProjectStub {
-
- public TestSourceDirMavenProjectStub() {
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
-
- try (InputStream is = Files.newInputStream(new File(getBasedir() + "/"
+ getPOM()).toPath())) {
- model = pomReader.read(is);
- setModel(model);
- } catch (Exception ignored) {
- }
-
- setArtifactId(model.getArtifactId());
- setGroupId(model.getGroupId());
- setVersion(model.getVersion());
- setPackaging(model.getPackaging());
- setInceptionYear(model.getInceptionYear());
-
- String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir);
- setCompileSourceRoots(compileSourceRoots);
-
- Artifact artifact = new JxrPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
- artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
- setArtifact(artifact);
- }
-
- @Override
- public File getBasedir() {
- return new File(super.getBasedir() + "/testsourcedir-test");
- }
-
- @Override
- protected String getPOM() {
- return "testsourcedir-test-plugin-config.xml";
- }
-}
diff --git
a/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
index 5343001..c01b3b9 100644
---
a/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
@@ -32,24 +32,15 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.AggregateTestMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/aggregate-test/target/site</outputDirectory>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
<docTitle>Maven Jxr Plugin Aggregate Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<outputEncoding>ISO-8859-1</outputEncoding>
- <sourceDirs>
-
<value>${basedir}/src/test/resources/unit/aggregate-test/submodule1</value>
-
<value>${basedir}/src/test/resources/unit/aggregate-test/submodule2</value>
- </sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/aggregate-test/target/site/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/apidocs</javadocLocation>
<linkJavadoc>false</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.4</javadocVersion>
<stylesheet>stylesheet.css</stylesheet>
- <reactorProjects>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.AggregateSubmodule1MavenProjectStub"/>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.AggregateSubmodule2MavenProjectStub"/>
- </reactorProjects>
</configuration>
</plugin>
</plugins>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule1/aggregate-test-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule1/aggregate-test-plugin-config.xml
deleted file mode 100644
index 95adffc..0000000
---
a/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule1/aggregate-test-plugin-config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-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.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>aggregate.test</groupId>
- <artifactId>aggregate-test</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>aggregate-test-submodule1</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <inceptionYear>2006</inceptionYear>
- <name>Maven Jxr Plugin Aggregate Test Submodule1</name>
- <url>http://maven.apache.org</url>
-</project>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule2/aggregate-test-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule2/aggregate-test-plugin-config.xml
deleted file mode 100644
index 5bc7f78..0000000
---
a/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule2/aggregate-test-plugin-config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-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.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>aggregate.test</groupId>
- <artifactId>aggregate-test</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>aggregate-test-submodule2</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <inceptionYear>2006</inceptionYear>
- <name>Maven Jxr Plugin Aggregate Test Submodule2</name>
- <url>http://maven.apache.org</url>
-</project>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-4.xml
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-4.xml
index e6e2619..cdee0dd 100644
---
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-4.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-4.xml
@@ -32,14 +32,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/4</outputDirectory>
+ <outputDirectory>${basedir}/target/site/4</outputDirectory>
<docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/default-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/default-configuration/target/site/4/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/4/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.4</javadocVersion>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-6.xml
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-6.xml
index 3067637..7637ad7 100644
---
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-6.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-6.xml
@@ -32,14 +32,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/6</outputDirectory>
+ <outputDirectory>${basedir}/target/site/6</outputDirectory>
<docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/default-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/default-configuration/target/site/6/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/6/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.6</javadocVersion>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-7.xml
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-7.xml
index a5b58bf..1743f01 100644
---
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-7.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-7.xml
@@ -32,14 +32,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/7</outputDirectory>
+ <outputDirectory>${basedir}/target/site/7</outputDirectory>
<docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/default-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/default-configuration/target/site/7/apidocs</javadocLocation>
+ <javadocLocation>/target/site/7/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.7</javadocVersion>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-8.xml
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-8.xml
index df1fff7..7cf4dd3 100644
---
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-8.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config-8.xml
@@ -32,14 +32,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/8</outputDirectory>
+ <outputDirectory>${basedir}/target/site/8</outputDirectory>
<docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/default-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/default-configuration/target/site/8/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/8/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.8</javadocVersion>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
index e17feb1..cf1f3a9 100644
---
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
@@ -32,14 +32,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
<docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/default-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/default-configuration/target/site/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<templateDir>templates</templateDir>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/exception-test-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/exception-test-plugin-config.xml
index b495874..5257b51 100644
---
a/maven-jxr-plugin/src/test/resources/unit/default-configuration/exception-test-plugin-config.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/default-configuration/exception-test-plugin-config.xml
@@ -32,15 +32,14 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.DefaultConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
<docTitle>Maven Jxr Plugin Default Configuration Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<outputEncoding>ISO-8859-1</outputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/default-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/default-configuration/target/site/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<templateDir>temp</templateDir>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
index 33e057b..8914ccc 100644
---
a/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
@@ -32,15 +32,14 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.ExcludeConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/exclude-configuration/target/site</outputDirectory>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
<docTitle>Maven Jxr Plugin Exclude Configuration 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<outputEncoding>ISO-8859-1</outputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/exclude-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/exclude-configuration/target/site/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.4</javadocVersion>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
index 84128a0..dc54c8d 100644
---
a/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
@@ -32,15 +32,14 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.IncludeConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/include-configuration/target/site</outputDirectory>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
<docTitle>Maven Jxr Plugin Include Configuration 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<outputEncoding>ISO-8859-1</outputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/include-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/include-configuration/target/site/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.4</javadocVersion>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml
index 255b59e..46ffdb0 100644
---
a/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml
@@ -32,15 +32,14 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.NoJavadocDirMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/nojavadocdir-test/target/site</outputDirectory>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
<docTitle>Maven Jxr Plugin No Javadoc Directory Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<outputEncoding>ISO-8859-1</outputEncoding>
<sourceDirs>
- <value>${basedir}/src/test/resources/unit/nojavadocdir-test</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/nojavadocLocation-test/target/site/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/apidocs</javadocLocation>
<linkJavadoc>true</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.4</javadocVersion>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml
index 4dc92a0..a9b9d32 100644
---
a/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml
@@ -32,15 +32,14 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.NoJavadocLinkConfigurationMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/nojavadoclink-configuration/target/site</outputDirectory>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
<docTitle>Maven Jxr Plugin No Javadoc Link Configuration Test
1.0-SNAPSHOT Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<outputEncoding>ISO-8859-1</outputEncoding>
<sourceDirs>
-
<value>${basedir}/src/test/resources/unit/nojavadoclink-configuration</value>
+ <value>${basedir}</value>
</sourceDirs>
-
<javadocLocation>${basedir}/target/test/unit/nojavadoclink-configuration/target/site/apidocs</javadocLocation>
+ <javadocLocation>${basedir}/target/site/apidocs</javadocLocation>
<linkJavadoc>false</linkJavadoc>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.4</javadocVersion>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/pom-test/pom-test-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/pom-test/pom-test-plugin-config.xml
deleted file mode 100644
index 6a12890..0000000
---
a/maven-jxr-plugin/src/test/resources/unit/pom-test/pom-test-plugin-config.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>test.jxr.pom</groupId>
- <artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>project1</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.PomMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/pom-test/target/site/</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/maven-jxr-plugin/src/test/resources/unit/pom-test/src/main/java/maven/App.java
b/maven-jxr-plugin/src/test/resources/unit/pom-test/src/main/java/maven/App.java
deleted file mode 100644
index f54bd39..0000000
---
a/maven-jxr-plugin/src/test/resources/unit/pom-test/src/main/java/maven/App.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package maven;
-
-/*
- * 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.
- */
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
diff --git
a/maven-jxr-plugin/src/test/resources/unit/pom-test/src/test/java/maven/AppTest.java
b/maven-jxr-plugin/src/test/resources/unit/pom-test/src/test/java/maven/AppTest.java
deleted file mode 100644
index 93925bb..0000000
---
a/maven-jxr-plugin/src/test/resources/unit/pom-test/src/test/java/maven/AppTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package maven;
-
-/*
- * 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.
- */
-
-public class AppTest
-{
-
-}
diff --git
a/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml
b/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml
index 7583499..51450dc 100644
---
a/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml
+++
b/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml
@@ -32,14 +32,10 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
- <project
implementation="org.apache.maven.plugin.jxr.stubs.TestSourceDirMavenProjectStub"/>
-
<outputDirectory>${basedir}/target/test/unit/testsourcedir-test/target/site</outputDirectory>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
<docTitle>Maven Jxr Plugin Test Source Directory Test 1.0-SNAPSHOT
Reference</docTitle>
<inputEncoding>ISO-8859-1</inputEncoding>
<outputEncoding>ISO-8859-1</outputEncoding>
- <sourceDirs>
-
<value>${basedir}/src/test/resources/unit/testsourcedir-test/src/test/java</value>
- </sourceDirs>
<bottom>Copyright 2006 Apache Foundation</bottom>
<javadocVersion>1.4</javadocVersion>
<stylesheet>stylesheet.css</stylesheet>