Return-Path: <commits-return-54126-archive-asf-public=cust-asf.ponee.io@commons.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 90419200BBB
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 10 Nov 2016 20:14:51 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 8F06B160B01; Thu, 10 Nov 2016 19:14:51 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id D6457160AF7
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 10 Nov 2016 20:14:50 +0100 (CET)
Received: (qmail 22986 invoked by uid 500); 10 Nov 2016 19:14:50 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 22973 invoked by uid 99); 10 Nov 2016 19:14:50 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2016 19:14:50 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id B809AE00E5; Thu, 10 Nov 2016 19:14:49 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: pascalschumacher@apache.org
To: commits@commons.apache.org
Message-Id: <3d94d6bac9b74df0869961a2aff27692@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: commons-io git commit: Revert "remove argLine -Xmx25M option from
 surefire plugin, in order to get coveralls to work"
Date: Thu, 10 Nov 2016 19:14:49 +0000 (UTC)
archived-at: Thu, 10 Nov 2016 19:14:51 -0000

Repository: commons-io
Updated Branches:
  refs/heads/master 676401d29 -> 3867ddb39


Revert "remove argLine -Xmx25M option from surefire plugin, in order to get coveralls to work"

This reverts commit 676401d298098a99f9262c26b8e084628b1e3009.

Use cobertura instead of jacoco on travis-ci.


Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/3867ddb3
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/3867ddb3
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/3867ddb3

Branch: refs/heads/master
Commit: 3867ddb393cadb8ecfe87509e922c0679c02947b
Parents: 676401d
Author: pascalschumacher <pascalschumacher@gmx.net>
Authored: Thu Nov 10 20:14:42 2016 +0100
Committer: pascalschumacher <pascalschumacher@gmx.net>
Committed: Thu Nov 10 20:14:42 2016 +0100

----------------------------------------------------------------------
 .travis.yml |  2 +-
 pom.xml     | 63 ++++++++++----------------------------------------------
 2 files changed, 12 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-io/blob/3867ddb3/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2ac2ac5..c1335bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,4 +21,4 @@ jdk:
   - oraclejdk8
 
 after_success:
-  - mvn clean test jacoco:report coveralls:report
+  - mvn clean cobertura:cobertura coveralls:report

http://git-wip-us.apache.org/repos/asf/commons-io/blob/3867ddb3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 56ab030..eedaf3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,6 +274,8 @@ file comparators, endian transformation classes, and much more.
           </classpathDependencyExcludes>
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
+          <!-- limit memory size see IO-161 -->
+          <argLine>-Xmx25M</argLine>
           <includes>
             <!-- Only include test classes, not test data -->
             <include>**/*Test*.class</include>
@@ -325,7 +327,7 @@ file comparators, endian transformation classes, and much more.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.7</version>
+        <version>${commons.cobertura.version}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -424,57 +426,14 @@ file comparators, endian transformation classes, and much more.
       <build>
         <plugins>
           <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>${commons.jacoco.version}</version>
-            <executions>
-              <execution>
-                <id>default-prepare-agent</id>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>default-prepare-agent-integration</id>
-                <goals>
-                  <goal>prepare-agent-integration</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>default-report</id>
-                <goals>
-                  <goal>report</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>default-report-integration</id>
-                <goals>
-                  <goal>report-integration</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>default-check</id>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <!--  implementation is needed only for Maven 2  -->
-                    <rule implementation="org.jacoco.maven.RuleConfiguration">
-                      <element>BUNDLE</element>
-                      <limits>
-                        <!--  implementation is needed only for Maven 2  -->
-                        <limit implementation="org.jacoco.report.check.Limit">
-                          <counter>COMPLEXITY</counter>
-                          <value>COVEREDRATIO</value>
-                          <minimum>0.60</minimum>
-                        </limit>
-                      </limits>
-                    </rule>
-                  </rules>
-                </configuration>
-              </execution>
-            </executions>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <version>${commons.cobertura.version}</version>
+            <configuration>
+              <formats>
+                <format>xml</format>
+              </formats>
+            </configuration>
           </plugin>
           <plugin>
             <groupId>org.eluder.coveralls</groupId>