This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MPLUGINTESTING-61 in repository https://gitbox.apache.org/repos/asf/maven-plugin-testing.git
commit 0a41fccea84a6a3a5dbb25127744492e0ce52dda Author: rfscholte <[email protected]> AuthorDate: Sat Aug 31 11:38:22 2019 +0200 [MPLUGINTESTING-61] Require Java 7 --- .../maven/plugin/testing/AbstractMojoTestCase.java | 24 ++-- .../maven/plugin/testing/ArtifactStubFactory.java | 17 ++- .../plugin/testing/ConfigurationException.java | 1 - .../org/apache/maven/plugin/testing/MojoRule.java | 1 - .../testing/ResolverExpressionEvaluatorStub.java | 3 +- .../org/apache/maven/plugin/testing/SilentLog.java | 32 ++++- .../plugin/testing/resources/TestResources.java | 4 +- .../maven/plugin/testing/stubs/ArtifactStub.java | 48 ++++++- .../testing/stubs/DefaultArtifactHandlerStub.java | 8 +- .../plugin/testing/stubs/MavenProjectStub.java | 149 ++++++++++++++++++++- .../testing/stubs/StubArtifactCollector.java | 5 +- .../testing/stubs/StubArtifactRepository.java | 31 ++++- .../plugin/testing/stubs/StubArtifactResolver.java | 11 +- .../plugin/testing/ExpressionEvaluatorMojo.java | 2 +- .../plugin/testing/ExpressionEvaluatorTest.java | 2 +- .../apache/maven/plugin/testing/MojoRuleTest.java | 11 +- .../maven/plugin/testing/MojoTestCaseTest.java | 2 +- .../maven/plugin/testing/ParametersMojo.java | 1 + .../apache/maven/plugin/testing/SimpleMojo.java | 2 +- pom.xml | 27 +--- 20 files changed, 305 insertions(+), 76 deletions(-) diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java index 80058bb..a64fd1c 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java @@ -73,7 +73,6 @@ import org.codehaus.plexus.component.repository.ComponentDescriptor; import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; import org.codehaus.plexus.logging.LoggerManager; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.InterpolationFilterReader; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.ReflectionUtils; @@ -94,7 +93,6 @@ import com.google.inject.Module; * descriptor and make this entirely declarative! * * @author jesse - * @version $Id$ */ public abstract class AbstractMojoTestCase extends PlexusTestCase @@ -105,8 +103,8 @@ public abstract class AbstractMojoTestCase { DefaultArtifactVersion version = null; String path = "/META-INF/maven/org.apache.maven/maven-core/pom.properties"; - InputStream is = AbstractMojoTestCase.class.getResourceAsStream( path ); - try + + try ( InputStream is = AbstractMojoTestCase.class.getResourceAsStream( path ) ) { Properties properties = new Properties(); if ( is != null ) @@ -123,10 +121,6 @@ public abstract class AbstractMojoTestCase { // odd, where did this come from } - finally - { - IOUtil.close( is ); - } MAVEN_VERSION = version; } @@ -142,7 +136,7 @@ public abstract class AbstractMojoTestCase * to either the project stub or into the mojo directly with injection...not sure yet though. */ //private MavenProjectBuilder projectBuilder; - + @Override protected void setUp() throws Exception { @@ -174,7 +168,7 @@ public abstract class AbstractMojoTestCase getContainer().addComponentDescriptor( desc ); } - mojoDescriptors = new HashMap<String, MojoDescriptor>(); + mojoDescriptors = new HashMap<>(); for ( MojoDescriptor mojoDescriptor : pluginDescriptor.getMojos() ) { mojoDescriptors.put( mojoDescriptor.getGoal(), mojoDescriptor ); @@ -254,12 +248,13 @@ public abstract class AbstractMojoTestCase return "META-INF/maven/plugin.xml"; } + @Override protected void setupContainer() { ContainerConfiguration cc = setupContainerConfiguration(); try { - List<Module> modules = new ArrayList<Module>(); + List<Module> modules = new ArrayList<>(); addGuiceModules( modules ); container = new DefaultPlexusContainer( cc, modules.toArray( new Module[modules.size()] ) ); } @@ -291,6 +286,7 @@ public abstract class AbstractMojoTestCase return cc; } + @Override protected PlexusContainer getContainer() { if ( container == null ) @@ -407,9 +403,9 @@ public abstract class AbstractMojoTestCase // pluginkey = groupId : artifactId : version : goal - Mojo mojo = (Mojo) lookup( Mojo.ROLE, groupId + ":" + artifactId + ":" + version + ":" + goal ); + Mojo mojo = lookup( Mojo.class, groupId + ":" + artifactId + ":" + version + ":" + goal ); - LoggerManager loggerManager = (LoggerManager) getContainer().lookup( LoggerManager.class ); + LoggerManager loggerManager = getContainer().lookup( LoggerManager.class ); Log mojoLogger = new DefaultLog( loggerManager.getLoggerForComponent( Mojo.ROLE ) ); @@ -722,7 +718,7 @@ public abstract class AbstractMojoTestCase protected Map<String, Object> getVariablesAndValuesFromObject( Class<?> clazz, Object object ) throws IllegalAccessException { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); Field[] fields = clazz.getDeclaredFields(); diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java index 11889c5..73bc8ee 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java @@ -47,7 +47,6 @@ import org.codehaus.plexus.util.StringUtils; * plugins that need to simulate artifacts for unit tests. * * @author <a href="mailto:[email protected]";>Brian Fox</a> - * @version $Id$ */ public class ArtifactStubFactory { @@ -352,7 +351,7 @@ public class ArtifactStubFactory public Set<Artifact> getReleaseAndSnapshotArtifacts() throws IOException { - Set<Artifact> set = new HashSet<Artifact>(); + Set<Artifact> set = new HashSet<>(); set.add( getReleaseArtifact() ); set.add( getSnapshotArtifact() ); return set; @@ -366,7 +365,7 @@ public class ArtifactStubFactory public Set<Artifact> getScopedArtifacts() throws IOException { - Set<Artifact> set = new HashSet<Artifact>(); + Set<Artifact> set = new HashSet<>(); set.add( createArtifact( "g", "compile", "1.0", Artifact.SCOPE_COMPILE ) ); set.add( createArtifact( "g", "provided", "1.0", Artifact.SCOPE_PROVIDED ) ); set.add( createArtifact( "g", "test", "1.0", Artifact.SCOPE_TEST ) ); @@ -383,7 +382,7 @@ public class ArtifactStubFactory public Set<Artifact> getTypedArtifacts() throws IOException { - Set<Artifact> set = new HashSet<Artifact>(); + Set<Artifact> set = new HashSet<>(); set.add( createArtifact( "g", "a", "1.0", Artifact.SCOPE_COMPILE, "war", null ) ); set.add( createArtifact( "g", "b", "1.0", Artifact.SCOPE_COMPILE, "jar", null ) ); set.add( createArtifact( "g", "c", "1.0", Artifact.SCOPE_COMPILE, "sources", null ) ); @@ -400,7 +399,7 @@ public class ArtifactStubFactory public Set<Artifact> getClassifiedArtifacts() throws IOException { - Set<Artifact> set = new HashSet<Artifact>(); + Set<Artifact> set = new HashSet<>(); set.add( createArtifact( "g", "a", "1.0", Artifact.SCOPE_COMPILE, "jar", "one" ) ); set.add( createArtifact( "g", "b", "1.0", Artifact.SCOPE_COMPILE, "jar", "two" ) ); set.add( createArtifact( "g", "c", "1.0", Artifact.SCOPE_COMPILE, "jar", "three" ) ); @@ -416,7 +415,7 @@ public class ArtifactStubFactory public Set<Artifact> getTypedArchiveArtifacts() throws IOException { - Set<Artifact> set = new HashSet<Artifact>(); + Set<Artifact> set = new HashSet<>(); set.add( createArtifact( "g", "a", "1.0", Artifact.SCOPE_COMPILE, "war", null ) ); set.add( createArtifact( "g", "b", "1.0", Artifact.SCOPE_COMPILE, "jar", null ) ); set.add( createArtifact( "g", "d", "1.0", Artifact.SCOPE_COMPILE, "zip", null ) ); @@ -432,7 +431,7 @@ public class ArtifactStubFactory public Set<Artifact> getArtifactArtifacts() throws IOException { - Set<Artifact> set = new HashSet<Artifact>(); + Set<Artifact> set = new HashSet<>(); set.add( createArtifact( "g", "one", "1.0", Artifact.SCOPE_COMPILE, "jar", "a" ) ); set.add( createArtifact( "g", "two", "1.0", Artifact.SCOPE_COMPILE, "jar", "a" ) ); set.add( createArtifact( "g", "three", "1.0", Artifact.SCOPE_COMPILE, "jar", "a" ) ); @@ -449,7 +448,7 @@ public class ArtifactStubFactory public Set<Artifact> getGroupIdArtifacts() throws IOException { - Set<Artifact> set = new HashSet<Artifact>(); + Set<Artifact> set = new HashSet<>(); set.add( createArtifact( "one", "group-one", "1.0", Artifact.SCOPE_COMPILE, "jar", "a" ) ); set.add( createArtifact( "two", "group-two", "1.0", Artifact.SCOPE_COMPILE, "jar", "a" ) ); set.add( createArtifact( "three", "group-three", "1.0", Artifact.SCOPE_COMPILE, "jar", "a" ) ); @@ -467,7 +466,7 @@ public class ArtifactStubFactory public Set<Artifact> getMixedArtifacts() throws IOException { - Set<Artifact> set = new HashSet<Artifact>(); + Set<Artifact> set = new HashSet<>(); set.addAll( getTypedArtifacts() ); set.addAll( getScopedArtifacts() ); set.addAll( getReleaseAndSnapshotArtifacts() ); diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ConfigurationException.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ConfigurationException.java index 3b85c8f..6b9c11f 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ConfigurationException.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ConfigurationException.java @@ -23,7 +23,6 @@ package org.apache.maven.plugin.testing; * ConfigurationException * * @author jesse - * @version $Id$ */ public class ConfigurationException extends Exception diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java index 0bd68fd..f335ffe 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java @@ -54,7 +54,6 @@ import org.junit.runners.model.Statement; * {@link WithoutMojo} to prevent the rule from firing. * * @author Mirko Friedenhagen - * @version $Id$ * @since 2.2 */ public class MojoRule diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ResolverExpressionEvaluatorStub.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ResolverExpressionEvaluatorStub.java index a6ecabd..5192d4b 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ResolverExpressionEvaluatorStub.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ResolverExpressionEvaluatorStub.java @@ -31,12 +31,12 @@ import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; * Stub for {@link ExpressionEvaluator} * * @author jesse - * @version $Id$ */ public class ResolverExpressionEvaluatorStub implements ExpressionEvaluator { /** {@inheritDoc} */ + @Override public Object evaluate( String expr ) throws ExpressionEvaluationException { @@ -122,6 +122,7 @@ public class ResolverExpressionEvaluatorStub } /** {@inheritDoc} */ + @Override public File alignToBaseDirectory( File file ) { if ( file.getAbsolutePath().startsWith( PlexusTestCase.getBasedir() ) ) diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/SilentLog.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/SilentLog.java index a5721fa..a44120a 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/SilentLog.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/SilentLog.java @@ -27,7 +27,6 @@ import org.codehaus.plexus.logging.Logger; * to turn off logs during testing where they aren't desired. * * @author <a href="mailto:[email protected]";>Brian Fox</a> - * @version $Id$ */ public class SilentLog implements Log, Logger @@ -36,6 +35,7 @@ public class SilentLog * @return <code>false</code> * @see org.apache.maven.plugin.logging.Log#isDebugEnabled() */ + @Override public boolean isDebugEnabled() { return false; @@ -46,6 +46,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#debug(java.lang.CharSequence) */ + @Override public void debug( CharSequence content ) { // nop @@ -56,6 +57,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#debug(java.lang.CharSequence, java.lang.Throwable) */ + @Override public void debug( CharSequence content, Throwable error ) { // nop @@ -66,6 +68,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#debug(java.lang.Throwable) */ + @Override public void debug( Throwable error ) { // nop @@ -75,6 +78,7 @@ public class SilentLog * @return <code>false</code> * @see org.apache.maven.plugin.logging.Log#isInfoEnabled() */ + @Override public boolean isInfoEnabled() { return false; @@ -85,6 +89,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#info(java.lang.CharSequence) */ + @Override public void info( CharSequence content ) { // nop @@ -95,6 +100,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#info(java.lang.CharSequence, java.lang.Throwable) */ + @Override public void info( CharSequence content, Throwable error ) { // nop @@ -105,6 +111,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#info(java.lang.Throwable) */ + @Override public void info( Throwable error ) { // nop @@ -115,6 +122,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#isWarnEnabled() */ + @Override public boolean isWarnEnabled() { // nop @@ -126,6 +134,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#warn(java.lang.CharSequence) */ + @Override public void warn( CharSequence content ) { // nop @@ -136,6 +145,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#warn(java.lang.CharSequence, java.lang.Throwable) */ + @Override public void warn( CharSequence content, Throwable error ) { // nop @@ -146,6 +156,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#warn(java.lang.Throwable) */ + @Override public void warn( Throwable error ) { // nop @@ -155,6 +166,7 @@ public class SilentLog * @return <code>false</code> * @see org.apache.maven.plugin.logging.Log#isErrorEnabled() */ + @Override public boolean isErrorEnabled() { return false; @@ -165,6 +177,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#error(java.lang.CharSequence) */ + @Override public void error( CharSequence content ) { // nop @@ -175,6 +188,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#error(java.lang.CharSequence, java.lang.Throwable) */ + @Override public void error( CharSequence content, Throwable error ) { // nop @@ -185,6 +199,7 @@ public class SilentLog * * @see org.apache.maven.plugin.logging.Log#error(java.lang.Throwable) */ + @Override public void error( Throwable error ) { // nop @@ -195,6 +210,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#debug(java.lang.String) */ + @Override public void debug( String message ) { // nop @@ -205,6 +221,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#debug(java.lang.String, java.lang.Throwable) */ + @Override public void debug( String message, Throwable throwable ) { // nop @@ -215,6 +232,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#info(java.lang.String) */ + @Override public void info( String message ) { // nop @@ -225,6 +243,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#info(java.lang.String, java.lang.Throwable) */ + @Override public void info( String message, Throwable throwable ) { // nop @@ -235,6 +254,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#warn(java.lang.String) */ + @Override public void warn( String message ) { // nop @@ -245,6 +265,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#warn(java.lang.String, java.lang.Throwable) */ + @Override public void warn( String message, Throwable throwable ) { // nop @@ -255,6 +276,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#error(java.lang.String) */ + @Override public void error( String message ) { // nop @@ -265,6 +287,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#error(java.lang.String, java.lang.Throwable) */ + @Override public void error( String message, Throwable throwable ) { // nop @@ -275,6 +298,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#fatalError(java.lang.String) */ + @Override public void fatalError( String message ) { // nop @@ -285,6 +309,7 @@ public class SilentLog * * @see org.codehaus.plexus.logging.Logger#fatalError(java.lang.String, java.lang.Throwable) */ + @Override public void fatalError( String message, Throwable throwable ) { // nop @@ -294,6 +319,7 @@ public class SilentLog * @return <code>false</code> * @see org.codehaus.plexus.logging.Logger#isFatalErrorEnabled() */ + @Override public boolean isFatalErrorEnabled() { return false; @@ -303,6 +329,7 @@ public class SilentLog * @return <code>null</code> * @see org.codehaus.plexus.logging.Logger#getChildLogger(java.lang.String) */ + @Override public Logger getChildLogger( String name ) { return null; @@ -312,6 +339,7 @@ public class SilentLog * @return <code>0</code> * @see org.codehaus.plexus.logging.Logger#getThreshold() */ + @Override public int getThreshold() { return 0; @@ -321,11 +349,13 @@ public class SilentLog * @return <code>null</code> * @see org.codehaus.plexus.logging.Logger#getName() */ + @Override public String getName() { return null; } + @Override public void setThreshold( int threshold ) { // TODO Auto-generated method stub diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/resources/TestResources.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/resources/TestResources.java index 9df14f7..3417e9a 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/resources/TestResources.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/resources/TestResources.java @@ -116,7 +116,7 @@ public class TestResources scanner.addDefaultExcludes(); scanner.scan(); - Set<String> actual = new TreeSet<String>(); + Set<String> actual = new TreeSet<>(); for ( String path : scanner.getIncludedFiles() ) { actual.add( path ); @@ -129,7 +129,7 @@ public class TestResources } } - Set<String> expected = new TreeSet<String>(); + Set<String> expected = new TreeSet<>(); if ( expectedPaths != null ) { for ( String path : expectedPaths ) diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java index ea73318..63f15c5 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java @@ -36,7 +36,6 @@ import org.apache.maven.artifact.versioning.VersionRange; * Stub class for {@link Artifact} testing. * * @author jesse - * @version $Id$ */ public class ArtifactStub implements Artifact @@ -62,42 +61,49 @@ public class ArtifactStub * * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo( Artifact artifact ) { return 0; } /** {@inheritDoc} */ + @Override public String getGroupId() { return groupId; } /** {@inheritDoc} */ + @Override public String getArtifactId() { return artifactId; } /** {@inheritDoc} */ + @Override public String getVersion() { return version; } /** {@inheritDoc} */ + @Override public void setVersion( String version ) { this.version = version; } /** {@inheritDoc} */ + @Override public String getScope() { return scope; } /** {@inheritDoc} */ + @Override public String getType() { return type; @@ -114,24 +120,28 @@ public class ArtifactStub } /** {@inheritDoc} */ + @Override public String getClassifier() { return classifier; } /** {@inheritDoc} */ + @Override public boolean hasClassifier() { return classifier != null; } /** {@inheritDoc} */ + @Override public File getFile() { return file; } /** {@inheritDoc} */ + @Override public void setFile( File file ) { this.file = file; @@ -141,6 +151,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getBaseVersion() */ + @Override public String getBaseVersion() { return null; @@ -151,6 +162,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setBaseVersion(java.lang.String) */ + @Override public void setBaseVersion( String string ) { // nop @@ -160,6 +172,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getId() */ + @Override public String getId() { return null; @@ -169,6 +182,7 @@ public class ArtifactStub * @return <code>groupId:artifactId:type:classifier</code>. * @see org.apache.maven.artifact.Artifact#getDependencyConflictId() */ + @Override public String getDependencyConflictId() { StringBuffer buffer = new StringBuffer(); @@ -186,6 +200,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#addMetadata(org.apache.maven.artifact.metadata.ArtifactMetadata) */ + @Override public void addMetadata( ArtifactMetadata artifactMetadata ) { // nop @@ -195,18 +210,21 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getMetadataList() */ + @Override public Collection<ArtifactMetadata> getMetadataList() { return null; } /** {@inheritDoc} */ + @Override public void setRepository( ArtifactRepository artifactRepository ) { this.artifactRepository = artifactRepository; } /** {@inheritDoc} */ + @Override public ArtifactRepository getRepository() { return artifactRepository; @@ -217,6 +235,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#updateVersion(java.lang.String, org.apache.maven.artifact.repository.ArtifactRepository) */ + @Override public void updateVersion( String string, ArtifactRepository artifactRepository ) { // nop @@ -226,6 +245,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getDownloadUrl() */ + @Override public String getDownloadUrl() { return null; @@ -236,6 +256,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setDownloadUrl(java.lang.String) */ + @Override public void setDownloadUrl( String string ) { // nop @@ -245,6 +266,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getDependencyFilter() */ + @Override public ArtifactFilter getDependencyFilter() { return null; @@ -255,6 +277,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setDependencyFilter(org.apache.maven.artifact.resolver.filter.ArtifactFilter) */ + @Override public void setDependencyFilter( ArtifactFilter artifactFilter ) { // nop @@ -264,6 +287,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getArtifactHandler() */ + @Override public ArtifactHandler getArtifactHandler() { return null; @@ -273,6 +297,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getDependencyTrail() */ + @Override public List<String> getDependencyTrail() { return null; @@ -283,12 +308,14 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setDependencyTrail(java.util.List) */ + @Override public void setDependencyTrail( List<String> list ) { // nop } /** {@inheritDoc} */ + @Override public void setScope( String scope ) { this.scope = scope; @@ -298,6 +325,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getVersionRange() */ + @Override public VersionRange getVersionRange() { return null; @@ -308,6 +336,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setVersionRange(org.apache.maven.artifact.versioning.VersionRange) */ + @Override public void setVersionRange( VersionRange versionRange ) { // nop @@ -318,18 +347,21 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#selectVersion(java.lang.String) */ + @Override public void selectVersion( String string ) { // nop } /** {@inheritDoc} */ + @Override public void setGroupId( String groupId ) { this.groupId = groupId; } /** {@inheritDoc} */ + @Override public void setArtifactId( String artifactId ) { this.artifactId = artifactId; @@ -339,6 +371,7 @@ public class ArtifactStub * @return <code>false</code>. * @see org.apache.maven.artifact.Artifact#isSnapshot() */ + @Override public boolean isSnapshot() { return Artifact.VERSION_FILE_PATTERN.matcher( getVersion() ).matches() @@ -350,6 +383,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setResolved(boolean) */ + @Override public void setResolved( boolean b ) { // nop @@ -359,6 +393,7 @@ public class ArtifactStub * @return <code>false</code>. * @see org.apache.maven.artifact.Artifact#isResolved() */ + @Override public boolean isResolved() { return false; @@ -369,6 +404,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setResolvedVersion(java.lang.String) */ + @Override public void setResolvedVersion( String string ) { // nop @@ -379,6 +415,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setArtifactHandler(org.apache.maven.artifact.handler.ArtifactHandler) */ + @Override public void setArtifactHandler( ArtifactHandler artifactHandler ) { // nop @@ -388,6 +425,7 @@ public class ArtifactStub * @return <code>false</code>. * @see org.apache.maven.artifact.Artifact#isRelease() */ + @Override public boolean isRelease() { return !isSnapshot(); @@ -398,6 +436,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setRelease(boolean) */ + @Override public void setRelease( boolean b ) { // nop @@ -407,6 +446,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getAvailableVersions() */ + @Override public List<ArtifactVersion> getAvailableVersions() { return null; @@ -417,6 +457,7 @@ public class ArtifactStub * * @see org.apache.maven.artifact.Artifact#setAvailableVersions(java.util.List) */ + @Override public void setAvailableVersions( List<ArtifactVersion> list ) { // nop @@ -426,6 +467,7 @@ public class ArtifactStub * @return <code>false</code>. * @see org.apache.maven.artifact.Artifact#isOptional() */ + @Override public boolean isOptional() { return false; @@ -436,6 +478,7 @@ public class ArtifactStub * * @param b */ + @Override public void setOptional( boolean b ) { // nop @@ -445,6 +488,7 @@ public class ArtifactStub * @return <code>null</code>. * @see org.apache.maven.artifact.Artifact#getSelectedVersion() */ + @Override public ArtifactVersion getSelectedVersion() throws OverConstrainedVersionException { @@ -455,6 +499,7 @@ public class ArtifactStub * @return <code>false</code>. * @see org.apache.maven.artifact.Artifact#isSelectedVersionKnown() */ + @Override public boolean isSelectedVersionKnown() throws OverConstrainedVersionException { @@ -464,6 +509,7 @@ public class ArtifactStub /** * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/DefaultArtifactHandlerStub.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/DefaultArtifactHandlerStub.java index 99ee8f7..926a9be 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/DefaultArtifactHandlerStub.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/DefaultArtifactHandlerStub.java @@ -25,7 +25,6 @@ import org.apache.maven.artifact.handler.ArtifactHandler; * Minimal artifact handler used by the stub factory to create unpackable archives. * * @author <a href="mailto:[email protected]";>Brian Fox</a> - * @version $Id$ */ public class DefaultArtifactHandlerStub implements ArtifactHandler @@ -70,6 +69,7 @@ public class DefaultArtifactHandlerStub } /** {@inheritDoc} */ + @Override public String getExtension() { if ( extension == null ) @@ -88,12 +88,14 @@ public class DefaultArtifactHandlerStub } /** {@inheritDoc} */ + @Override public String getClassifier() { return classifier; } /** {@inheritDoc} */ + @Override public String getDirectory() { if ( directory == null ) @@ -104,6 +106,7 @@ public class DefaultArtifactHandlerStub } /** {@inheritDoc} */ + @Override public String getPackaging() { if ( packaging == null ) @@ -114,12 +117,14 @@ public class DefaultArtifactHandlerStub } /** {@inheritDoc} */ + @Override public boolean isIncludesDependencies() { return includesDependencies; } /** {@inheritDoc} */ + @Override public String getLanguage() { if ( language == null ) @@ -131,6 +136,7 @@ public class DefaultArtifactHandlerStub } /** {@inheritDoc} */ + @Override public boolean isAddedToClasspath() { return addedToClasspath; diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java index c9b3a55..a717141 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/MavenProjectStub.java @@ -68,7 +68,6 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; * useful as a stub though. * * @author jesse - * @version $Id$ */ public class MavenProjectStub extends MavenProject @@ -222,6 +221,7 @@ public class MavenProjectStub * @return an empty String * @throws IOException if any */ + @Override public String getModulePathAdjustment( MavenProject mavenProject ) throws IOException { @@ -229,30 +229,35 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public Artifact getArtifact() { return artifact; } /** {@inheritDoc} */ + @Override public void setArtifact( Artifact artifact ) { this.artifact = artifact; } /** {@inheritDoc} */ + @Override public Model getModel() { return model; } /** {@inheritDoc} */ + @Override public MavenProject getParent() { return parent; } /** {@inheritDoc} */ + @Override public void setParent( MavenProject mavenProject ) { this.parent = mavenProject; @@ -263,6 +268,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setRemoteArtifactRepositories(java.util.List) */ + @Override public void setRemoteArtifactRepositories( List<ArtifactRepository> list ) { // nop @@ -273,12 +279,14 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getRemoteArtifactRepositories() */ + @Override public List<ArtifactRepository> getRemoteArtifactRepositories() { return Collections.<ArtifactRepository>emptyList(); } /** {@inheritDoc} */ + @Override public boolean hasParent() { if ( parent != null ) @@ -290,18 +298,21 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public File getFile() { return file; } /** {@inheritDoc} */ + @Override public void setFile( File file ) { this.file = file; } /** {@inheritDoc} */ + @Override public File getBasedir() { return new File( PlexusTestCase.getBasedir() ); @@ -312,6 +323,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setDependencies(java.util.List) */ + @Override public void setDependencies( List<Dependency> list ) { // nop @@ -322,6 +334,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getDependencies() */ + @Override public List<Dependency> getDependencies() { return Collections.<Dependency>emptyList(); @@ -332,17 +345,19 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getDependencyManagement() */ + @Override public DependencyManagement getDependencyManagement() { return null; } /** {@inheritDoc} */ + @Override public void addCompileSourceRoot( String string ) { if ( compileSourceRoots == null ) { - compileSourceRoots = new ArrayList<String>( Collections.singletonList( string ) ); + compileSourceRoots = new ArrayList<>( Collections.singletonList( string ) ); } else { @@ -351,11 +366,12 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public void addScriptSourceRoot( String string ) { if ( scriptSourceRoots == null ) { - scriptSourceRoots = new ArrayList<String>( Collections.singletonList( string ) ); + scriptSourceRoots = new ArrayList<>( Collections.singletonList( string ) ); } else { @@ -364,11 +380,12 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public void addTestCompileSourceRoot( String string ) { if ( testCompileSourceRoots == null ) { - testCompileSourceRoots = new ArrayList<String>( Collections.singletonList( string ) ); + testCompileSourceRoots = new ArrayList<>( Collections.singletonList( string ) ); } else { @@ -377,24 +394,28 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public List<String> getCompileSourceRoots() { return compileSourceRoots; } /** {@inheritDoc} */ + @Override public List<String> getScriptSourceRoots() { return scriptSourceRoots; } /** {@inheritDoc} */ + @Override public List<String> getTestCompileSourceRoots() { return testCompileSourceRoots; } /** {@inheritDoc} */ + @Override public List<String> getCompileClasspathElements() throws DependencyResolutionRequiredException { @@ -410,18 +431,21 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public List<Artifact> getCompileArtifacts() { return compileArtifacts; } /** {@inheritDoc} */ + @Override public List<Dependency> getCompileDependencies() { return compileDependencies; } /** {@inheritDoc} */ + @Override public List<String> getTestClasspathElements() throws DependencyResolutionRequiredException { @@ -429,18 +453,21 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public List<Artifact> getTestArtifacts() { return testArtifacts; } /** {@inheritDoc} */ + @Override public List<Dependency> getTestDependencies() { return testDependencies; } /** {@inheritDoc} */ + @Override public List<String> getRuntimeClasspathElements() throws DependencyResolutionRequiredException { @@ -448,18 +475,21 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public List<Artifact> getRuntimeArtifacts() { return runtimeArtifacts; } /** {@inheritDoc} */ + @Override public List<Dependency> getRuntimeDependencies() { return runtimeDependencies; } /** {@inheritDoc} */ + @Override public List<String> getSystemClasspathElements() throws DependencyResolutionRequiredException { @@ -467,6 +497,7 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public List<Artifact> getSystemArtifacts() { return systemArtifacts; @@ -483,6 +514,7 @@ public class MavenProjectStub /** * @param attachedArtifacts */ + @Override public void setAttachedArtifacts( List<Artifact> attachedArtifacts ) { this.attachedArtifacts = attachedArtifacts; @@ -491,6 +523,7 @@ public class MavenProjectStub /** * @param compileSourceRoots */ + @Override public void setCompileSourceRoots( List<String> compileSourceRoots ) { this.compileSourceRoots = compileSourceRoots; @@ -499,6 +532,7 @@ public class MavenProjectStub /** * @param testCompileSourceRoots */ + @Override public void setTestCompileSourceRoots( List<String> testCompileSourceRoots ) { this.testCompileSourceRoots = testCompileSourceRoots; @@ -507,6 +541,7 @@ public class MavenProjectStub /** * @param scriptSourceRoots */ + @Override public void setScriptSourceRoots( List<String> scriptSourceRoots ) { this.scriptSourceRoots = scriptSourceRoots; @@ -635,24 +670,28 @@ public class MavenProjectStub /** * @param model */ + @Override public void setModel( Model model ) { this.model = model; } /** {@inheritDoc} */ + @Override public List<Dependency> getSystemDependencies() { return systemDependencies; } /** {@inheritDoc} */ + @Override public void setModelVersion( String string ) { this.modelVersion = string; } /** {@inheritDoc} */ + @Override public String getModelVersion() { return modelVersion; @@ -663,90 +702,105 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getId() */ + @Override public String getId() { return ""; } /** {@inheritDoc} */ + @Override public void setGroupId( String string ) { this.groupId = string; } /** {@inheritDoc} */ + @Override public String getGroupId() { return groupId; } /** {@inheritDoc} */ + @Override public void setArtifactId( String string ) { this.artifactId = string; } /** {@inheritDoc} */ + @Override public String getArtifactId() { return artifactId; } /** {@inheritDoc} */ + @Override public void setName( String string ) { this.name = string; } /** {@inheritDoc} */ + @Override public String getName() { return name; } /** {@inheritDoc} */ + @Override public void setVersion( String string ) { this.version = string; } /** {@inheritDoc} */ + @Override public String getVersion() { return version; } /** {@inheritDoc} */ + @Override public String getPackaging() { return packaging; } /** {@inheritDoc} */ + @Override public void setPackaging( String string ) { this.packaging = string; } /** {@inheritDoc} */ + @Override public void setInceptionYear( String string ) { this.inceptionYear = string; } /** {@inheritDoc} */ + @Override public String getInceptionYear() { return inceptionYear; } /** {@inheritDoc} */ + @Override public void setUrl( String string ) { this.url = string; } /** {@inheritDoc} */ + @Override public String getUrl() { return url; @@ -757,6 +811,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getPrerequisites() */ + @Override public Prerequisites getPrerequisites() { return null; @@ -767,6 +822,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setIssueManagement(org.apache.maven.model.IssueManagement) */ + @Override public void setIssueManagement( IssueManagement issueManagement ) { // nop @@ -777,6 +833,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getCiManagement() */ + @Override public CiManagement getCiManagement() { return null; @@ -787,6 +844,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setCiManagement(org.apache.maven.model.CiManagement) */ + @Override public void setCiManagement( CiManagement ciManagement ) { // nop @@ -797,6 +855,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getIssueManagement() */ + @Override public IssueManagement getIssueManagement() { return null; @@ -807,6 +866,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setDistributionManagement(org.apache.maven.model.DistributionManagement) */ + @Override public void setDistributionManagement( DistributionManagement distributionManagement ) { // nop @@ -817,18 +877,21 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getDistributionManagement() */ + @Override public DistributionManagement getDistributionManagement() { return null; } /** {@inheritDoc} */ + @Override public void setDescription( String string ) { this.description = string; } /** {@inheritDoc} */ + @Override public String getDescription() { return description; @@ -839,6 +902,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setOrganization(org.apache.maven.model.Organization) */ + @Override public void setOrganization( Organization organization ) { // nop @@ -849,6 +913,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getOrganization() */ + @Override public Organization getOrganization() { return null; @@ -859,6 +924,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setScm(org.apache.maven.model.Scm) */ + @Override public void setScm( Scm scm ) { // nop @@ -869,6 +935,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getScm() */ + @Override public Scm getScm() { return null; @@ -879,6 +946,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setMailingLists(java.util.List) */ + @Override public void setMailingLists( List<MailingList> list ) { // nop @@ -889,6 +957,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getMailingLists() */ + @Override public List<MailingList> getMailingLists() { return Collections.<MailingList>emptyList(); @@ -899,6 +968,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#addMailingList(org.apache.maven.model.MailingList) */ + @Override public void addMailingList( MailingList mailingList ) { // nop @@ -909,6 +979,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setDevelopers(java.util.List) */ + @Override public void setDevelopers( List<Developer> list ) { // nop @@ -919,6 +990,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getDevelopers() */ + @Override public List<Developer> getDevelopers() { return Collections.<Developer>emptyList(); @@ -929,6 +1001,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#addDeveloper(org.apache.maven.model.Developer) */ + @Override public void addDeveloper( Developer developer ) { // nop @@ -939,6 +1012,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setContributors(java.util.List) */ + @Override public void setContributors( List<Contributor> list ) { // nop @@ -949,6 +1023,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getContributors() */ + @Override public List<Contributor> getContributors() { return Collections.<Contributor>emptyList(); @@ -959,18 +1034,21 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#addContributor(org.apache.maven.model.Contributor) */ + @Override public void addContributor( Contributor contributor ) { // nop } /** {@inheritDoc} */ + @Override public void setBuild( Build build ) { this.build = build; } /** {@inheritDoc} */ + @Override public Build getBuild() { return build; @@ -981,6 +1059,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getResources() */ + @Override public List<Resource> getResources() { return Collections.<Resource>emptyList(); @@ -991,6 +1070,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getTestResources() */ + @Override public List<Resource> getTestResources() { return Collections.<Resource>emptyList(); @@ -1001,6 +1081,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#addResource(org.apache.maven.model.Resource) */ + @Override public void addResource( Resource resource ) { // nop @@ -1011,6 +1092,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#addTestResource(org.apache.maven.model.Resource) */ + @Override public void addTestResource( Resource resource ) { // nop @@ -1021,6 +1103,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setReporting(org.apache.maven.model.Reporting) */ + @Override public void setReporting( Reporting reporting ) { // nop @@ -1031,18 +1114,21 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getReporting() */ + @Override public Reporting getReporting() { return null; } /** {@inheritDoc} */ + @Override public void setLicenses( List<License> licenses ) { this.licenses = licenses; } /** {@inheritDoc} */ + @Override public List<License> getLicenses() { return licenses; @@ -1053,6 +1139,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#addLicense(org.apache.maven.model.License) */ + @Override public void addLicense( License license ) { // nop @@ -1063,6 +1150,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setArtifacts(java.util.Set) */ + @Override public void setArtifacts( Set<Artifact> set ) { // nop @@ -1073,6 +1161,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getArtifacts() */ + @Override public Set<Artifact> getArtifacts() { return Collections.<Artifact>emptySet(); @@ -1083,6 +1172,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getArtifactMap() */ + @Override public Map<String, Artifact> getArtifactMap() { return Collections.<String, Artifact>emptyMap(); @@ -1093,6 +1183,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setPluginArtifacts(java.util.Set) */ + @Override public void setPluginArtifacts( Set<Artifact> set ) { // nop @@ -1103,6 +1194,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getPluginArtifacts() */ + @Override public Set<Artifact> getPluginArtifacts() { return Collections.<Artifact>emptySet(); @@ -1113,6 +1205,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getPluginArtifactMap() */ + @Override public Map<String, Artifact> getPluginArtifactMap() { return Collections.<String, Artifact>emptyMap(); @@ -1123,6 +1216,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setReportArtifacts(java.util.Set) */ + @Override public void setReportArtifacts( Set<Artifact> set ) { // nop @@ -1133,6 +1227,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getReportArtifacts() */ + @Override public Set<Artifact> getReportArtifacts() { return Collections.<Artifact>emptySet(); @@ -1143,6 +1238,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getReportArtifactMap() */ + @Override public Map<String, Artifact> getReportArtifactMap() { return Collections.<String, Artifact>emptyMap(); @@ -1153,6 +1249,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setExtensionArtifacts(java.util.Set) */ + @Override public void setExtensionArtifacts( Set<Artifact> set ) { // nop @@ -1163,6 +1260,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getExtensionArtifacts() */ + @Override public Set<Artifact> getExtensionArtifacts() { return Collections.<Artifact>emptySet(); @@ -1173,6 +1271,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getExtensionArtifactMap() */ + @Override public Map<String, Artifact> getExtensionArtifactMap() { return Collections.<String, Artifact>emptyMap(); @@ -1183,6 +1282,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setParentArtifact(org.apache.maven.artifact.Artifact) */ + @Override public void setParentArtifact( Artifact artifact ) { // nop @@ -1193,6 +1293,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getParentArtifact() */ + @Override public Artifact getParentArtifact() { return null; @@ -1203,6 +1304,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getRepositories() */ + @Override public List<Repository> getRepositories() { return Collections.<Repository>emptyList(); @@ -1213,6 +1315,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getReportPlugins() */ + @Override public List<ReportPlugin> getReportPlugins() { return Collections.<ReportPlugin>emptyList(); @@ -1223,6 +1326,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getBuildPlugins() */ + @Override public List<Plugin> getBuildPlugins() { return Collections.<Plugin>emptyList(); @@ -1233,6 +1337,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getModules() */ + @Override public List<String> getModules() { return Collections.<String>emptyList(); @@ -1243,6 +1348,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getPluginManagement() */ + @Override public PluginManagement getPluginManagement() { return null; @@ -1269,24 +1375,28 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public List<MavenProject> getCollectedProjects() { return collectedProjects; } /** {@inheritDoc} */ + @Override public void setCollectedProjects( List<MavenProject> list ) { this.collectedProjects = list; } /** {@inheritDoc} */ + @Override public void setPluginArtifactRepositories( List<ArtifactRepository> list ) { this.pluginArtifactRepositories = list; } /** {@inheritDoc} */ + @Override public List<ArtifactRepository> getPluginArtifactRepositories() { return pluginArtifactRepositories; @@ -1297,6 +1407,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getDistributionManagementArtifactRepository() */ + @Override public ArtifactRepository getDistributionManagementArtifactRepository() { return null; @@ -1307,29 +1418,33 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getPluginRepositories() */ + @Override public List<Repository> getPluginRepositories() { return Collections.<Repository>emptyList(); } /** {@inheritDoc} */ + @Override public void setActiveProfiles( List<Profile> list ) { activeProfiles = list; } /** {@inheritDoc} */ + @Override public List<Profile> getActiveProfiles() { return activeProfiles; } /** {@inheritDoc} */ + @Override public void addAttachedArtifact( Artifact artifact ) { if ( attachedArtifacts == null ) { - this.attachedArtifacts = new ArrayList<Artifact>( Collections.singletonList( artifact ) ); + this.attachedArtifacts = new ArrayList<>( Collections.singletonList( artifact ) ); } else { @@ -1338,6 +1453,7 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public List<Artifact> getAttachedArtifacts() { return attachedArtifacts; @@ -1348,6 +1464,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getGoalConfiguration(java.lang.String, java.lang.String, java.lang.String, java.lang.String) */ + @Override public Xpp3Dom getGoalConfiguration( String string, String string1, String string2, String string3 ) { return null; @@ -1358,6 +1475,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getReportConfiguration(java.lang.String, java.lang.String, java.lang.String) */ + @Override public Xpp3Dom getReportConfiguration( String string, String string1, String string2 ) { return null; @@ -1368,6 +1486,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getExecutionProject() */ + @Override public MavenProject getExecutionProject() { return null; @@ -1378,6 +1497,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#setExecutionProject(org.apache.maven.project.MavenProject) */ + @Override public void setExecutionProject( MavenProject mavenProject ) { // nop @@ -1388,6 +1508,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#writeModel(java.io.Writer) */ + @Override public void writeModel( Writer writer ) throws IOException { @@ -1399,6 +1520,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#writeOriginalModel(java.io.Writer) */ + @Override public void writeOriginalModel( Writer writer ) throws IOException { @@ -1406,36 +1528,42 @@ public class MavenProjectStub } /** {@inheritDoc} */ + @Override public Set<Artifact> getDependencyArtifacts() { return dependencyArtifacts; } /** {@inheritDoc} */ + @Override public void setDependencyArtifacts( Set<Artifact> set ) { this.dependencyArtifacts = set; } /** {@inheritDoc} */ + @Override public void setReleaseArtifactRepository( ArtifactRepository artifactRepository ) { this.releaseArtifactRepository = artifactRepository; } /** {@inheritDoc} */ + @Override public void setSnapshotArtifactRepository( ArtifactRepository artifactRepository ) { this.snapshotArtifactRepository = artifactRepository; } /** {@inheritDoc} */ + @Override public void setOriginalModel( Model model ) { this.originalModel = model; } /** {@inheritDoc} */ + @Override public Model getOriginalModel() { return originalModel; @@ -1446,6 +1574,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getBuildExtensions() */ + @Override public List<Extension> getBuildExtensions() { return Collections.<Extension>emptyList(); @@ -1456,6 +1585,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#createArtifacts(org.apache.maven.artifact.factory.ArtifactFactory, java.lang.String, org.apache.maven.artifact.resolver.filter.ArtifactFilter) */ + @Override public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, String string, ArtifactFilter artifactFilter ) { @@ -1467,6 +1597,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#addProjectReference(org.apache.maven.project.MavenProject) */ + @Override public void addProjectReference( MavenProject mavenProject ) { // nop @@ -1477,6 +1608,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#attachArtifact(java.lang.String, java.lang.String, java.io.File) */ + @Override public void attachArtifact( String string, String string1, File file ) { // nop @@ -1487,6 +1619,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getProperties() */ + @Override public Properties getProperties() { return new Properties(); @@ -1497,6 +1630,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getFilters() */ + @Override public List<String> getFilters() { return Collections.<String>emptyList(); @@ -1507,24 +1641,28 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#getProjectReferences() */ + @Override public Map<String, MavenProject> getProjectReferences() { return Collections.<String, MavenProject>emptyMap(); } /** {@inheritDoc} */ + @Override public boolean isExecutionRoot() { return executionRoot; } /** {@inheritDoc} */ + @Override public void setExecutionRoot( boolean b ) { this.executionRoot = b; } /** {@inheritDoc} */ + @Override public String getDefaultGoal() { return defaultGoal; @@ -1535,6 +1673,7 @@ public class MavenProjectStub * * @see org.apache.maven.project.MavenProject#replaceWithActiveArtifact(org.apache.maven.artifact.Artifact) */ + @Override public Artifact replaceWithActiveArtifact( Artifact artifact ) { return null; diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java index 869069c..c8e7cbe 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java @@ -36,7 +36,6 @@ import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver; /** * @author <a href="mailto:[email protected]";>Brian Fox</a> - * @version $Id$ */ public class StubArtifactCollector implements ArtifactCollector @@ -49,6 +48,7 @@ public class StubArtifactCollector super(); } + @Override public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactResolutionRequest repositoryRequest, ArtifactMetadataSource source, ArtifactFilter filter, @@ -58,6 +58,7 @@ public class StubArtifactCollector return new ArtifactResolutionResult(); } + @Override public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, @@ -68,6 +69,7 @@ public class StubArtifactCollector return new ArtifactResolutionResult(); } + @Override public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, @@ -77,6 +79,7 @@ public class StubArtifactCollector return new ArtifactResolutionResult(); } + @Override public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java index 9a435b7..0d63904 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java @@ -33,7 +33,6 @@ import java.util.List; /** * @author <a href="mailto:[email protected]";>Brian Fox</a> - * @version $Id$ */ public class StubArtifactRepository implements ArtifactRepository @@ -54,6 +53,7 @@ public class StubArtifactRepository * @return the <code>artifactId</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#pathOf(org.apache.maven.artifact.Artifact) */ + @Override public String pathOf( Artifact artifact ) { return artifact.getId(); @@ -63,6 +63,7 @@ public class StubArtifactRepository * @return <code>null</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#pathOfRemoteRepositoryMetadata(org.apache.maven.artifact.metadata.ArtifactMetadata) */ + @Override public String pathOfRemoteRepositoryMetadata( ArtifactMetadata artifactMetadata ) { return null; @@ -72,6 +73,7 @@ public class StubArtifactRepository * @return the filename of this metadata on the local repository. * @see org.apache.maven.artifact.repository.ArtifactRepository#pathOfLocalRepositoryMetadata(org.apache.maven.artifact.metadata.ArtifactMetadata, org.apache.maven.artifact.repository.ArtifactRepository) */ + @Override public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository ) { return metadata.getLocalFilename( repository ); @@ -81,6 +83,7 @@ public class StubArtifactRepository * @return <code>null</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#getUrl() */ + @Override public String getUrl() { return null; @@ -90,6 +93,7 @@ public class StubArtifactRepository * @return <code>basedir</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#getBasedir() */ + @Override public String getBasedir() { return baseDir; @@ -99,6 +103,7 @@ public class StubArtifactRepository * @return <code>null</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#getProtocol() */ + @Override public String getProtocol() { return null; @@ -108,6 +113,7 @@ public class StubArtifactRepository * @return <code>null</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#getId() */ + @Override public String getId() { return null; @@ -117,6 +123,7 @@ public class StubArtifactRepository * @return <code>null</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#getSnapshots() */ + @Override public ArtifactRepositoryPolicy getSnapshots() { return null; @@ -126,6 +133,7 @@ public class StubArtifactRepository * @return <code>null</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#getReleases() */ + @Override public ArtifactRepositoryPolicy getReleases() { return null; @@ -135,6 +143,7 @@ public class StubArtifactRepository * @return <code>null</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#getLayout() */ + @Override public ArtifactRepositoryLayout getLayout() { return null; @@ -144,6 +153,7 @@ public class StubArtifactRepository * @return <code>null</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#getKey() */ + @Override public String getKey() { return null; @@ -153,6 +163,7 @@ public class StubArtifactRepository * @return <code>false</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#isUniqueVersion() */ + @Override public boolean isUniqueVersion() { return false; @@ -163,6 +174,7 @@ public class StubArtifactRepository * * @see org.apache.maven.artifact.repository.ArtifactRepository#setBlacklisted(boolean) */ + @Override public void setBlacklisted( boolean blackListed ) { // nop @@ -172,77 +184,92 @@ public class StubArtifactRepository * @return <code>false</code>. * @see org.apache.maven.artifact.repository.ArtifactRepository#isBlacklisted() */ + @Override public boolean isBlacklisted() { return false; } + @Override public Artifact find( Artifact artifact ) { // TODO Auto-generated method stub return null; } + @Override public Authentication getAuthentication() { return null; } + @Override public Proxy getProxy() { return null; } + @Override public void setAuthentication( Authentication authentication ) { } + @Override public void setId( String id ) { } + @Override public void setLayout( ArtifactRepositoryLayout layout ) { } + @Override public void setProxy( Proxy proxy ) { } + @Override public void setReleaseUpdatePolicy( ArtifactRepositoryPolicy policy ) { } + @Override public void setSnapshotUpdatePolicy( ArtifactRepositoryPolicy policy ) { } + @Override public void setUrl( String url ) { } + @Override public List<String> findVersions( Artifact artifact ) { return Collections.emptyList(); } + @Override public boolean isProjectAware() { return false; } + @Override public List<ArtifactRepository> getMirroredRepositories() { - return new ArrayList<ArtifactRepository>( 0 ); + return new ArrayList<>( 0 ); } + @Override public void setMirroredRepositories( List<ArtifactRepository> artifactRepositories ) { // no op diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java index 4df64e9..b9ea73a 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java @@ -41,7 +41,6 @@ import org.apache.maven.wagon.events.TransferListener; * Stub resolver. The constructor allows the specification of the exception to throw so that handling can be tested too. * * @author <a href="mailto:[email protected]";>Brian Fox</a> - * @version $Id$ */ public class StubArtifactResolver implements ArtifactResolver @@ -72,6 +71,7 @@ public class StubArtifactResolver * * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolve(org.apache.maven.artifact.Artifact, java.util.List, org.apache.maven.artifact.repository.ArtifactRepository) */ + @Override public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository ) throws ArtifactResolutionException, ArtifactNotFoundException @@ -105,6 +105,7 @@ public class StubArtifactResolver * @return <code>null</code>. * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.List, org.apache.maven.artifact.repository.ArtifactRepository, org.apache.maven.artifact.metadata.ArtifactMetadataSource) */ + @Override public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, @@ -118,6 +119,7 @@ public class StubArtifactResolver * @return <code>null</code>. * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.List, org.apache.maven.artifact.repository.ArtifactRepository, org.apache.maven.artifact.metadata.ArtifactMetadataSource, java.util.List) */ + @Override public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, @@ -132,6 +134,7 @@ public class StubArtifactResolver * @return <code>null</code>. * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter) */ + @Override public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, @@ -145,6 +148,7 @@ public class StubArtifactResolver * @return <code>null</code>. * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource) */ + @Override public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, @@ -158,6 +162,7 @@ public class StubArtifactResolver * @return <code>null</code>. * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter) */ + @Override public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, @@ -171,6 +176,7 @@ public class StubArtifactResolver * @return <code>null</code>. * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter, java.util.List) */ + @Override public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, @@ -186,6 +192,7 @@ public class StubArtifactResolver * * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveAlways(org.apache.maven.artifact.Artifact, java.util.List, org.apache.maven.artifact.repository.ArtifactRepository) */ + @Override public void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository ) throws ArtifactResolutionException, ArtifactNotFoundException @@ -193,6 +200,7 @@ public class StubArtifactResolver // nop } + @Override public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, TransferListener downloadMonitor ) throws ArtifactResolutionException, ArtifactNotFoundException @@ -206,6 +214,7 @@ public class StubArtifactResolver return null; } + @Override public ArtifactResolutionResult resolve( ArtifactResolutionRequest request ) { return null; diff --git a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ExpressionEvaluatorMojo.java b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ExpressionEvaluatorMojo.java index e57c14d..2d4faa0 100644 --- a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ExpressionEvaluatorMojo.java +++ b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ExpressionEvaluatorMojo.java @@ -27,7 +27,6 @@ import org.codehaus.plexus.util.StringUtils; /** * @author Edwin Punzalan - * @version $Id$ */ public class ExpressionEvaluatorMojo extends AbstractMojo @@ -39,6 +38,7 @@ public class ExpressionEvaluatorMojo private String workdir; /** {@inheritDoc} */ + @Override public void execute() throws MojoExecutionException, MojoFailureException { diff --git a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ExpressionEvaluatorTest.java b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ExpressionEvaluatorTest.java index 2c8fe05..3939bd2 100644 --- a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ExpressionEvaluatorTest.java +++ b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ExpressionEvaluatorTest.java @@ -28,7 +28,6 @@ import java.io.StringReader; /** * @author Edwin Punzalan - * @version $Id$ */ public class ExpressionEvaluatorTest extends AbstractMojoTestCase @@ -38,6 +37,7 @@ public class ExpressionEvaluatorTest private PlexusConfiguration pluginConfiguration; /** {@inheritDoc} */ + @Override protected void setUp() throws Exception { diff --git a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoRuleTest.java b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoRuleTest.java index 0e976fd..d5f3075 100644 --- a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoRuleTest.java +++ b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoRuleTest.java @@ -33,7 +33,6 @@ import org.junit.Test; /** * @author Mirko Friedenhagen - * @version $Id$ */ public class MojoRuleTest @@ -121,9 +120,9 @@ public class MojoRuleTest mojo = (SimpleMojo) rule.configureMojo( mojo, pluginConfiguration ); - assertEquals( "valueOne", (String) rule.getVariableValueFromObject( mojo, "keyOne" ) ); + assertEquals( "valueOne", rule.getVariableValueFromObject( mojo, "keyOne" ) ); - assertEquals( "valueTwo", (String) rule.getVariableValueFromObject( mojo, "keyTwo" ) ); + assertEquals( "valueTwo", rule.getVariableValueFromObject( mojo, "keyTwo" ) ); } /** @@ -139,9 +138,9 @@ public class MojoRuleTest Map<String, Object> map = rule.getVariablesAndValuesFromObject( mojo ); - assertEquals( "valueOne", (String) map.get( "keyOne" ) ); + assertEquals( "valueOne", map.get( "keyOne" ) ); - assertEquals( "valueTwo", (String) map.get( "keyTwo" ) ); + assertEquals( "valueTwo", map.get( "keyTwo" ) ); } /** @@ -157,7 +156,7 @@ public class MojoRuleTest rule.setVariableValueToObject( mojo, "keyOne", "myValueOne" ); - assertEquals( "myValueOne", (String) rule.getVariableValueFromObject( mojo, "keyOne" ) ); + assertEquals( "myValueOne", rule.getVariableValueFromObject( mojo, "keyOne" ) ); } diff --git a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoTestCaseTest.java b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoTestCaseTest.java index edd0236..c0364f3 100644 --- a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoTestCaseTest.java +++ b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoTestCaseTest.java @@ -28,7 +28,6 @@ import java.util.Map; /** * @author Jason van Zyl - * @version $Id$ */ public class MojoTestCaseTest extends AbstractMojoTestCase @@ -40,6 +39,7 @@ public class MojoTestCaseTest private PlexusConfiguration pluginConfiguration; /** {@inheritDoc} */ + @Override protected void setUp() throws Exception { diff --git a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ParametersMojo.java b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ParametersMojo.java index a1436fe..13d3029 100644 --- a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ParametersMojo.java +++ b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ParametersMojo.java @@ -34,6 +34,7 @@ public class ParametersMojo public String withPropertyAndDefault; + @Override public void execute() throws MojoExecutionException, MojoFailureException { diff --git a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/SimpleMojo.java b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/SimpleMojo.java index 4a101ec..85ea293 100644 --- a/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/SimpleMojo.java +++ b/maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/SimpleMojo.java @@ -24,7 +24,6 @@ import org.apache.maven.plugin.MojoExecutionException; /** * @author Jason van Zyl - * @version $Id$ */ public class SimpleMojo extends AbstractMojo @@ -43,6 +42,7 @@ public class SimpleMojo return keyTwo; } + @Override public void execute() throws MojoExecutionException { diff --git a/pom.xml b/pom.xml index 98c032d..3777a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -147,12 +147,7 @@ under the License. <mavenVersion>3.2.5</mavenVersion> <plexusVersion>1.5.5</plexusVersion> <maven.site.path>plugin-testing-archives/LATEST</maven.site.path> - <!-- Not sure if this is intentional but MojoRule has an @Override annotation from the interface which is - only allowed starting in Java 1.6. So if the author intends only 1.5 then that @Override annotation needs - to be removed. - --> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> + <javaVersion>7</javaVersion> </properties> <dependencyManagement> @@ -242,26 +237,6 @@ under the License. </plugins> </pluginManagement> <plugins> - <plugin><!-- TODO remove when upgrading to maven-parent 25 --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-bytecode-version</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <enforceBytecodeVersion> - <maxJdkVersion>${maven.compiler.target}</maxJdkVersion> - </enforceBytecodeVersion> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> <inherited>false</inherited>
