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/16 10:43:27 UTC

[maven-ear-plugin] 17/24: Migrated more tests.

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 ebd08618ec0e615534fc6db6a5672e943822c3ba
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 10 22:41:34 2019 +0100

    Migrated more tests.
---
 .../war-module/pom.xml                             | 47 -----------
 .../war-module/src/main/webapp/WEB-INF/web.xml     | 23 ------
 src/it/skinny-wars-filenamemapping-full/pom.xml    | 36 ---------
 .../ear-module/pom.xml                             | 62 --------------
 .../verify.bsh                                     | 94 ----------------------
 .../org/apache/maven/plugins/ear/it/EARIT.java     | 79 +++++++++++++++++-
 .../filenamemapping_usage_fail}/ear-module/pom.xml |  0
 .../filenamemapping_usage_fail}/invoker.properties |  0
 .../it/EARIT/filenamemapping_usage_fail}/pom.xml   |  0
 .../filenamemapping_usage_fail}/verify.groovy      |  0
 .../filenamemapping_usage_fail}/war-module/pom.xml |  0
 .../war-module/src/main/webapp/WEB-INF/web.xml     |  0
 .../ear/it/EARIT/mear_198}/invoker.properties      |  0
 .../maven/plugins/ear/it/EARIT/mear_198}/pom.xml   |  0
 .../ear/it/EARIT/mear_198}/src/main/java/A.java    | 50 ++++++------
 .../plugins/ear/it/EARIT/mear_198}/verify.bsh      |  0
 .../ear-module/pom.xml                             |  0
 .../EARIT/mear_243_skinny_wars_provided}/pom.xml   |  0
 .../mear_243_skinny_wars_provided}/verify.bsh      |  0
 .../war-module/pom.xml                             |  0
 .../war-module/src/main/webapp/WEB-INF/web.xml     |  0
 .../ear/it/EARIT/same_artifactId}/app/pom.xml      |  0
 .../same_artifactId}/business-service/pom.xml      |  0
 .../src/main/java/com/example/B.java               | 58 ++++++-------
 .../it/EARIT/same_artifactId}/ejb-service/pom.xml  |  0
 .../ejb-service/src/main/java/com/example/A.java   | 58 ++++++-------
 .../it/EARIT/same_artifactId}/invoker.properties   | 36 ++++-----
 .../plugins/ear/it/EARIT/same_artifactId}/pom.xml  |  0
 .../ear/it/EARIT/same_artifactId}/verify.groovy    | 80 +++++++++---------
 .../ear/it/EARIT/skinny_wars}/ear-module/pom.xml   |  0
 .../plugins/ear/it/EARIT/skinny_wars}/pom.xml      |  0
 .../plugins/ear/it/EARIT/skinny_wars}/verify.bsh   |  0
 .../ear/it/EARIT/skinny_wars}/war-module/pom.xml   |  0
 .../war-module/src/main/webapp/WEB-INF/web.xml     |  0
 .../ear-module/pom.xml                             |  0
 .../skinny_wars_filenamemapping_full}/pom.xml      |  0
 .../skinny_wars_filenamemapping_full}/verify.bsh   |  0
 .../war-module/pom.xml                             |  0
 .../war-module/src/main/webapp/WEB-INF/web.xml     |  0
 .../EARIT/skinny_wars_javaee5}/ear-module/pom.xml  |  0
 .../ear/it/EARIT/skinny_wars_javaee5}/pom.xml      |  0
 .../ear/it/EARIT/skinny_wars_javaee5}/verify.bsh   |  0
 .../EARIT/skinny_wars_javaee5}/war-module/pom.xml  |  0
 .../war-module/src/main/webapp/WEB-INF/web.xml     |  0
 .../skinny_wars_timestamp}/ear-module/pom.xml      |  0
 .../ear/it/EARIT/skinny_wars_timestamp}/pom.xml    |  0
 .../ear/it/EARIT/skinny_wars_timestamp}/verify.bsh |  0
 .../skinny_wars_timestamp}/war-module/pom.xml      |  0
 .../war-module/src/main/webapp/WEB-INF/web.xml     |  0
 49 files changed, 216 insertions(+), 407 deletions(-)

