Repository: hbase
Updated Branches:
refs/heads/branch-1.2 d307ad19f -> f224e09ad
HBASE-16667 Building with JDK 8: ignoring option MaxPermSize=256m (Niels Basjes)
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f224e09a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f224e09a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f224e09a
Branch: refs/heads/branch-1.2
Commit: f224e09ad9e5e18a31e14e2606bdefba5b901216
Parents: d307ad1
Author: Jerry He <jerry...@apache.org>
Authored: Sat Sep 24 16:29:41 2016 -0700
Committer: Jerry He <jerry...@apache.org>
Committed: Sat Sep 24 16:56:32 2016 -0700
----------------------------------------------------------------------
hbase-it/pom.xml | 2 +-
pom.xml | 28 +++++++++++++++++++++++++---
2 files changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f224e09a/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index f7d8241..cf63a9d 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -172,7 +172,7 @@
<!-- TODO: failsafe does timeout, but verify does not fail the
build because of the timeout.
I believe it is a failsafe bug, we may consider using
surefire -->
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
- <argLine>-enableassertions -Xmx${failsafe.Xmx} -XX:MaxPermSize=368m
+ <argLine>-enableassertions -Xmx${failsafe.Xmx} ${maxpermsize}
-Djava.security.egd=file:/dev/./urandom
-XX:+CMSClassUnloadingEnabled
-verbose:gc -XX:+PrintCommandLineFlags
-XX:+PrintFlagsFinal</argLine>
</configuration>
http://git-wip-us.apache.org/repos/asf/hbase/blob/f224e09a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a4be2ba..8bde325 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1271,10 +1271,10 @@
<surefire.Xmx>2800m</surefire.Xmx>
<surefire.cygwinXmx>2800m</surefire.cygwinXmx>
<hbase-surefire.argLine>-enableassertions -XX:MaxDirectMemorySize=1G
-Xmx${surefire.Xmx}
- -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom
-Djava.net.preferIPv4Stack=true
+ ${maxpermsize} -Djava.security.egd=file:/dev/./urandom
-Djava.net.preferIPv4Stack=true
-Djava.awt.headless=true
</hbase-surefire.argLine>
- <hbase-surefire.cygwin-argLine>-enableassertions -Xmx${surefire.cygwinXmx}
-XX:MaxPermSize=256m
+ <hbase-surefire.cygwin-argLine>-enableassertions -Xmx${surefire.cygwinXmx}
${maxpermsize}
-Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
"-Djava.library.path=${hadoop.library.path};${java.library.path}"
</hbase-surefire.cygwin-argLine>
@@ -1845,6 +1845,28 @@
</pluginManagement>
</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>
+ <maxpermsize>-XX:MaxPermSize=512m</maxpermsize>
+ </properties>
+ </profile>
+ <profile>
+ <id>new-jdk</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <maxpermsize></maxpermsize>
+ </properties>
+ </profile>
+
<profile>
<id>jacoco</id>
<activation>
@@ -2460,7 +2482,7 @@
or you can provide the license with
-Dmaven.clover.licenseLocation=/path/to/license. Committers can find
the license under
https://svn.apache.org/repos/private/committers/donated-licenses/clover/
The report will be generated under target/site/clover/index.html when
you run
- MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=512m" mvn clean package
-Pclover site -->
+ MAVEN_OPTS="-Xmx2048m ${maxpermsize}" mvn clean package -Pclover site
-->
<profile>
<id>clover</id>
<activation>
