Return-Path: <commits-return-2287-archive-asf-public=cust-asf.ponee.io@avro.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 902C4200D56
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 12 Dec 2017 08:52:22 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 8E9D7160C0F; Tue, 12 Dec 2017 07:52:22 +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 D42F7160BE7
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 12 Dec 2017 08:52:21 +0100 (CET)
Received: (qmail 69656 invoked by uid 500); 12 Dec 2017 07:52:21 -0000
Mailing-List: contact commits-help@avro.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@avro.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@avro.apache.org>
List-Post: <mailto:commits@avro.apache.org>
List-Id: <commits.avro.apache.org>
Reply-To: dev@avro.apache.org
Delivered-To: mailing list commits@avro.apache.org
Received: (qmail 69647 invoked by uid 99); 12 Dec 2017 07:52:20 -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; Tue, 12 Dec 2017 07:52:20 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id C9FDCDFC11; Tue, 12 Dec 2017 07:52:20 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: nielsbasjes@apache.org
To: commits@avro.apache.org
Message-Id: <c1b094fd6be4416ba128a019a0b78bc0@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: avro git commit: AVRO-2043: Remove pre JDK 1.8 surefire specific
 configuration
Date: Tue, 12 Dec 2017 07:52:20 +0000 (UTC)
archived-at: Tue, 12 Dec 2017 07:52:22 -0000

Repository: avro
Updated Branches:
  refs/heads/master 2df0775d2 -> 7bbbf92cd


AVRO-2043: Remove pre JDK 1.8 surefire specific configuration


Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/7bbbf92c
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/7bbbf92c
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/7bbbf92c

Branch: refs/heads/master
Commit: 7bbbf92cd699dd82240caa395ee5f6136f22f2b0
Parents: 2df0775
Author: Niels Basjes <nbasjes@bol.com>
Authored: Mon Dec 11 18:04:09 2017 +0100
Committer: Niels Basjes <nbasjes@bol.com>
Committed: Mon Dec 11 18:04:09 2017 +0100

----------------------------------------------------------------------
 lang/java/pom.xml | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/avro/blob/7bbbf92c/lang/java/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 6e8e42a..2d1df1f 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -218,8 +218,7 @@
                  rather than the console. -->
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <failIfNoTests>false</failIfNoTests>
-            <!-- The correct argLine value depends on the JDK version -->
-            <argLine>${surefire.argline}</argLine>
+            <argLine>-Xmx1000m</argLine>
             <systemPropertyVariables>
               <test.dir>${project.basedir}/target/</test.dir>
             </systemPropertyVariables>
@@ -387,28 +386,6 @@
         </plugins>
       </build>
     </profile>
-
-    <!--In JDK 1.8 and newer the PermGem has been removed. -->
-    <!--These two profiles are to handle the differences between the before and after 1.8 -->
-    <profile>
-      <id>old-jdk</id>
-      <activation>
-        <jdk>(,1.8)</jdk>
-      </activation>
-      <properties>
-        <surefire.argline>-Xmx1000m -XX:MaxPermSize=200m</surefire.argline>
-      </properties>
-    </profile>
-    <profile>
-      <id>new-jdk</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <surefire.argline>-Xmx1000m</surefire.argline>
-      </properties>
-    </profile>
-
   </profiles>
 
   <!-- dependencyManagement can be used to define dependency versions, scopes, and