You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/06/08 13:16:45 UTC
[maven-ear-plugin] branch namespace created (now 7d57d4f)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch namespace
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.
at 7d57d4f remove unused branch
This branch includes the following new commits:
new 7d57d4f remove unused branch
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-ear-plugin] 01/01: remove unused branch
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch namespace
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
commit 7d57d4fd5ac2f3cf823653e49c721081864af462
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Mon Jun 8 09:16:30 2020 -0400
remove unused branch
---
.../maven/plugins/ear/it/AbstractEarPluginIT.java | 37 +++++-----------------
1 file changed, 8 insertions(+), 29 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
index 2d62559..8b6d758 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
@@ -91,7 +91,7 @@ public abstract class AbstractEarPluginIT
verifier.getCliOptions().add( "-X" );
verifier.setLocalRepo( localRepo );
- // On linux and macOSX, an exception is thrown if a build failure occurs underneath
+ // On linux and MacOS X, an exception is thrown if a build failure occurs underneath
try
{
verifier.executeGoal( "package" );
@@ -129,52 +129,31 @@ public abstract class AbstractEarPluginIT
}
/**
- * Executes the specified projects and asserts the given artifacts.
+ * Executes the specified projects and asserts the given artifacts. Assert the deployment descriptors are valid
*
* @param projectName the project to test
* @param expectedArtifacts the list of artifacts to be found in the EAR archive
* @param artifactsDirectory whether the artifact is an exploded artifactsDirectory or not
- * @param testDeploymentDescriptors whether we should test deployment descriptors
* @return the base directory of the project
- * @throws Exception Mojo exception in case of an error.
+ * @throws Exception Mojo exception in case of an error
*/
protected File doTestProject( final String projectName, final String[] expectedArtifacts,
- final boolean[] artifactsDirectory, boolean testDeploymentDescriptors )
+ final boolean[] artifactsDirectory )
throws Exception
{
final File baseDir = executeMojo( projectName, new Properties() );
assertEarArchive( baseDir, projectName );
assertEarDirectory( baseDir, projectName );
-
+
assertArchiveContent( baseDir, projectName, expectedArtifacts, artifactsDirectory );
-
- if ( testDeploymentDescriptors )
- {
- assertDeploymentDescriptors( baseDir, projectName );
- }
-
+
+ assertDeploymentDescriptors( baseDir, projectName );
+
return baseDir;
}
/**
- * Executes the specified projects and asserts the given artifacts. Assert the deployment descriptors are valid
- *
- * @param projectName the project to test
- * @param expectedArtifacts the list of artifacts to be found in the EAR archive
- * @param artifactsDirectory whether the artifact is an exploded artifactsDirectory or not
- * @return the base directory of the project
- * @throws Exception Mojo exception in case of an error.
- */
- protected File doTestProject( final String projectName, final String[] expectedArtifacts,
- final boolean[] artifactsDirectory )
- throws Exception
- {
- return doTestProject( projectName, expectedArtifacts, artifactsDirectory, true );
-
- }
-
- /**
* Executes the specified projects and asserts the given artifacts as artifacts (non directory)
*
* @param projectName the project to test