diff --git a/pom.xml b/pom.xml index 506f96b6d393498e7d13754a6f4a7bfc8bc6ba88..964da3f4aaf87824c6b9fade63d5bc607fe0e0aa 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,6 @@ <module>public</module> <module>protected</module> <module>external-example</module> - <module>biopet-aggregate</module> + <!--<module>biopet-aggregate</module>--> </modules> </project> diff --git a/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala b/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala index fa714c9423707456f1f6d1cfa6f2617c44318218..f3c1a41a672ed31ac69d2a2c3baf656dac07791c 100644 --- a/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala +++ b/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala @@ -94,7 +94,7 @@ trait BiopetQScript extends Configurable with GatkLogging { if (!i.file.exists()) Logging.addError(s"Input file does not exist: ${i.file}") else if (!i.file.canRead()) Logging.addError(s"Input file can not be read: ${i.file}") } - + this match { case q: MultiSampleQScript if q.onlySamples.nonEmpty && !q.samples.forall(x => q.onlySamples.contains(x._1)) => logger.info("Write report is skipped because sample flag is used") diff --git a/public/pom.xml b/public/pom.xml index 3c49b66c1b914c7207a70a520a2a22e830d70499..3cb8ecd06113c906768a8e1e370214147a984b09 100644 --- a/public/pom.xml +++ b/public/pom.xml @@ -51,6 +51,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <scoverage.plugin.version>1.1.1</scoverage.plugin.version> + <scalaVersion>2.10.4</scalaVersion> </properties> <build> @@ -243,14 +244,10 @@ <artifactId>scoverage-maven-plugin</artifactId> <version>${scoverage.plugin.version}</version> <configuration> - <scalaVersion>2.10.2</scalaVersion> + <scalaVersion>${scalaVersion}</scalaVersion> + <aggregate>true</aggregate> <!-- other parameters --> </configuration> - <executions> - <execution> - <phase>test</phase> - </execution> - </executions> </plugin> </plugins> </build>