hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerry...@apache.org
Subject hbase git commit: HBASE-16667 Building with JDK 8: ignoring option MaxPermSize=256m (Niels Basjes)
Date Sun, 25 Sep 2016 00:08:19 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 b4f7ad62e -> 2926a665a


HBASE-16667 Building with JDK 8: ignoring option MaxPermSize=256m (Niels Basjes)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2926a665
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2926a665
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2926a665

Branch: refs/heads/branch-1.3
Commit: 2926a665ab75bc8da6c57a65f9c12528cd4ff992
Parents: b4f7ad6
Author: Jerry He <jerryjch@apache.org>
Authored: Sat Sep 24 16:29:41 2016 -0700
Committer: Jerry He <jerryjch@apache.org>
Committed: Sat Sep 24 16:59:35 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/2926a665/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 3225b1e..3dcdfdb 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/2926a665/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d58c92..d11fe87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1252,10 +1252,10 @@
     <!--Mark our test runs with '-Dhbase.test' so we can identify a surefire test as ours
in a process listing
      -->
     <hbase-surefire.argLine>-enableassertions -Dhbase.test -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>
@@ -1826,6 +1826,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>
@@ -2441,7 +2463,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>


Mime
View raw message