Skip to content

Commit 9e13239

Browse files
cstamasslachiewicz
authored andcommitted
[MJAVADOC-743] Drop deprecated mojo parameter
The type is deprecated and parameter is redundant as LRM that is already present has the value. --- https://issues.apache.org/jira/browse/MJAVADOC-743
1 parent ea0ddf5 commit 9e13239

File tree

45 files changed

+19
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+19
-58
lines changed

src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import org.apache.commons.text.StringEscapeUtils;
7070
import org.apache.maven.artifact.Artifact;
7171
import org.apache.maven.artifact.DependencyResolutionRequiredException;
72-
import org.apache.maven.artifact.repository.ArtifactRepository;
7372
import org.apache.maven.execution.MavenSession;
7473
import org.apache.maven.plugin.AbstractMojo;
7574
import org.apache.maven.plugin.MojoExecutionException;
@@ -350,12 +349,6 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo {
350349
@Parameter(property = "level", defaultValue = "protected")
351350
private String level;
352351

353-
/**
354-
* The local repository where the artifacts are located, used by the tests.
355-
*/
356-
@Parameter(property = "localRepository")
357-
private ArtifactRepository localRepository;
358-
359352
/**
360353
* Output directory where Java classes will be rewritten.
361354
*/
@@ -657,7 +650,7 @@ private void executeClirr() throws MavenInvocationException {
657650

658651
JavadocUtil.invokeMaven(
659652
getLog(),
660-
new File(localRepository.getBasedir()),
653+
session.getRepositorySession().getLocalRepository().getBasedir(),
661654
project.getFile(),
662655
Collections.singletonList(clirrGoal),
663656
properties,

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
import org.apache.maven.artifact.ArtifactUtils;
6464
import org.apache.maven.artifact.handler.ArtifactHandler;
6565
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
66-
import org.apache.maven.artifact.repository.ArtifactRepository;
6766
import org.apache.maven.artifact.versioning.ArtifactVersion;
6867
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
6968
import org.apache.maven.execution.MavenSession;
@@ -416,12 +415,6 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
416415
@Parameter(property = "resourcesArtifacts")
417416
private ResourcesArtifact[] resourcesArtifacts;
418417

419-
/**
420-
* The local repository where the artifacts are located.
421-
*/
422-
@Parameter(property = "localRepository")
423-
private ArtifactRepository localRepository;
424-
425418
/**
426419
* The projects in the reactor for aggregation report.
427420
*/
@@ -5476,7 +5469,7 @@ private List<OfflineLink> getModulesLinks() throws MavenReportException {
54765469
try {
54775470
JavadocUtil.invokeMaven(
54785471
getLog(),
5479-
new File(localRepository.getBasedir()),
5472+
session.getRepositorySession().getLocalRepository().getBasedir(),
54805473
p.getFile(),
54815474
Collections.singletonList(javadocGoal),
54825475
null,

src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
import org.apache.maven.shared.invoker.MavenInvocationException;
4040
import org.codehaus.plexus.util.FileUtils;
4141
import org.codehaus.plexus.util.StringUtils;
42+
import org.eclipse.aether.DefaultRepositorySystemSession;
43+
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
44+
import org.eclipse.aether.repository.LocalRepository;
4245

4346
import static org.apache.commons.lang3.reflect.MethodUtils.invokeMethod;
4447

@@ -496,6 +499,10 @@ private void executeMojoAndTest(File testPomBasedir, String[] clazzToCompare) th
496499
assertNotNull(mojo);
497500

498501
MavenSession session = newMavenSession(mojo.getProject());
502+
((DefaultRepositorySystemSession) session.getRepositorySession())
503+
.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
504+
.newInstance(
505+
session.getRepositorySession(), new LocalRepository(new File("target/local-repo"))));
499506
// Ensure remote repo connection uses SSL
500507
File globalSettingsFile = new File(getBasedir(), "target/test-classes/unit/settings.xml");
501508
session.getRequest().setGlobalSettingsFile(globalSettingsFile);

src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@
2525
import java.util.zip.ZipEntry;
2626
import java.util.zip.ZipFile;
2727

28+
import org.apache.maven.execution.MavenSession;
2829
import org.apache.maven.model.Plugin;
2930
import org.apache.maven.plugin.MojoExecution;
3031
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
3132
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
3233
import org.apache.maven.project.MavenProject;
3334
import org.codehaus.plexus.languages.java.version.JavaVersion;
35+
import org.eclipse.aether.DefaultRepositorySystemSession;
36+
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
37+
import org.eclipse.aether.repository.LocalRepository;
3438

3539
import static org.assertj.core.api.Assertions.assertThat;
3640

@@ -50,7 +54,12 @@ private JavadocJar lookupMojo(File testPom) throws Exception {
5054
currentProject.setGroupId("GROUPID");
5155
currentProject.setArtifactId("ARTIFACTID");
5256

53-
setVariableValueToObject(mojo, "session", newMavenSession(currentProject));
57+
MavenSession session = newMavenSession(currentProject);
58+
((DefaultRepositorySystemSession) session.getRepositorySession())
59+
.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
60+
.newInstance(
61+
session.getRepositorySession(), new LocalRepository(new File("target/local-repo"))));
62+
setVariableValueToObject(mojo, "session", session);
5463

5564
return mojo;
5665
}

src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ under the License.
3737
<configuration>
3838
<encoding>ISO-8859-1</encoding>
3939
<project implementation="org.apache.maven.plugins.javadoc.stubs.AggregateNotInSubFolderTestMavenProjectStub"/>
40-
<localRepository>${localRepository}</localRepository>
4140
<outputDirectory>${basedir}/target/test/unit/aggregate-modules-not-in-subfolders-test/target/site/apidocs</outputDirectory>
4241
<javadocOptionsDir>${basedir}/target/test/unit/aggregate-modules-not-in-subfolders-test/target/javadoc-bundle-options</javadocOptionsDir>
4342
<windowtitle>Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API</windowtitle>

src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ under the License.
3535
<configuration>
3636
<encoding>ISO-8859-1</encoding>
3737
<project implementation="org.apache.maven.plugins.javadoc.stubs.AggregateResourcesTestMavenProjectStub"/>
38-
<localRepository>${localRepository}</localRepository>
3938
<outputDirectory>${basedir}/target/test/unit/aggregate-resources-test/target/site/apidocs</outputDirectory>
4039
<javadocOptionsDir>${basedir}/target/test/unit/aggregate-resources-test/target/javadoc-bundle-options</javadocOptionsDir>
4140
<windowtitle>Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API</windowtitle>

src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ under the License.
3535
<artifactId>maven-javadoc-plugin</artifactId>
3636
<configuration>
3737
<project implementation="org.apache.maven.plugins.javadoc.stubs.AggregateTestMavenProjectStub"/>
38-
<localRepository>${localRepository}</localRepository>
3938
<outputDirectory>${basedir}/target/test/unit/aggregate-test/target/site/apidocs</outputDirectory>
4039
<javadocOptionsDir>${basedir}/target/test/unit/aggregate-test/target/javadoc-bundle-options</javadocOptionsDir>
4140
<breakiterator>false</breakiterator>

src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ under the License.
3434
<artifactId>maven-javadoc-plugin</artifactId>
3535
<configuration>
3636
<project implementation="org.apache.maven.plugins.javadoc.stubs.CustomConfigurationMavenProjectStub"/>
37-
<localRepository>${localRepository}</localRepository>
3837
<outputDirectory>${basedir}/target/test/unit/custom-configuration/target/site/apidocs</outputDirectory>
3938
<javadocOptionsDir>${basedir}/target/test/unit/custom-configuration/target/javadoc-bundle-options</javadocOptionsDir>
4039
<breakiterator>false</breakiterator>

src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ under the License.
3434
<artifactId>maven-javadoc-plugin</artifactId>
3535
<configuration>
3636
<project implementation="org.apache.maven.plugins.javadoc.stubs.DefaultConfigurationMavenProjectStub"/>
37-
<localRepository>${localRepository}</localRepository>
3837
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/apidocs</outputDirectory>
3938
<javadocOptionsDir>${basedir}/target/test/unit/default-configuration/target/javadoc-bundle-options</javadocOptionsDir>
4039
<breakiterator>false</breakiterator>

src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ under the License.
3434
<artifactId>maven-javadoc-plugin</artifactId>
3535
<configuration>
3636
<project implementation="org.apache.maven.plugins.javadoc.stubs.DocfilesTestMavenProjectStub"/>
37-
<localRepository>${localRepository}</localRepository>
3837
<outputDirectory>${basedir}/target/test/unit/docfiles-test/target/site/apidocs</outputDirectory>
3938
<javadocOptionsDir>${basedir}/target/test/unit/docfiles-test/target/javadoc-bundle-options</javadocOptionsDir>
4039
<breakiterator>false</breakiterator>

0 commit comments

Comments
 (0)