You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/04/19 19:21:50 UTC

[maven-ear-plugin] 03/06: WIP - Migration. fixed renaming.

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch itf-extension
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git

commit b017c8e12811ea939f98219e2c30cfc5c33eba7e
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Apr 18 21:49:54 2020 +0200

    WIP - Migration. fixed renaming.
---
 src/test/java/org/apache/maven/plugins/ear/it/EARProjectIT.java       | 4 ----
 .../apache/maven/plugins/ear/it/{EARIT => EARInvokerIT}/basic/pom.xml | 0
 .../basic}/src/main/application/META-INF/appserver-application.xml    | 0
 .../filenamemapping_usage_fail/ear-module/pom.xml                     | 0
 .../filenamemapping_usage_fail/invoker.properties                     | 0
 .../ear/it/{EARIT => EARInvokerIT}/filenamemapping_usage_fail/pom.xml | 0
 .../{EARIT => EARInvokerIT}/filenamemapping_usage_fail/verify.groovy  | 0
 .../filenamemapping_usage_fail}/war-module/pom.xml                    | 0
 .../war-module/src/main/webapp/WEB-INF/web.xml                        | 0
 .../apache/maven/plugins/ear/it/{EARIT => EARInvokerIT}/jboss/pom.xml | 0
 .../jboss}/src/main/application/META-INF/appserver-application.xml    | 0
 .../maven/plugins/ear/it/{EARIT => EARInvokerIT}/jboss/verify.bsh     | 0
 .../ear/it/{EARIT => EARInvokerIT}/mear_198/invoker.properties        | 0
 .../maven/plugins/ear/it/{EARIT => EARInvokerIT}/mear_198/pom.xml     | 0
 .../ear/it/{EARIT => EARInvokerIT}/mear_198/src/main/java/A.java      | 0
 .../maven/plugins/ear/it/{EARIT => EARInvokerIT}/mear_198/verify.bsh  | 0
 .../mear_243_skinny_wars_provided/ear-module/pom.xml                  | 0
 .../it/{EARIT => EARInvokerIT}/mear_243_skinny_wars_provided/pom.xml  | 0
 .../{EARIT => EARInvokerIT}/mear_243_skinny_wars_provided/verify.bsh  | 0
 .../mear_243_skinny_wars_provided}/war-module/pom.xml                 | 0
 .../war-module/src/main/webapp/WEB-INF/web.xml                        | 0
 .../plugins/ear/it/{EARIT => EARInvokerIT}/packaging_excludes/pom.xml | 0
 .../ear/it/{EARIT => EARInvokerIT}/packaging_excludes/verify.bsh      | 0
 .../plugins/ear/it/{EARIT => EARInvokerIT}/packaging_includes/pom.xml | 0
 .../ear/it/{EARIT => EARInvokerIT}/resource_custom_directory/pom.xml  | 0
 .../src/main/application/APP-INF/classes/foo.properties               | 0
 .../ear/it/{EARIT => EARInvokerIT}/same_artifactId/app/pom.xml        | 0
 .../{EARIT => EARInvokerIT}/same_artifactId/business-service/pom.xml  | 0
 .../same_artifactId/business-service/src/main/java/com/example/B.java | 0
 .../it/{EARIT => EARInvokerIT}/same_artifactId/ejb-service/pom.xml    | 0
 .../same_artifactId/ejb-service/src/main/java/com/example/A.java      | 0
 .../ear/it/{EARIT => EARInvokerIT}/same_artifactId/invoker.properties | 0
 .../plugins/ear/it/{EARIT => EARInvokerIT}/same_artifactId/pom.xml    | 0
 .../ear/it/{EARIT => EARInvokerIT}/same_artifactId/verify.groovy      | 0
 .../ear/it/{EARIT => EARInvokerIT}/skinny_wars/ear-module/pom.xml     | 0
 .../{EARIT/skinny_wars_javaee5 => EARInvokerIT/skinny_wars}/pom.xml   | 0
 .../plugins/ear/it/{EARIT => EARInvokerIT}/skinny_wars/verify.bsh     | 0
 .../ear/it/{EARIT => EARInvokerIT}/skinny_wars/war-module/pom.xml     | 0
 .../skinny_wars}/war-module/src/main/webapp/WEB-INF/web.xml           | 0
 .../skinny_wars_filenamemapping_full/ear-module/pom.xml               | 0
 .../skinny_wars_filenamemapping_full}/pom.xml                         | 0
 .../skinny_wars_filenamemapping_full/verify.bsh                       | 0
 .../skinny_wars_filenamemapping_full}/war-module/pom.xml              | 0
 .../war-module/src/main/webapp/WEB-INF/web.xml                        | 0
 .../skinny_wars_filenamemapping_no_version/ear-module/pom.xml         | 0
 .../skinny_wars_filenamemapping_no_version}/pom.xml                   | 0
 .../skinny_wars_filenamemapping_no_version/verify.bsh                 | 0
 .../skinny_wars_filenamemapping_no_version}/war-module/pom.xml        | 0
 .../war-module/src/main/webapp/WEB-INF/web.xml                        | 0
 .../it/{EARIT => EARInvokerIT}/skinny_wars_javaee5/ear-module/pom.xml | 0
 .../{EARIT/skinny_wars => EARInvokerIT/skinny_wars_javaee5}/pom.xml   | 0
 .../ear/it/{EARIT => EARInvokerIT}/skinny_wars_javaee5/verify.bsh     | 0
 .../it/{EARIT => EARInvokerIT}/skinny_wars_javaee5/war-module/pom.xml | 0
 .../skinny_wars_javaee5}/war-module/src/main/webapp/WEB-INF/web.xml   | 0
 .../{EARIT => EARInvokerIT}/skinny_wars_timestamp/ear-module/pom.xml  | 0
 .../ear/it/{EARIT => EARInvokerIT}/skinny_wars_timestamp/pom.xml      | 0
 .../ear/it/{EARIT => EARInvokerIT}/skinny_wars_timestamp/verify.bsh   | 0
 .../{EARIT => EARInvokerIT}/skinny_wars_timestamp/war-module/pom.xml  | 0
 .../skinny_wars_timestamp}/war-module/src/main/webapp/WEB-INF/web.xml | 0
 .../it/{EARIT => EARInvokerIT}/transitive_excludes/invoker.properties | 0
 .../ear/it/{EARIT => EARInvokerIT}/transitive_excludes/pom.xml        | 0
 .../ear/it/{EARIT => EARInvokerIT}/transitive_excludes/verify.bsh     | 0
 62 files changed, 4 deletions(-)