diff --git a/src/it/MEAR-243-skinny-wars-provided/war-module/pom.xml b/src/it/MEAR-243-skinny-wars-provided/war-module/pom.xml
deleted file mode 100644
index c6be50e..0000000
--- a/src/it/MEAR-243-skinny-wars-provided/war-module/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.ear.skinnywars</groupId>
-  <artifactId>war-module</artifactId>
-  <version>1.0</version>
-  <packaging>war</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.5</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.1.1</version>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/src/it/MEAR-243-skinny-wars-provided/war-module/src/main/webapp/WEB-INF/web.xml b/src/it/MEAR-243-skinny-wars-provided/war-module/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c1af95d..0000000
--- a/src/it/MEAR-243-skinny-wars-provided/war-module/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app >
-</web-app>
diff --git a/src/it/skinny-wars-filenamemapping-full/pom.xml b/src/it/skinny-wars-filenamemapping-full/pom.xml
deleted file mode 100644
index 572a543..0000000
--- a/src/it/skinny-wars-filenamemapping-full/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.ear.skinnywars</groupId>
-  <artifactId>pom</artifactId>
-  <version>1.0</version>
-  <packaging>pom</packaging>
-
-  <description>Test MEAR-189</description>
-
-  <modules>
-      <module>ear-module</module>
-      <module>war-module</module>
-  </modules>
-</project>
diff --git a/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml b/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml
deleted file mode 100644
index 474fcf1..0000000
--- a/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.ear.skinnywars</groupId>
-  <artifactId>ear-module</artifactId>
-  <version>1.0</version>
-  <packaging>ear</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.its.ear.skinnywars</groupId>
-      <artifactId>war-module</artifactId>
-      <version>1.0</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>@project.groupId@</groupId>
-        <artifactId>@project.artifactId@</artifactId>
-        <version>@project.version@</version>
-        <configuration>
-          <skinnyWars>true</skinnyWars>
-          <defaultLibBundleDir>lib/</defaultLibBundleDir>
-          <!--
-            ! Only artifactId.extension
-            ! no groupId/version etc. 
-           -->
-          <outputFileNameMapping>@{artifactId}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/src/it/skinny-wars-filenamemapping-no-version/verify.bsh b/src/it/skinny-wars-filenamemapping-no-version/verify.bsh
deleted file mode 100644
index 9eec674..0000000
--- a/src/it/skinny-wars-filenamemapping-no-version/verify.bsh
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.regex.*;
-
-File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/war-module.war" );
-System.out.println( "Checking for existence of " + jarFile );
-if ( !jarFile.isFile() )
-{
-    throw new IllegalStateException( "Missing file: " + jarFile );
-}
-
-JarFile jar = new JarFile( jarFile );
-
-String[] includedEntries = {
-    "WEB-INF/web.xml",
-    "META-INF/MANIFEST.MF"
-};
-for ( String included : includedEntries )
-{
-    System.out.println( "Checking for included archive entry " + included );
-    if ( jar.getEntry( included ) == null )
-    {
-        throw new IllegalStateException( "Missing archive entry: " + included );
-    }
-}
-
-Manifest manifest = jar.getManifest();
-String manifestClassPath = manifest.getMainAttributes().getValue("Class-Path");
-if ( !manifestClassPath.equals("lib/commons-lang.jar") )
-{
-    throw new IllegalStateException( "Missing entry in war MANIFEST.MF: lib/commons-lang.jar");
-}
-
-String[] excludedEntries = {
-    "WEB-INF/lib/commons-lang-2.5.jar"
-};
-for ( String excluded : excludedEntries )
-{
-    System.out.println( "Checking for excluded artifact " + excluded );
-    if ( jar.getEntry( excluded ) != null )
-    {
-        throw new IllegalStateException( "Archive entry should be excluded: " + excluded );
-    }
-}
-
-jar.close();
-
-
-File jarFile = new File( basedir, "war-module/target/war-module-1.0.war" );
-System.out.println( "Checking for existence of " + jarFile );
-if ( !jarFile.isFile() )
-{
-    throw new IllegalStateException( "Missing file: " + jarFile );
-}
-
-JarFile jar = new JarFile( jarFile );
-
-String[] includedEntries = {
-    "WEB-INF/web.xml",
-    "META-INF/MANIFEST.MF",
-    "WEB-INF/lib/commons-lang-2.5.jar"
-};
-for ( String included : includedEntries )
-{
-    System.out.println( "Checking for included archive entry " + included );
-    if ( jar.getEntry( included ) == null )
-    {
-        throw new IllegalStateException( "Missing archive entry: " + included );
-    }
-}
-
-jar.close();
-
-return true;
diff --git a/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java b/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
index 2a85352..59d0819 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
@@ -54,6 +54,12 @@ class EARIT {
         .containsOnlyOnce("META-INF/application.xml", "META-INF/appserver-application.xml");
   }
 
