Move IT for missing target/classes to it-multi-module so now new IT is

needed.

6 files changed, 11 insertions, 100 deletions

diff --git a/jacoco-maven-plugin.test/it/it-ear/it-ear-ear/pom.xml b/jacoco-maven-plugin.test/it/it-ear/it-ear-ear/pom.xml
deleted file mode 100644
index 205accd1..00000000
--- a/jacoco-maven-plugin.test/it/it-ear/it-ear-ear/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright (c) 2009, 2013 Mountainminds GmbH & Co. KG and Contributors
-   All rights reserved. This program and the accompanying materials
-   are made available under the terms of the Eclipse Public License v1.0
-   which accompanies this distribution, and is available at
-   http://www.eclipse.org/legal/epl-v10.html
-
-   Contributors:
-      Evgeny Mandrikov - initial API and implementation
-      Kyle Lieber - implementation of CheckMojo
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>jacoco</groupId>
-    <artifactId>it-ear-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it-ear-ear</artifactId>
-  <packaging>ear</packaging>
-</project>
diff --git a/jacoco-maven-plugin.test/it/it-ear/pom.xml b/jacoco-maven-plugin.test/it/it-ear/pom.xml
deleted file mode 100644
index ac9df42f..00000000
--- a/jacoco-maven-plugin.test/it/it-ear/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright (c) 2009, 2013 Mountainminds GmbH & Co. KG and Contributors
-   All rights reserved. This program and the accompanying materials
-   are made available under the terms of the Eclipse Public License v1.0
-   which accompanies this distribution, and is available at
-   http://www.eclipse.org/legal/epl-v10.html
-
-   Contributors:
-      Evgeny Mandrikov - initial API and implementation
-      Kyle Lieber - implementation of CheckMojo
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>jacoco</groupId>
-    <artifactId>setup-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it-ear-pom</artifactId>
-  <packaging>pom</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>@project.groupId@</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-prepare-agent</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>default-report</id>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <modules>
-    <module>it-ear-jar</module>
-    <module>it-ear-ear</module>
-  </modules>
-</project>
diff --git a/jacoco-maven-plugin.test/it/it-ear/verify.bsh b/jacoco-maven-plugin.test/it/it-ear/verify.bsh
deleted file mode 100644
index 3b45663b..00000000
--- a/jacoco-maven-plugin.test/it/it-ear/verify.bsh
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2013 Mountainminds GmbH & Co. KG and Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Evgeny Mandrikov - initial API and implementation
- *    Kyle Lieber - implementation of CheckMojo
- *
- *******************************************************************************/
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-String buildLog = FileUtils.fileRead( new File( basedir, "build.log" ) );
-if ( buildLog.indexOf( "Skipping JaCoCo execution due to missing classes directory." ) < 0 ) {
-    throw new RuntimeException( "Execution should be skipped when target/classes does not exist." );
-}
diff --git a/jacoco-maven-plugin.test/it/it-ear/it-ear-jar/pom.xml b/jacoco-maven-plugin.test/it/it-multi-module/child-jar-without-sources/pom.xml
index 178d8d6b..4f5b10ed 100644
--- a/jacoco-maven-plugin.test/it/it-ear/it-ear-jar/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-multi-module/child-jar-without-sources/pom.xml
@@ -7,8 +7,7 @@
    http://www.eclipse.org/legal/epl-v10.html
 
    Contributors:
-      Evgeny Mandrikov - initial API and implementation
-      Kyle Lieber - implementation of CheckMojo
+      Mirko Friedenhagen
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -16,9 +15,10 @@
 
   <parent>
     <groupId>jacoco</groupId>
-    <artifactId>it-ear-pom</artifactId>
+    <artifactId>it-multi-module</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>it-ear-jar</artifactId>
+  <!-- report should not choke when target/classes does not exist. -->
+  <artifactId>child-jar-without-sources</artifactId>
 </project>
diff --git a/jacoco-maven-plugin.test/it/it-multi-module/pom.xml b/jacoco-maven-plugin.test/it/it-multi-module/pom.xml
index d9d2302a..a9c5bc37 100644
--- a/jacoco-maven-plugin.test/it/it-multi-module/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-multi-module/pom.xml
@@ -24,6 +24,7 @@
 
   <modules>
     <module>child</module>
+    <module>child-jar-without-sources</module>
     <module>skip-child</module>
   </modules>
 
diff --git a/jacoco-maven-plugin.test/it/it-multi-module/verify.bsh b/jacoco-maven-plugin.test/it/it-multi-module/verify.bsh
index 0bebe4cb..519b4860 100644
--- a/jacoco-maven-plugin.test/it/it-multi-module/verify.bsh
+++ b/jacoco-maven-plugin.test/it/it-multi-module/verify.bsh
@@ -10,6 +10,12 @@
  *
  *******************************************************************************/
 import java.io.*;
+import org.codehaus.plexus.util.*;
+
+String buildLog = FileUtils.fileRead( new File( basedir, "build.log" ) );
+if ( buildLog.indexOf( "Skipping JaCoCo execution due to missing classes directory." ) < 0 ) {
+    throw new RuntimeException( "Execution should be skipped when target/classes does not exist." );
+}
 
 File dump2 = new File( basedir, "skip-child/target/jacoco.exec" );
 if ( dump2.isFile() ) {