Use surefire instead of failsafe plugin.

- No need to use integration tests after test bundles have been
  moved to separate modules.

5 files changed, 18 insertions, 19 deletions

diff --git a/bundle-plugin-test/integration-test/pom.xml b/bundle-plugin-test/integration-test/pom.xml
index 642d74fb0e9..42d3b0e4d62 100644
--- a/bundle-plugin-test/integration-test/pom.xml
+++ b/bundle-plugin-test/integration-test/pom.xml
@@ -56,23 +56,13 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.9</version>
-        <executions>
-          <execution>
-            <id>integration-test</id>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
+        <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <trimStackTrace>false</trimStackTrace>
+          <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
           <systemPropertyVariables>
             <test.bundle.path>${project.build.directory}/dependency</test.bundle.path>
-            <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
           </systemPropertyVariables>
+          <trimStackTrace>false</trimStackTrace>
         </configuration>
       </plugin>
       <plugin>
diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleIT.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleTest.java
index 5e76b08ab9f..9fb7e0e03ca 100644
--- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleIT.java
+++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/BundleTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertThat;
  *
  * @author Tony Vaagenes
  */
-public class BundleIT {
+public class BundleTest {
     static final String TEST_BUNDLE_PATH = System.getProperty("test.bundle.path", ".") + "/";
 
     private JarFile jarFile;
diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionIT.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionTest.java
index e2cee71ca9e..307a0698bd1 100644
--- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionIT.java
+++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/ExportPackageVersionTest.java
@@ -9,7 +9,7 @@ import java.io.IOException;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 
-import static com.yahoo.BundleIT.findBundleJar;
+import static com.yahoo.BundleTest.findBundleJar;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertThat;
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertThat;
  *
  * @author gjoranv
  */
-public class ExportPackageVersionIT {
+public class ExportPackageVersionTest {
 
     private static Attributes mainAttributes;
 
diff --git a/bundle-plugin-test/test-bundles/main/pom.xml b/bundle-plugin-test/test-bundles/main/pom.xml
index 90d575c2a0b..c9c9ea270eb 100644
--- a/bundle-plugin-test/test-bundles/main/pom.xml
+++ b/bundle-plugin-test/test-bundles/main/pom.xml
@@ -52,8 +52,9 @@
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy-resources</id>
-            <phase>prepare-package</phase>
+            <id>copy-bundle-classpath-mappings-from-test-to-main</id>
+            <!-- NOTE: Must be done after generating classpath-mappings and before assembling the bundle (see the test-bundles pom) -->
+            <phase>process-test-sources</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
diff --git a/bundle-plugin-test/test-bundles/pom.xml b/bundle-plugin-test/test-bundles/pom.xml
index b18c0b9ba3f..285efd6183e 100644
--- a/bundle-plugin-test/test-bundles/pom.xml
+++ b/bundle-plugin-test/test-bundles/pom.xml
@@ -27,8 +27,16 @@
                 <version>${project.version}</version>
                 <executions>
                     <execution>
+                        <id>generate-classpath-mappings</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>generate-bundle-classpath-mappings</goal>
+                        </goals>
+                    </execution>
+                    <execution>
                         <id>package-test-bundles</id>
-                        <phase>process-classes</phase>
+                        <!-- Must be done after generating classpath-mappings and copying it in the 'main' bundle. -->
+                        <phase>test-compile</phase>
                         <goals>
                             <goal>generate-osgi-manifest</goal>
                             <goal>assemble-container-plugin</goal>