Repository: avro Updated Branches: refs/heads/master 4cac7c898 -> 96ef88181
AVRO-1835: Running tests using JDK 1.8 complains about MaxPermSize Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/96ef8818 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/96ef8818 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/96ef8818 Branch: refs/heads/master Commit: 96ef881811ac4f8f4017319d5344bcd3164a7bc4 Parents: 4cac7c8 Author: Niels Basjes <[email protected]> Authored: Thu Apr 28 22:57:38 2016 +0200 Committer: Niels Basjes <[email protected]> Committed: Thu Apr 28 22:57:38 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ lang/java/pom.xml | 25 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/96ef8818/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5f0b83b..3a8f4e8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -29,6 +29,8 @@ Trunk (not yet released) AVRO-1834: Lower the Javadoc warnings on the generated code. (nielsbasjes) + AVRO-1835: Running tests using JDK 1.8 complains about MaxPermSize (nielsbasjes) + BUG FIXES AVRO-1493. Java: Avoid the "Turkish Locale Problem". Schema fingerprints are http://git-wip-us.apache.org/repos/asf/avro/blob/96ef8818/lang/java/pom.xml ---------------------------------------------------------------------- diff --git a/lang/java/pom.xml b/lang/java/pom.xml index 94affe3..588a6b7 100644 --- a/lang/java/pom.xml +++ b/lang/java/pom.xml @@ -227,7 +227,8 @@ rather than the console. --> <redirectTestOutputToFile>true</redirectTestOutputToFile> <failIfNoTests>false</failIfNoTests> - <argLine>-Xmx1000m -XX:MaxPermSize=200m</argLine> + <!-- The correct argLine value depends on the JDK version --> + <argLine>${surefire.argline}</argLine> <systemPropertyVariables> <test.dir>${project.basedir}/target/</test.dir> </systemPropertyVariables> @@ -399,6 +400,28 @@ </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
