This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/tomcat-maven-plugin.git
The following commit(s) were added to refs/heads/trunk by this push:
new 73cc4be Add missing @Override annotations
73cc4be is described below
commit 73cc4beaefcbe267a65d52110e5c535619c8d033
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jan 27 10:22:20 2026 +0000
Add missing @Override annotations
---
.../java/org/apache/tomcat/maven/common/deployer/TomcatManager.java | 5 +++++
.../apache/tomcat/maven/common/messages/DefaultMessagesProvider.java | 2 ++
.../tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java | 2 ++
.../org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java | 2 ++
.../apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java | 1 +
.../org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java | 2 ++
.../tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java | 1 +
.../org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java | 1 +
.../org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java | 1 +
.../java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java | 1 +
.../src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java | 2 ++
.../org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java | 2 ++
.../apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java | 1 +
.../org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java | 2 ++
.../tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java | 1 +
.../org/apache/tomcat/maven/plugin/tomcat8/run/ExtendedTomcat.java | 1 +
.../org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java | 1 +
.../java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java | 1 +
.../src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java | 2 ++
19 files changed, 31 insertions(+)
diff --git
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
index 93eca7a..47f8393 100644
---
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
+++
b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
@@ -875,24 +875,28 @@ public class TomcatManager
this.verbose = verbose;
}
+ @Override
public long getContentLength()
{
return length >= 0 ? length : ( file.length() >= 0 ? file.length()
: -1 );
}
+ @Override
public InputStream getContent()
throws IOException, IllegalStateException
{
return new FileInputStream( this.file );
}
+ @Override
public boolean isRepeatable()
{
return true;
}
+ @Override
public void writeTo( final OutputStream outstream )
throws IOException
{
@@ -947,6 +951,7 @@ public class TomcatManager
// end transfer
}
+ @Override
public boolean isStreaming()
{
return true;
diff --git
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java
b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java
index c5af17c..e11cf2c 100644
---
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java
+++
b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java
@@ -58,6 +58,7 @@ public class DefaultMessagesProvider
* @param key the key for the required message
* @return the message
*/
+ @Override
public String getMessage( String key )
{
try
@@ -85,6 +86,7 @@ public class DefaultMessagesProvider
* @param params the parameters to be used to format the message with
* @return the formatted message
*/
+ @Override
public String getMessage( String key, Object... params )
{
return MessageFormat.format( getMessage( key ), params );
diff --git
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
index 7c3cf57..55b16b2 100644
---
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
+++
b/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
@@ -54,6 +54,7 @@ public class DefaultClassLoaderEntriesCalculator
private ArchiverManager archiverManager;
+ @Override
public ClassLoaderEntriesCalculatorResult calculateClassPathEntries(
ClassLoaderEntriesCalculatorRequest request )
throws TomcatRunException
{
@@ -179,6 +180,7 @@ public class DefaultClassLoaderEntriesCalculator
{
String[] jars = libsDirectory.list( new
FilenameFilter()
{
+ @Override
public boolean accept( File file, String s )
{
return s.endsWith( ".jar" );
diff --git
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
index 43ea809..98f90ea 100644
---
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
+++
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
@@ -140,6 +140,7 @@ public abstract class AbstractCatalinaMojo
/**
* {@inheritDoc}
*/
+ @Override
public void execute()
throws MojoExecutionException
{
@@ -264,6 +265,7 @@ public abstract class AbstractCatalinaMojo
*
* @return the webapp context path to use
*/
+ @Override
protected String getPath()
{
return path;
diff --git
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
index 6f011c9..2a13ecb 100644
---
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
+++
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
@@ -228,6 +228,7 @@ public abstract class AbstractExecWarMojo
@Parameter
protected String[] excludes;
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
diff --git
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
index 2f1e86d..7231201 100644
---
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
+++
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
@@ -568,6 +568,7 @@ public abstract class AbstractRunMojo
/**
* {@inheritDoc}
*/
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -633,6 +634,7 @@ public abstract class AbstractRunMojo
*
* @return the webapp context path
*/
+ @Override
protected String getPath()
{
return path;
diff --git
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java
index 23b9828..fc3bf8c 100644
---
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java
+++
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractStandaloneWarMojo.java
@@ -76,6 +76,7 @@ public abstract class AbstractStandaloneWarMojo
@Parameter(property = "maven.tomcat.exec.war.attachArtifactType",
defaultValue = "war", required = true)
protected String attachArtifactClassifierType;
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
diff --git
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
index 4c9c01d..96a8959 100644
---
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
+++
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
@@ -42,6 +42,7 @@ public class ExtendedTomcat
this.configurationDir = configurationDir;
}
+ @Override
public Context addWebapp( Host host, String url, String name, String path )
{
diff --git
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
index 8802fbb..b620185 100644
---
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
+++
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
@@ -67,6 +67,7 @@ public class ShutdownMojo
* @throws org.apache.maven.plugin.MojoExecutionException
* if shutting down one or all servers failed
*/
+ @Override
public void execute()
throws MojoExecutionException
{
diff --git
a/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
b/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
index a67df80..7f805e0 100644
---
a/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
+++
b/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
@@ -26,6 +26,7 @@ import org.apache.maven.it.VerificationException;
public class Tomcat7SimpleWarProjectIT
extends AbstractSimpleWarProjectIT
{
+ @Override
protected int getTimeout()
{
return 20000;
diff --git
a/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
b/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
index 994bf9b..ef6b707 100644
---
a/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
+++
b/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
@@ -182,6 +182,7 @@ public class Tomcat7Runner
{
codeSourceWar = AccessController.doPrivileged( new
PrivilegedAction<File>()
{
+ @Override
public File run()
{
try
@@ -259,6 +260,7 @@ public class Tomcat7Runner
{
tomcat = new Tomcat()
{
+ @Override
public Context addWebapp( Host host, String url, String name,
String path )
{
diff --git
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java
index 1d95b08..80a81ca 100644
---
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java
+++
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java
@@ -124,6 +124,7 @@ public abstract class AbstractCatalinaMojo
/**
* {@inheritDoc}
*/
+ @Override
public void execute()
throws MojoExecutionException
{
@@ -238,6 +239,7 @@ public abstract class AbstractCatalinaMojo
*
* @return the webapp context path to use
*/
+ @Override
protected String getPath()
{
return path;
diff --git
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
index d98362f..5f56ccf 100644
---
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
+++
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
@@ -219,6 +219,7 @@ public abstract class AbstractExecWarMojo
@Parameter
protected String[] excludes;
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
diff --git
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
index f97cf17..661dd68 100644
---
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
+++
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
@@ -570,6 +570,7 @@ public abstract class AbstractRunMojo
/**
* {@inheritDoc}
*/
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -635,6 +636,7 @@ public abstract class AbstractRunMojo
*
* @return the webapp context path
*/
+ @Override
protected String getPath()
{
return path;
diff --git
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java
index 474c087..6f79b0d 100644
---
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java
+++
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java
@@ -76,6 +76,7 @@ public abstract class AbstractStandaloneWarMojo
@Parameter( property = "maven.tomcat.exec.war.attachArtifactType",
defaultValue = "war", required = true )
protected String attachArtifactClassifierType;
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
diff --git
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ExtendedTomcat.java
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ExtendedTomcat.java
index 377043c..882e377 100644
---
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ExtendedTomcat.java
+++
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ExtendedTomcat.java
@@ -42,6 +42,7 @@ public class ExtendedTomcat
this.configurationDir = configurationDir;
}
+ @Override
public Context addWebapp( Host host, String url, String name, String path )
{
diff --git
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java
index e75b443..3e1caae 100644
---
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java
+++
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java
@@ -67,6 +67,7 @@ public class ShutdownMojo
* @throws org.apache.maven.plugin.MojoExecutionException
* if shutting down one or all servers failed
*/
+ @Override
public void execute()
throws MojoExecutionException
{
diff --git
a/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
b/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
index 7013bf7..09a6e1b 100644
---
a/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
+++
b/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
@@ -26,6 +26,7 @@ import org.apache.maven.it.VerificationException;
public class Tomcat8SimpleWarProjectIT
extends AbstractSimpleWarProjectIT
{
+ @Override
protected int getTimeout()
{
return 20000;
diff --git
a/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java
b/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java
index 39ddcb5..0ab801f 100644
---
a/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java
+++
b/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java
@@ -174,6 +174,7 @@ public class Tomcat8Runner
{
codeSourceWar = AccessController.doPrivileged( new
PrivilegedAction<File>()
{
+ @Override
public File run()
{
try
@@ -251,6 +252,7 @@ public class Tomcat8Runner
{
tomcat = new Tomcat()
{
+ @Override
public Context addWebapp( Host host, String url, String name,
String path )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
