You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/06/11 21:54:38 UTC
svn commit: r1747938 - in /maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugin/javadoc/
test/java/org/apache/maven/plugin/javadoc/
test/resources/unit/doclet-path-test/ test/resources/unit/doclet-test/
test/resources/unit/ta...
Author: rfscholte
Date: Sat Jun 11 21:54:38 2016
New Revision: 1747938
URL: http://svn.apache.org/viewvc?rev=1747938&view=rev
Log:
[MJAVADOC-457] Clean up mojo parameters
remove remoteRepositories
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1747938&r1=1747937&r2=1747938&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sat Jun 11 21:54:38 2016
@@ -432,12 +432,6 @@ public abstract class AbstractJavadocMoj
private ArtifactRepository localRepository;
/**
- * The remote repositories where artifacts are located.
- */
- @Parameter( property = "project.remoteArtifactRepositories" )
- private List<ArtifactRepository> remoteRepositories;
-
- /**
* The projects in the reactor for aggregation report.
*/
@Parameter( property = "reactorProjects", readonly = true )
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=1747938&r1=1747937&r2=1747938&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java Sat Jun 11 21:54:38 2016
@@ -836,7 +836,6 @@ public class JavadocReportTest
legacySupport.setSession( session );
setVariableValueToObject( mojo, "settings", settings );
- setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
setVariableValueToObject( mojo, "session", session );
mojo.execute();
@@ -875,7 +874,6 @@ public class JavadocReportTest
mojo = (JavadocReport) lookupMojo( "javadoc", testPom );
setVariableValueToObject( mojo, "settings", settings );
- setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
setVariableValueToObject( mojo, "session", session );
mojo.execute();
readed = readFile( commandLine );
@@ -924,7 +922,6 @@ public class JavadocReportTest
mojo = (JavadocReport) lookupMojo( "javadoc", testPom );
setVariableValueToObject( mojo, "settings", settings );
- setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
setVariableValueToObject( mojo, "session", session );
mojo.execute();
readed = readFile( commandLine );
@@ -1043,8 +1040,6 @@ public class JavadocReportTest
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
legacySupport.setSession( session );
-
- setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
setVariableValueToObject( mojo, "session", session );
mojo.execute();
@@ -1099,8 +1094,6 @@ public class JavadocReportTest
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
legacySupport.setSession( session );
-
- setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
setVariableValueToObject( mojo, "session", session );
File apidocs = new File( getBasedir(), "target/test/unit/stylesheetfile-test/target/site/apidocs" );
@@ -1208,8 +1201,6 @@ public class JavadocReportTest
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
legacySupport.setSession( session );
-
- setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
setVariableValueToObject( mojo, "session", session );
File apidocs = new File( getBasedir(), "target/test/unit/helpfile-test/target/site/apidocs" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml?rev=1747938&r1=1747937&r2=1747938&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml Sat Jun 11 21:54:38 2016
@@ -72,7 +72,6 @@ under the License.
<stylesheet>java</stylesheet>
<groups/>
<tags/>
- <remoteRepositories/>
<use>true</use>
<version>true</version>
<windowtitle>Maven Javadoc Plugin Doclet Path Test 1.0-SNAPSHOT API</windowtitle>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml?rev=1747938&r1=1747937&r2=1747938&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml Sat Jun 11 21:54:38 2016
@@ -65,7 +65,6 @@ under the License.
<stylesheet>java</stylesheet>
<groups/>
<tags/>
- <remoteRepositories/>
<use>true</use>
<version>true</version>
<windowtitle>Maven Javadoc Plugin Doclet Test 1.0-SNAPSHOT API</windowtitle>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml?rev=1747938&r1=1747937&r2=1747938&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml Sat Jun 11 21:54:38 2016
@@ -65,7 +65,6 @@ under the License.
<stylesheet>java</stylesheet>
<groups/>
<tags/>
- <remoteRepositories/>
<use>true</use>
<version>true</version>
<windowtitle>Maven Javadoc Plugin Taglet Test 1.0-SNAPSHOT API</windowtitle>