diff --git a/src/test/java/org/apache/maven/plugins/ear/it/EARProjectIT.java b/src/test/java/org/apache/maven/plugins/ear/it/EARProjectIT.java
index 356b28c..d1f57be 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/EARProjectIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/EARProjectIT.java
@@ -259,10 +259,6 @@ class EARProjectIT
     assertThat(result).isSuccessful().project().hasTarget().withEarFile();
   }
   @MavenTest
-  void project_052(MavenExecutionResult result) {
-    assertThat(result).isSuccessful().project().hasTarget().withEarFile();
-  }
-  @MavenTest
   void project_053(MavenExecutionResult result) {
     assertThat(result).isSuccessful().project().hasTarget().withEarFile();
   }
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/basic/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/basic/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/basic/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/basic/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/jboss/src/main/application/META-INF/appserver-application.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/basic/src/main/application/META-INF/appserver-application.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/jboss/src/main/application/META-INF/appserver-application.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/basic/src/main/application/META-INF/appserver-application.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/ear-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/ear-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/invoker.properties b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/invoker.properties
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/invoker.properties
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/invoker.properties
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/verify.groovy b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/verify.groovy
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/verify.groovy
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/verify.groovy
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/war-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/war-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/filenamemapping_usage_fail/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/jboss/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/jboss/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/jboss/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/jboss/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/basic/src/main/application/META-INF/appserver-application.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/jboss/src/main/application/META-INF/appserver-application.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/basic/src/main/application/META-INF/appserver-application.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/jboss/src/main/application/META-INF/appserver-application.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/jboss/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/jboss/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/jboss/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/jboss/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/invoker.properties b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_198/invoker.properties
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/invoker.properties
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_198/invoker.properties
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_198/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_198/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/src/main/java/A.java b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_198/src/main/java/A.java
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/src/main/java/A.java
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_198/src/main/java/A.java
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_198/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_198/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/ear-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/ear-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/war-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/war-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/mear_243_skinny_wars_provided/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/packaging_excludes/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/packaging_excludes/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/packaging_excludes/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/packaging_excludes/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/packaging_excludes/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/packaging_excludes/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/packaging_excludes/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/packaging_excludes/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/packaging_includes/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/packaging_includes/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/packaging_includes/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/packaging_includes/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/resource_custom_directory/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/resource_custom_directory/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/resource_custom_directory/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/resource_custom_directory/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/resource_custom_directory/src/main/application/APP-INF/classes/foo.properties b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/resource_custom_directory/src/main/application/APP-INF/classes/foo.properties
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/resource_custom_directory/src/main/application/APP-INF/classes/foo.properties
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/resource_custom_directory/src/main/application/APP-INF/classes/foo.properties
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/app/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/app/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/app/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/app/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/business-service/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/business-service/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/src/main/java/com/example/B.java b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/business-service/src/main/java/com/example/B.java
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/src/main/java/com/example/B.java
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/business-service/src/main/java/com/example/B.java
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/ejb-service/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/ejb-service/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/src/main/java/com/example/A.java b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/ejb-service/src/main/java/com/example/A.java
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/src/main/java/com/example/A.java
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/ejb-service/src/main/java/com/example/A.java
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/invoker.properties b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/invoker.properties
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/invoker.properties
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/invoker.properties
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/verify.groovy b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/verify.groovy
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/verify.groovy
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/same_artifactId/verify.groovy
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/ear-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/ear-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/war-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/war-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/ear-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/ear-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/war-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/war-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_full/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/ear-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/ear-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_no_version/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/war-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/war-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_filenamemapping_no_version/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/ear-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/ear-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/war-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/war-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_javaee5/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/ear-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/ear-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/verify.bsh
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/war-module/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/war-module/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/skinny_wars_timestamp/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/transitive_excludes/invoker.properties b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/transitive_excludes/invoker.properties
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/transitive_excludes/invoker.properties
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/transitive_excludes/invoker.properties
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/transitive_excludes/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/transitive_excludes/pom.xml
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/transitive_excludes/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/transitive_excludes/pom.xml
diff --git a/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/transitive_excludes/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/transitive_excludes/verify.bsh
similarity index 100%
rename from src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/transitive_excludes/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARInvokerIT/transitive_excludes/verify.bsh