You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by ni...@apache.org on 2017/12/12 07:52:20 UTC

avro git commit: AVRO-2043: Remove pre JDK 1.8 surefire specific configuration

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 <nb...@bol.com>
Authored: Mon Dec 11 18:04:09 2017 +0100
Committer: Niels Basjes <nb...@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