This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
commit 06f12af13f8edd78791db99cf3d5f5c058a3e46d Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 03:00:26 2026 +0000 Use System.lineSeparator(), @Override and try-with-resources --- .../plugins/war/packaging/AbstractWarPackagingTask.java | 5 +++++ .../plugins/war/packaging/CopyUserManifestTask.java | 1 + .../org/apache/maven/plugins/war/WarOverlaysTest.java | 1 + .../plugins/war/packaging/TestWarPackagingContext.java | 16 ++++++++++++++++ .../apache/maven/plugins/war/stub/AarArtifactStub.java | 6 ++++++ .../maven/plugins/war/stub/AbstractArtifactStub.java | 7 +++++++ .../apache/maven/plugins/war/stub/EJBArtifactStub.java | 7 +++++++ .../plugins/war/stub/EJBArtifactStubWithClassifier.java | 8 ++++++++ .../maven/plugins/war/stub/EJBClientArtifactStub.java | 8 ++++++++ .../plugins/war/stub/IncludeExcludeWarArtifactStub.java | 2 ++ .../apache/maven/plugins/war/stub/JarArtifactStub.java | 14 ++++++++++++++ .../apache/maven/plugins/war/stub/MarArtifactStub.java | 6 ++++++ .../plugins/war/stub/MavenProject4CopyConstructor.java | 1 + .../plugins/war/stub/MavenProjectArtifactsStub.java | 3 +++ .../maven/plugins/war/stub/MavenProjectBasicStub.java | 11 +++++++++++ .../apache/maven/plugins/war/stub/MavenZipProject.java | 2 ++ .../org/apache/maven/plugins/war/stub/ModelStub.java | 10 ++++++++++ .../apache/maven/plugins/war/stub/PARArtifactStub.java | 3 +++ .../apache/maven/plugins/war/stub/ProjectHelperStub.java | 3 +++ .../org/apache/maven/plugins/war/stub/ResourceStub.java | 4 ++++ .../apache/maven/plugins/war/stub/TLDArtifactStub.java | 3 +++ .../maven/plugins/war/stub/WarArtifact4CCStub.java | 3 +++ .../apache/maven/plugins/war/stub/WarArtifactStub.java | 9 +++++++++ .../apache/maven/plugins/war/stub/WarOverlayStub.java | 4 ++++ .../apache/maven/plugins/war/stub/XarArtifactStub.java | 6 ++++++ .../apache/maven/plugins/war/stub/ZipArtifactStub.java | 6 ++++++ 26 files changed, 149 insertions(+) diff --git a/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java index b5f4b37..58cf406 100644 --- a/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java +++ b/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java @@ -172,14 +172,17 @@ public abstract class AbstractWarPackagingTask implements WarPackagingTask { if (file.isFile()) { context.getWebappStructure() .registerFile(sourceId, targetFilename, new WebappStructure.RegistrationCallback() { + @Override public void registered(String ownerId, String targetFilename) throws IOException { copyFile(context, file, targetFile, targetFilename, false); } + @Override public void alreadyRegistered(String ownerId, String targetFilename) throws IOException { copyFile(context, file, targetFile, targetFilename, true); } + @Override public void refused(String ownerId, String targetFilename, String actualOwnerId) throws IOException { context.getLog() @@ -190,6 +193,7 @@ public abstract class AbstractWarPackagingTask implements WarPackagingTask { + actualOwnerId + "]."); } + @Override public void superseded(String ownerId, String targetFilename, String deprecatedOwnerId) throws IOException { context.getLog() @@ -201,6 +205,7 @@ public abstract class AbstractWarPackagingTask implements WarPackagingTask { copyFile(context, file, targetFile, targetFilename, false); } + @Override public void supersededUnknownOwner(String ownerId, String targetFilename, String unknownOwnerId) throws IOException { // CHECKSTYLE_OFF: LineLength diff --git a/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java index 39b023d..da7782d 100644 --- a/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java +++ b/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java @@ -29,6 +29,7 @@ import org.apache.maven.plugin.MojoFailureException; */ public class CopyUserManifestTask extends AbstractWarPackagingTask { + @Override public void performPackaging(WarPackagingContext context) throws MojoExecutionException, MojoFailureException { File userManifest = context.getArchive().getManifestFile(); if (userManifest != null) { diff --git a/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java index faa93c3..2ebb84e 100644 --- a/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java +++ b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java @@ -757,6 +757,7 @@ public class WarOverlaysTest { this.webAppDirIndex = webAppDirectory.getAbsolutePath().length() + 1; } + @Override public boolean accept(File file) { String effectiveRelativePath = buildRelativePath(file); return !(rejectedFilePaths.contains(effectiveRelativePath) || file.isDirectory()); diff --git a/src/test/java/org/apache/maven/plugins/war/packaging/TestWarPackagingContext.java b/src/test/java/org/apache/maven/plugins/war/packaging/TestWarPackagingContext.java index f6b34e6..c82135c 100644 --- a/src/test/java/org/apache/maven/plugins/war/packaging/TestWarPackagingContext.java +++ b/src/test/java/org/apache/maven/plugins/war/packaging/TestWarPackagingContext.java @@ -85,42 +85,58 @@ class TestWarPackagingContext implements WarPackagingContext { @Override public Log getLog() { return new Log() { + @Override public void debug(CharSequence content) {} + @Override public void debug(Throwable content) {} + @Override public void debug(CharSequence content, Throwable error) {} + @Override public void info(CharSequence content) {} + @Override public void info(Throwable content) {} + @Override public void info(CharSequence content, Throwable error) {} + @Override public void warn(CharSequence content) {} + @Override public void warn(Throwable content) {} + @Override public void warn(CharSequence content, Throwable error) {} + @Override public void error(CharSequence content) {} + @Override public void error(Throwable content) {} + @Override public void error(CharSequence content, Throwable error) {} + @Override public boolean isDebugEnabled() { return false; } + @Override public boolean isInfoEnabled() { return false; } + @Override public boolean isWarnEnabled() { return false; } + @Override public boolean isErrorEnabled() { return false; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java index 1fb9910..c6c3fec 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java @@ -35,10 +35,12 @@ public class AarArtifactStub extends AbstractArtifactStub { this.artifactHandler = artifactHandler; } + @Override public void setGroupId(String id) { groupId = id; } + @Override public String getGroupId() { if (groupId != null) { return groupId; @@ -47,18 +49,22 @@ public class AarArtifactStub extends AbstractArtifactStub { } } + @Override public String getType() { return "aar"; } + @Override public String getArtifactId() { return "aarartifact"; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/simple.aar"); } + @Override public ArtifactHandler getArtifactHandler() { return artifactHandler; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java index fb5d457..8ec4430 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java @@ -33,6 +33,7 @@ public abstract class AbstractArtifactStub extends ArtifactStub { this.basedir = basedir; } + @Override public String getVersion() { return "0.0-Test"; } @@ -42,18 +43,22 @@ public abstract class AbstractArtifactStub extends ArtifactStub { return getVersion(); } + @Override public String getScope() { return Artifact.SCOPE_RUNTIME; } + @Override public VersionRange getVersionRange() { return VersionRange.createFromVersion(getVersion()); } + @Override public boolean isOptional() { return false; } + @Override public ArtifactHandler getArtifactHandler() { return new DefaultArtifactHandler(getType()); } @@ -61,6 +66,7 @@ public abstract class AbstractArtifactStub extends ArtifactStub { /* * TODO: Copied from org/apache/maven/artifact/DefaultArtifact.java; Consider merging... */ + @Override public int compareTo(Artifact a) { /* -- We need to support groupId=null (it is missing in DefaultArtifact.java) */ int result; @@ -100,6 +106,7 @@ public abstract class AbstractArtifactStub extends ArtifactStub { /* * TODO: Copied from org/apache/maven/artifact/DefaultArtifact.java; Consider merging... */ + @Override public boolean equals(Object o) { if (o == this) { return true; diff --git a/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java index a3ee0f7..becd285 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java @@ -30,10 +30,12 @@ public class EJBArtifactStub extends AbstractArtifactStub { super(basedir); } + @Override public void setGroupId(String id) { groupId = id; } + @Override public String getGroupId() { if (groupId != null) { return groupId; @@ -42,20 +44,25 @@ public class EJBArtifactStub extends AbstractArtifactStub { } } + @Override public String getType() { return "ejb"; } + @Override public String getArtifactId() { return "ejbartifact"; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/ejb.jar"); } + @Override public ArtifactHandler getArtifactHandler() { return new DefaultArtifactHandler() { + @Override public String getExtension() { return "jar"; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java b/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java index 2545c7e..2eb095d 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java @@ -31,10 +31,12 @@ public class EJBArtifactStubWithClassifier extends AbstractArtifactStub { super(basedir); } + @Override public void setGroupId(String id) { groupId = id; } + @Override public String getGroupId() { if (groupId != null) { return groupId; @@ -43,10 +45,12 @@ public class EJBArtifactStubWithClassifier extends AbstractArtifactStub { } } + @Override public String getType() { return "ejb"; } + @Override public String getArtifactId() { return "ejbartifact"; } @@ -55,16 +59,20 @@ public class EJBArtifactStubWithClassifier extends AbstractArtifactStub { this.classifier = classifier; } + @Override public String getClassifier() { return classifier; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/ejb.jar"); } + @Override public ArtifactHandler getArtifactHandler() { return new DefaultArtifactHandler() { + @Override public String getExtension() { return "jar"; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java index c4e49b1..9974806 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java @@ -30,10 +30,12 @@ public class EJBClientArtifactStub extends AbstractArtifactStub { super(basedir); } + @Override public void setGroupId(String id) { groupId = id; } + @Override public String getGroupId() { if (groupId != null) { return groupId; @@ -42,24 +44,30 @@ public class EJBClientArtifactStub extends AbstractArtifactStub { } } + @Override public String getType() { return "ejb-client"; } + @Override public String getClassifier() { return "client"; } + @Override public String getArtifactId() { return "ejbclientartifact"; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/ejbclient.jar"); } + @Override public ArtifactHandler getArtifactHandler() { return new DefaultArtifactHandler() { + @Override public String getExtension() { return "jar"; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java index 666d07e..dace530 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java @@ -26,10 +26,12 @@ public class IncludeExcludeWarArtifactStub extends WarArtifactStub { setGroupId("wartests"); } + @Override public String getArtifactId() { return "war-include-exclude"; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/include-exclude.war"); } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java index d6af1e5..bea74c5 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java @@ -43,10 +43,12 @@ public class JarArtifactStub extends AbstractArtifactStub { this.artifactHandler = artifactHandler; } + @Override public void setGroupId(String id) { groupId = id; } + @Override public String getGroupId() { if (groupId != null) { return groupId; @@ -55,14 +57,17 @@ public class JarArtifactStub extends AbstractArtifactStub { } } + @Override public String getType() { return "jar"; } + @Override public void setArtifactId(String artifactId) { this.artifactId = artifactId; } + @Override public String getArtifactId() { if (artifactId != null) { return artifactId; @@ -71,6 +76,7 @@ public class JarArtifactStub extends AbstractArtifactStub { } } + @Override public String getVersion() { if (version != null) { return version; @@ -79,18 +85,22 @@ public class JarArtifactStub extends AbstractArtifactStub { } } + @Override public void setVersion(String version) { this.version = version; } + @Override public boolean isOptional() { return optional; } + @Override public void setOptional(boolean optional) { this.optional = optional; } + @Override public String getScope() { if (scope != null) { return scope; @@ -99,10 +109,12 @@ public class JarArtifactStub extends AbstractArtifactStub { } } + @Override public void setScope(String scope) { this.scope = scope; } + @Override public File getFile() { if (file == null) { return new File(basedir, "/target/test-classes/unit/sample_wars/simple.jar"); @@ -110,10 +122,12 @@ public class JarArtifactStub extends AbstractArtifactStub { return file; } + @Override public void setFile(File file) { this.file = file; } + @Override public ArtifactHandler getArtifactHandler() { return artifactHandler; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java index d49fddf..f3bd3cc 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java @@ -35,10 +35,12 @@ public class MarArtifactStub extends AbstractArtifactStub { this.artifactHandler = artifactHandler; } + @Override public void setGroupId(String id) { groupId = id; } + @Override public String getGroupId() { if (groupId != null) { return groupId; @@ -47,18 +49,22 @@ public class MarArtifactStub extends AbstractArtifactStub { } } + @Override public String getType() { return "mar"; } + @Override public String getArtifactId() { return "marartifact"; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/simple.mar"); } + @Override public ArtifactHandler getArtifactHandler() { return artifactHandler; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java b/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java index 4e45fd5..bf7311e 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java @@ -32,6 +32,7 @@ public class MavenProject4CopyConstructor extends MavenProjectBasicStub { initializeParentFields(); } + @Override public List<Artifact> getAttachedArtifacts() { return new LinkedList<>(); } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java b/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java index 4c4a621..7d7766a 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java @@ -38,10 +38,12 @@ public class MavenProjectArtifactsStub extends MavenProjectBasicStub { artifacts.add(stub); } + @Override public Set<Artifact> getArtifacts() { return artifacts; } + @Override public List<Dependency> getDependencies() { if (getArtifacts() == null) { return new ArrayList<>(); @@ -60,6 +62,7 @@ public class MavenProjectArtifactsStub extends MavenProjectBasicStub { return dependencies; } + @Override public List<String> getRuntimeClasspathElements() { List<String> artifacts = new ArrayList<>(); diff --git a/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java b/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java index c54a238..6d20b60 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java @@ -41,14 +41,17 @@ public class MavenProjectBasicStub extends MavenProject { properties = new Properties(); } + @Override public Set<Artifact> getArtifacts() { return new HashSet<>(); } + @Override public String getName() { return "Test Project "; } + @Override public File getBasedir() { // create an isolated environment // see setupTestEnvironment for details @@ -56,18 +59,22 @@ public class MavenProjectBasicStub extends MavenProject { return null; } + @Override public String getGroupId() { return "org.apache.maven.plugin.test"; } + @Override public String getArtifactId() { return "maven-war-plugin-test"; } + @Override public String getPackaging() { return "jar"; } + @Override public String getVersion() { return "0.0-Test"; } @@ -76,16 +83,20 @@ public class MavenProjectBasicStub extends MavenProject { properties.put(key, value); } + @Override public Properties getProperties() { return properties; } + @Override public String getDescription() { return "Test Description"; } + @Override public Organization getOrganization() { return new Organization() { + @Override public String getName() { return "Test Name"; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java b/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java index dd24999..b4977a8 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java @@ -35,10 +35,12 @@ public class MavenZipProject extends MavenProject4CopyConstructor { this.artifacts = new HashSet<>(); } + @Override public Set<Artifact> getArtifacts() { return this.artifacts; } + @Override public Set<Artifact> getDependencyArtifacts() { return this.artifacts; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java b/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java index cb164c9..948cc86 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java @@ -35,42 +35,52 @@ public class ModelStub extends Model { public ModelStub() {} + @Override public String getVersion() { return "0.0-TEST"; } + @Override public String getModelVersion() { return "0.0-TEST"; } + @Override public String getName() { return "Test Model"; } + @Override public String getGroupId() { return "org.apache.maven.test"; } + @Override public String getPackaging() { return "jar"; } + @Override public Parent getParent() { return new Parent(); } + @Override public String getArtifactId() { return "maven-test-plugin"; } + @Override public Properties getProperties() { return new Properties(); } + @Override public List<Profile> getProfiles() { return new LinkedList<>(); } + @Override public List<String> getModules() { return new LinkedList<>(); } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java index 86a1910..23a2022 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java @@ -25,14 +25,17 @@ public class PARArtifactStub extends AbstractArtifactStub { super(basedir); } + @Override public String getType() { return "par"; } + @Override public String getArtifactId() { return "parartifact"; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/sample.par"); } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java b/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java index 8f06802..874b741 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java @@ -43,10 +43,13 @@ public class ProjectHelperStub implements MavenProjectHelper { return artifactClassifier; } + @Override public void attachArtifact(MavenProject project, File artifactFile, String artifactClassifier) {} + @Override public void attachArtifact(MavenProject project, String artifactType, File artifactFile) {} + @Override public void attachArtifact( MavenProject project, String artifactType, String artifactClassifier, File artifactFile) { this.artifactType = artifactType; diff --git a/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java b/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java index 587389a..5c7d703 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java @@ -31,18 +31,22 @@ public class ResourceStub extends Resource { private String directory; + @Override public List<String> getIncludes() { return new ArrayList<>(); } + @Override public List<String> getExcludes() { return new ArrayList<>(); } + @Override public void setDirectory(String directory) { this.directory = directory; } + @Override public String getDirectory() { return directory; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java index c4d9a90..19caf7f 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java @@ -25,14 +25,17 @@ public class TLDArtifactStub extends AbstractArtifactStub { super(basedir); } + @Override public String getType() { return "tld"; } + @Override public String getArtifactId() { return "tldartifact"; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/tld.jar"); } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java index 40faa2e..7e2fe2b 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java @@ -30,14 +30,17 @@ public class WarArtifact4CCStub extends WarArtifactStub { super(basedir); } + @Override public String getGroupId() { return "org.maven.plugin.test"; } + @Override public String getClassifier() { return "testclassifier"; } + @Override public ArtifactHandler getArtifactHandler() { return new DefaultArtifactHandler(); } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java index 93f0506..68dca1d 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java @@ -37,10 +37,12 @@ public class WarArtifactStub extends AbstractArtifactStub { super(basedir); } + @Override public String getType() { return "war"; } + @Override public String getArtifactId() { if (artifactId == null) { return "simple"; @@ -49,10 +51,12 @@ public class WarArtifactStub extends AbstractArtifactStub { } } + @Override public void setArtifactId(String artifactId) { this.artifactId = artifactId; } + @Override public String getGroupId() { if (groupId == null) { return "wartests"; @@ -61,10 +65,12 @@ public class WarArtifactStub extends AbstractArtifactStub { } } + @Override public void setGroupId(String groupId) { this.groupId = groupId; } + @Override public File getFile() { if (file == null) { return new File(basedir, "/target/test-classes/unit/sample_wars/simple.war"); @@ -73,10 +79,12 @@ public class WarArtifactStub extends AbstractArtifactStub { } } + @Override public void setFile(File file) { this.file = file; } + @Override public String getClassifier() { return classifier; } @@ -85,6 +93,7 @@ public class WarArtifactStub extends AbstractArtifactStub { this.classifier = classifier; } + @Override public boolean hasClassifier() { return classifier != null; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java b/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java index eb50708..bfb51e4 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java @@ -44,18 +44,22 @@ public class WarOverlayStub extends AbstractArtifactStub { this.file = warFile; } + @Override public String getType() { return "war"; } + @Override public String getArtifactId() { return artifactId; } + @Override public String getGroupId() { return "wartests"; } + @Override public File getFile() { return file; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java index 2365547..82eda64 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java @@ -35,10 +35,12 @@ public class XarArtifactStub extends AbstractArtifactStub { this.artifactHandler = artifactHandler; } + @Override public void setGroupId(String id) { groupId = id; } + @Override public String getGroupId() { if (groupId != null) { return groupId; @@ -47,18 +49,22 @@ public class XarArtifactStub extends AbstractArtifactStub { } } + @Override public String getType() { return "xar"; } + @Override public String getArtifactId() { return "xarartifact"; } + @Override public File getFile() { return new File(basedir, "/target/test-classes/unit/sample_wars/simple.xar"); } + @Override public ArtifactHandler getArtifactHandler() { return artifactHandler; } diff --git a/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java index 3114f83..3c5aa14 100644 --- a/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java +++ b/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java @@ -35,26 +35,32 @@ public class ZipArtifactStub extends AbstractArtifactStub { this.zip = zipFile; } + @Override public String getId() { return null; } + @Override public String getVersion() { return "1.0"; } + @Override public File getFile() { return this.zip; } + @Override public String getType() { return "zip"; } + @Override public String getArtifactId() { return "zipId"; } + @Override public String getGroupId() { return "zipGroupId"; }
