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 2017/07/23 09:49:09 UTC
svn commit: r1802719 [2/2] - in
/maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugins/javadoc/
main/java/org/apache/maven/plugins/javadoc/resolver/
test/java/org/apache/maven/plugins/javadoc/
test/java/org/apache/maven/plugi...
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -59,18 +59,20 @@ public class HelpFileMavenProjectStub ex
build.setPlugins( getModel().getBuild().getPlugins() );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/helpfile-test" );
}
/** {@inheritDoc} */
+ @Override
public List<ArtifactRepository> getRemoteArtifactRepositories()
{
ArtifactRepository repository =
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java Sun Jul 23 09:49:09 2017
@@ -65,7 +65,7 @@ public class JavadocJarArchiveConfigProj
build.setDirectory( super.getBasedir() + "/target/test/unit/javadocjar-archive-config/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/javadocjar/def" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -73,6 +73,7 @@ public class JavadocJarArchiveConfigProj
/**
* {@inheritDoc}
*/
+ @Override
public Scm getScm()
{
return scm;
@@ -81,6 +82,7 @@ public class JavadocJarArchiveConfigProj
/**
* {@inheritDoc}
*/
+ @Override
public void setScm(Scm scm)
{
this.scm = scm;
@@ -89,6 +91,7 @@ public class JavadocJarArchiveConfigProj
/**
* {@inheritDoc}
*/
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/javadocjar-archive-config" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -63,24 +63,27 @@ public class JavadocJarDefaultMavenProje
build.setDirectory( super.getBasedir() + "/target/test/unit/javadocjar-default/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/javadocjar/def" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/javadocjar-default" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarFailOnErrorMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarFailOnErrorMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarFailOnErrorMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarFailOnErrorMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -63,24 +63,27 @@ public class JavadocJarFailOnErrorMavenP
build.setDirectory( super.getBasedir() + "/target/test/unit/javadocjar-failonerror/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/javadocjar/def" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/javadocjar-failonerror" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -62,25 +62,28 @@ public class JavadocJarInvalidDestdirMav
build.setDirectory( super.getBasedir() + "/target/test/unit/javadocjar-invalid-destdir/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add(
getBasedir() + "/javadocjar/invalid/destdir" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/javadocjar-invalid-destdir/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocPluginArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocPluginArtifactStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocPluginArtifactStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocPluginArtifactStub.java Sun Jul 23 09:49:09 2017
@@ -54,36 +54,42 @@ public class JavadocPluginArtifactStub
}
/** {@inheritDoc} */
+ @Override
public void setGroupId( String groupId )
{
this.groupId = groupId;
}
/** {@inheritDoc} */
+ @Override
public String getGroupId()
{
return groupId;
}
/** {@inheritDoc} */
+ @Override
public void setArtifactId( String artifactId )
{
this.artifactId = artifactId;
}
/** {@inheritDoc} */
+ @Override
public String getArtifactId()
{
return artifactId;
}
/** {@inheritDoc} */
+ @Override
public void setVersion( String version )
{
this.version = version;
}
/** {@inheritDoc} */
+ @Override
public String getVersion()
{
return version;
@@ -106,36 +112,42 @@ public class JavadocPluginArtifactStub
}
/** {@inheritDoc} */
+ @Override
public VersionRange getVersionRange()
{
return versionRange;
}
/** {@inheritDoc} */
+ @Override
public void setVersionRange( VersionRange versionRange )
{
this.versionRange = versionRange;
}
/** {@inheritDoc} */
+ @Override
public ArtifactHandler getArtifactHandler()
{
return handler;
}
/** {@inheritDoc} */
+ @Override
public void setArtifactHandler( ArtifactHandler handler )
{
this.handler = handler;
}
/** {@inheritDoc} */
+ @Override
public String getBaseVersion()
{
return baseVersion;
}
/** {@inheritDoc} */
+ @Override
public void setBaseVersion( String string )
{
this.baseVersion = string;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -56,24 +56,27 @@ public class Jdk5TestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/jdk5-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir().getAbsolutePath() );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/jdk5-test/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -56,24 +56,27 @@ public class Jdk6TestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/jdk6-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir().getAbsolutePath() );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/jdk6-test/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -49,12 +49,13 @@ public class NewlineTestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/newline-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/newline-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -53,16 +53,17 @@ public class PomMavenProjectStub
build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/pom-test/target/test-classes" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( getBasedir() + "/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/pom-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Build;
-import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import java.io.File;
@@ -40,7 +39,7 @@ import java.util.Set;
public class ProxyTestMavenProjectStub
extends MavenProjectStub
{
- private Set<Artifact> dependencyArtifacts = new HashSet<Artifact>();
+ private Set<Artifact> dependencyArtifacts = new HashSet<>();
public ProxyTestMavenProjectStub()
{
@@ -59,7 +58,7 @@ public class ProxyTestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/proxy-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
@@ -79,11 +78,13 @@ public class ProxyTestMavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/proxy-test" );
}
+ @Override
public Set<Artifact> getDependencyArtifacts()
{
return dependencyArtifacts;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -56,24 +56,27 @@ public class QuotedPathMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/quotedpath'test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/quotedpath/test" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/quotedpath'test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -49,12 +49,13 @@ public class ResourcesTestMavenProjectSt
build.setDirectory( super.getBasedir() + "/target/test/unit/resources-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/resources-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -49,12 +49,13 @@ public class ResourcesWithExcludesTestMa
build.setDirectory( super.getBasedir() + "/target/test/unit/resources-with-excludes-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/resources-with-excludes-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SettingsStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SettingsStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SettingsStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SettingsStub.java Sun Jul 23 09:49:09 2017
@@ -33,6 +33,7 @@ public class SettingsStub
extends Settings
{
/** {@inheritDoc} */
+ @Override
public synchronized Proxy getActiveProxy()
{
Proxy proxy = new Proxy();
@@ -47,6 +48,7 @@ public class SettingsStub
}
/** {@inheritDoc} */
+ @Override
public List<Proxy> getProxies()
{
return Collections.singletonList( getActiveProxy() );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -49,12 +49,13 @@ public class StandardDocletConflictOptio
build.setDirectory( super.getBasedir() + "/target/test/unit/validate-options-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/validate-options-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -59,18 +59,20 @@ public class StylesheetFileMavenProjectS
build.setPlugins( getModel().getBuild().getPlugins() );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/stylesheetfile-test" );
}
/** {@inheritDoc} */
+ @Override
public List<ArtifactRepository> getRemoteArtifactRepositories()
{
ArtifactRepository repository =
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -56,24 +56,27 @@ public class SubpackagesTestMavenProject
build.setDirectory( super.getBasedir() + "/target/test/unit/subpackages-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/subpackages/test" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/subpackages-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -49,12 +49,13 @@ public class TagTestMavenProjectStub ext
build.setDirectory( super.getBasedir() + "/target/test/unit/tag-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/tag-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -57,12 +57,13 @@ public class TagletArtifactsMavenProject
build.setDirectory( super.getBasedir() + "/target/test/unit/tagletArtifacts-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public List<ArtifactRepository> getRemoteArtifactRepositories()
{
ArtifactRepository repository =
@@ -73,6 +74,7 @@ public class TagletArtifactsMavenProject
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/tagletArtifacts-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -56,24 +56,27 @@ public class TagletTestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/taglet-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/taglet/test" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/taglet-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -65,22 +65,24 @@ public class TestJavadocMavenProjectStub
build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/test-javadoc-test/target/test-classes" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( getBasedir() + "/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/test-javadoc-test" );
}
/** {@inheritDoc} */
+ @Override
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -49,12 +49,13 @@ public class WrongEncodingOptionsTestMav
build.setDirectory( super.getBasedir() + "/target/test/unit/validate-options-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/validate-options-test" );