+  @MavenTest
+  void filenamemapping_usage_fail(MavenExecutionResult result, MavenProjectResult project) {
+    assertThat(result).isFailure();
+    assertThat(result).log().buildFailure();
+  }
+
   /*
 Archive:  test-1.0.ear
   testing: META-INF/MANIFEST.MF     OK
@@ -77,6 +83,21 @@ Archive:  test-1.0.ear
   }
 
   @MavenTest
+  void mear_243_skinny_wars_provided(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
+    assertThat(result).isSuccessful();
+    assertThat(log).isSuccessful();
+    assertThat(project).hasModule("ear-module");
+    assertThat(project).hasModule("war-module");
+  }
+
+  @MavenTest(goals = {"clean", "package"})
+  void mear_198(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
+    assertThat(result).isSuccessful();
+    assertThat(log).isSuccessful();
+    assertThat(project).hasTarget();
+  }
+
+  @MavenTest
   void packaging_excludes(MavenExecutionResult result, MavenProjectResult project) {
     assertThat(result).isSuccessful();
     assertThat(project).hasTarget()
@@ -99,12 +120,49 @@ Archive:  test-1.0.ear
   void resource_custom_directory(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
     assertThat(result).isSuccessful();
     assertThat(log).isSuccessful();
-    assertThat(project).hasTarget()
+    assertThat(result).project().hasTarget()
         .withEarFile()
         .containsOnlyOnce("META-INF/application.xml", "APP-INF/classes/foo.properties");
   }
 
   @MavenTest
+  void same_artifactId(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
+    assertThat(result).isSuccessful();
+    assertThat(log).isSuccessful();
+    assertThat(project).hasModule("war-module");
+    assertThat(project).hasModule("ear-module");
+  }
+
+  @MavenTest
+  void skinny_wars(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
+    assertThat(result).isSuccessful();
+    assertThat(log).isSuccessful();
+    assertThat(project).hasModule("war-module");
+    assertThat(project).hasModule("ear-module");
+  }
+
+  @MavenTest
+  void skinny_wars_filenamemapping_full(MavenExecutionResult result) {
+    assertThat(result).isSuccessful();
+    assertThat(result).project().hasModule("war-module");
+    assertThat(result).project().hasModule("ear-module");
+    //    //FIXME: The following checking is not correct:
+    //    //File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/war-module.war" );
+    //    assertThat(result).project()
+    //        .withModule("war-module")
+    //        .withWarFile()
+    //        .containsOnlyOnce("WEB-INF/web.xml", "META-INF/MANIFEST.MF");
+    //        //FIXME: Check if the following works correctly: .doesNotContain("WEB-INF/lib/commons-lang-2.5.jar");
+    //
+    //    assertThat(result).project()
+    //        .withModule("war-module")
+    //        .withWarFile()
+    //        .containsOnlyOnce("WEB-INF/web.xml", "META-INF/MANIFEST.MF", "WEB-INF/lib/commons-lang-2.5.jar");
+    //
+    //    assertThat(result).project().withModule(  "ear-module").withEarFile();
+  }
+
+  @MavenTest
   void skinny_wars_filenamemapping_no_version(MavenExecutionResult result) {
     assertThat(result).isSuccessful();
     assertThat(result).project().hasModule("war-module");
@@ -114,14 +172,28 @@ Archive:  test-1.0.ear
         .withModule("war-module")
         .withWarFile()
         .containsOnlyOnce("WEB-INF/web.xml", "META-INF/MANIFEST.MF");
-        //FIXME: Check if the following works correctly: .doesNotContain("WEB-INF/lib/commons-lang-2.5.jar");
+    //FIXME: Check if the following works correctly: .doesNotContain("WEB-INF/lib/commons-lang-2.5.jar");
 
     assertThat(result).project()
         .withModule("war-module")
         .withWarFile()
         .containsOnlyOnce("WEB-INF/web.xml", "META-INF/MANIFEST.MF", "WEB-INF/lib/commons-lang-2.5.jar");
 
-    assertThat(result).project().withModule(  "ear-module").withEarFile();
+    assertThat(result).project().withModule("ear-module").withEarFile();
+  }
+
+  @MavenTest
+  void skinny_wars_javaee5(MavenExecutionResult result, MavenProjectResult project) {
+    assertThat(result).isSuccessful();
+    assertThat(project).hasModule("war-module");
+    assertThat(project).hasModule("ear-module");
+  }
+
+  @MavenTest
+  void skinny_wars_timestamp(MavenExecutionResult result, MavenProjectResult project) {
+    assertThat(result).isSuccessful();
+    assertThat(project).hasModule("war-module");
+    assertThat(project).hasModule("ear-module");
   }
 
   @MavenTest
@@ -132,5 +204,4 @@ Archive:  test-1.0.ear
         .withEarFile()
         .containsOnlyOnce("org.apache.maven-maven-core-3.0.jar", "META-INF/application.xml");
   }
-
 }
diff --git a/src/it/filenamemapping-usage-fail/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/ear-module/pom.xml
similarity index 100%
rename from src/it/filenamemapping-usage-fail/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/ear-module/pom.xml
diff --git a/src/it/filenamemapping-usage-fail/invoker.properties b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/invoker.properties
similarity index 100%
rename from src/it/filenamemapping-usage-fail/invoker.properties
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/invoker.properties
diff --git a/src/it/filenamemapping-usage-fail/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/pom.xml
similarity index 100%
rename from src/it/filenamemapping-usage-fail/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/pom.xml
diff --git a/src/it/filenamemapping-usage-fail/verify.groovy b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/verify.groovy
similarity index 100%
rename from src/it/filenamemapping-usage-fail/verify.groovy
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/verify.groovy
diff --git a/src/it/skinny-wars/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/war-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/war-module/pom.xml
diff --git a/src/it/skinny-wars/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/it/skinny-wars/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/filenamemapping_usage_fail/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/it/MEAR-198/invoker.properties b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/invoker.properties
similarity index 100%
rename from src/it/MEAR-198/invoker.properties
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/invoker.properties
diff --git a/src/it/MEAR-198/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/pom.xml
similarity index 100%
rename from src/it/MEAR-198/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/pom.xml
diff --git a/src/it/MEAR-198/src/main/java/A.java b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/src/main/java/A.java
similarity index 97%
rename from src/it/MEAR-198/src/main/java/A.java
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/src/main/java/A.java
index 474b0a6..10a7574 100755
--- a/src/it/MEAR-198/src/main/java/A.java
+++ b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/src/main/java/A.java
@@ -1,25 +1,25 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class A {
-    public static void main(String[] args) {
-
-    }
-}
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class A {
+    public static void main(String[] args) {
+
+    }
+}
diff --git a/src/it/MEAR-198/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/verify.bsh
similarity index 100%
rename from src/it/MEAR-198/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_198/verify.bsh
diff --git a/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/ear-module/pom.xml
similarity index 100%
rename from src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/ear-module/pom.xml
diff --git a/src/it/MEAR-243-skinny-wars-provided/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/pom.xml
similarity index 100%
rename from src/it/MEAR-243-skinny-wars-provided/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/pom.xml
diff --git a/src/it/MEAR-243-skinny-wars-provided/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/verify.bsh
similarity index 100%
rename from src/it/MEAR-243-skinny-wars-provided/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/verify.bsh
diff --git a/src/it/skinny-wars-filenamemapping-no-version/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/war-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars-filenamemapping-no-version/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/mear_243_skinny_wars_provided/war-module/pom.xml
diff --git a/src/it/skinny-wars-timestamp/war-module/src/main/webapp/WEB-INF/web.xml b/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
similarity index 100%
rename from src/it/skinny-wars-timestamp/war-module/src/main/webapp/WEB-INF/web.xml
rename to 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
diff --git a/src/it/same-artifactId/app/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/app/pom.xml
similarity index 100%
rename from src/it/same-artifactId/app/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/app/pom.xml
diff --git a/src/it/same-artifactId/business-service/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/pom.xml
similarity index 100%
rename from src/it/same-artifactId/business-service/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/pom.xml
diff --git a/src/it/same-artifactId/business-service/src/main/java/com/example/B.java b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/src/main/java/com/example/B.java
similarity index 96%
rename from src/it/same-artifactId/business-service/src/main/java/com/example/B.java
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/src/main/java/com/example/B.java
index c8e71cc..ad14f98 100644
--- a/src/it/same-artifactId/business-service/src/main/java/com/example/B.java
+++ b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/business-service/src/main/java/com/example/B.java
@@ -1,29 +1,29 @@
-package com.example;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import javax.ejb.Stateless;
-
-@Stateless
-public class B {
-
-    public void doSmth() { }
-
-}
+package com.example;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class B {
+
+    public void doSmth() { }
+
+}
diff --git a/src/it/same-artifactId/ejb-service/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/pom.xml
similarity index 100%
rename from src/it/same-artifactId/ejb-service/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/pom.xml
diff --git a/src/it/same-artifactId/ejb-service/src/main/java/com/example/A.java b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/src/main/java/com/example/A.java
similarity index 96%
rename from src/it/same-artifactId/ejb-service/src/main/java/com/example/A.java
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/src/main/java/com/example/A.java
index c10ef27..bf326ce 100644
--- a/src/it/same-artifactId/ejb-service/src/main/java/com/example/A.java
+++ b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/ejb-service/src/main/java/com/example/A.java
@@ -1,29 +1,29 @@
-package com.example;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import javax.ejb.Stateless;
-
-@Stateless
-public class A {
-
-    public void doSomething() { }
-
-}
+package com.example;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class A {
+
+    public void doSomething() { }
+
+}
diff --git a/src/it/same-artifactId/invoker.properties b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/invoker.properties
similarity index 94%
rename from src/it/same-artifactId/invoker.properties
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/invoker.properties
index aebc32d..56cefe5 100644
--- a/src/it/same-artifactId/invoker.properties
+++ b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/invoker.properties
@@ -1,19 +1,19 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# required due to javax:javaee-api:6.0
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# required due to javax:javaee-api:6.0
 invoker.java.version = 1.6+ 
\ No newline at end of file
diff --git a/src/it/same-artifactId/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/pom.xml
similarity index 100%
rename from src/it/same-artifactId/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/pom.xml
diff --git a/src/it/same-artifactId/verify.groovy b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/verify.groovy
similarity index 97%
rename from src/it/same-artifactId/verify.groovy
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/verify.groovy
index 9683344..c8b0475 100644
--- a/src/it/same-artifactId/verify.groovy
+++ b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/same_artifactId/verify.groovy
@@ -1,41 +1,41 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
- def service1 = new File( basedir, "app/target/app-1.0-SNAPSHOT/service1.jar" ).toURL().toString();
- assert new URL( "jar:${service1}!/com/example/A.class" ).content != null
- try
- {
-   new URL( "jar:${service1}!/com/example/B.class" ).content
-   assert false : "service1.jar should not contain com.example.B.class" 
- }
- catch( FileNotFoundException e)
- {
- }
- 
- def service2 = new File( basedir, "app/target/app-1.0-SNAPSHOT/service2.jar" ).toURL().toString();
- assert new URL( "jar:${service2}!/com/example/B.class").content != null
-  try
- {
-   new URL( "jar:${service2}!/com/example/A.class").content
-   assert false : "service2.jar should not contain com.example.A.class" 
- }
- catch( FileNotFoundException e)
- {
- }
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ 
+ def service1 = new File( basedir, "app/target/app-1.0-SNAPSHOT/service1.jar" ).toURL().toString();
+ assert new URL( "jar:${service1}!/com/example/A.class" ).content != null
+ try
+ {
+   new URL( "jar:${service1}!/com/example/B.class" ).content
+   assert false : "service1.jar should not contain com.example.B.class" 
+ }
+ catch( FileNotFoundException e)
+ {
+ }
+ 
+ def service2 = new File( basedir, "app/target/app-1.0-SNAPSHOT/service2.jar" ).toURL().toString();
+ assert new URL( "jar:${service2}!/com/example/B.class").content != null
+  try
+ {
+   new URL( "jar:${service2}!/com/example/A.class").content
+   assert false : "service2.jar should not contain com.example.A.class" 
+ }
+ catch( FileNotFoundException e)
+ {
+ }
  
\ No newline at end of file
diff --git a/src/it/skinny-wars/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/ear-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/ear-module/pom.xml
diff --git a/src/it/skinny-wars/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/pom.xml
similarity index 100%
rename from src/it/skinny-wars/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/pom.xml
diff --git a/src/it/skinny-wars/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/verify.bsh
similarity index 100%
rename from src/it/skinny-wars/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/verify.bsh
diff --git a/src/it/skinny-wars-filenamemapping-full/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/war-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars-filenamemapping-full/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/war-module/pom.xml
diff --git a/src/it/skinny-wars-javaee5/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/it/skinny-wars-javaee5/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/ear-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/ear-module/pom.xml
diff --git a/src/it/skinny-wars-filenamemapping-no-version/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/pom.xml
similarity index 100%
rename from src/it/skinny-wars-filenamemapping-no-version/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/pom.xml
diff --git a/src/it/skinny-wars-filenamemapping-full/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/verify.bsh
similarity index 100%
rename from src/it/skinny-wars-filenamemapping-full/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/verify.bsh
diff --git a/src/it/filenamemapping-usage-fail/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/war-module/pom.xml
similarity index 100%
rename from src/it/filenamemapping-usage-fail/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_filenamemapping_full/war-module/pom.xml
diff --git a/src/it/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/EARIT/skinny_wars_filenamemapping_full/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/it/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/EARIT/skinny_wars_filenamemapping_full/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/it/skinny-wars-javaee5/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/ear-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars-javaee5/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/ear-module/pom.xml
diff --git a/src/it/skinny-wars-javaee5/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/pom.xml
similarity index 100%
rename from src/it/skinny-wars-javaee5/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/pom.xml
diff --git a/src/it/skinny-wars-javaee5/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/verify.bsh
similarity index 100%
rename from src/it/skinny-wars-javaee5/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/verify.bsh
diff --git a/src/it/skinny-wars-javaee5/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/war-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars-javaee5/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/war-module/pom.xml
diff --git a/src/it/skinny-wars-filenamemapping-full/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_javaee5/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/it/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/EARIT/skinny_wars_javaee5/war-module/src/main/webapp/WEB-INF/web.xml
diff --git a/src/it/skinny-wars-timestamp/ear-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/ear-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars-timestamp/ear-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/ear-module/pom.xml
diff --git a/src/it/skinny-wars-timestamp/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/pom.xml
similarity index 100%
rename from src/it/skinny-wars-timestamp/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/pom.xml
diff --git a/src/it/skinny-wars-timestamp/verify.bsh b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/verify.bsh
similarity index 100%
rename from src/it/skinny-wars-timestamp/verify.bsh
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/verify.bsh
diff --git a/src/it/skinny-wars-timestamp/war-module/pom.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/war-module/pom.xml
similarity index 100%
rename from src/it/skinny-wars-timestamp/war-module/pom.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/war-module/pom.xml
diff --git a/src/it/filenamemapping-usage-fail/war-module/src/main/webapp/WEB-INF/web.xml b/src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/war-module/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/it/filenamemapping-usage-fail/war-module/src/main/webapp/WEB-INF/web.xml
rename to src/test/resources-its/org/apache/maven/plugins/ear/it/EARIT/skinny_wars_timestamp/war-module/src/main/webapp/WEB-INF/web.xml