Repository: cassandra
Updated Branches:
  refs/heads/trunk a4053682e -> d78310d53


Remove hardcoded java11 jvm args in idea workspace files

patch by Jordan West; reviewed by jasobrown for CASSANDRA-14627


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

Branch: refs/heads/trunk
Commit: d78310d53f9d00dcd26feb0ec4802a2a182fdd24
Parents: a405368
Author: Jordan West <jorda...@gmail.com>
Authored: Thu Aug 9 08:58:37 2018 -0700
Committer: Jason Brown <jasedbr...@gmail.com>
Committed: Fri Aug 10 05:40:45 2018 -0700

----------------------------------------------------------------------
 CHANGES.txt            | 1 +
 ide/idea/workspace.xml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d78310d5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8e4597f..b9fe48b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Remove hardcoded java11 jvm args in idea workspace files (CASSANDRA-14627)
  * Update netty to 4.1.128 (CASSANDRA-14633)
  * Add a virtual table to expose thread pools (CASSANDRA-14523)
  * Add a virtual table to expose caches (CASSANDRA-14538)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d78310d5/ide/idea/workspace.xml
----------------------------------------------------------------------
diff --git a/ide/idea/workspace.xml b/ide/idea/workspace.xml
index 1bfc8e2..876ed58 100644
--- a/ide/idea/workspace.xml
+++ b/ide/idea/workspace.xml
@@ -143,7 +143,7 @@
     <configuration default="true" type="Application" factoryName="Application">
       <extension name="coverage" enabled="false" merge="false" 
sample_coverage="true" runner="idea" />
       <option name="MAIN_CLASS_NAME" value="" />
-      <option name="VM_PARAMETERS" 
value="-Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml 
-Dcassandra.storagedir=$PROJECT_DIR$/data 
-Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml 
-Dcassandra.logdir=$PROJECT_DIR$/data/logs 
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -ea --add-exports 
java.base/jdk.internal.misc=ALL-UNNAMED --add-opens 
java.base/jdk.internal.module=ALL-UNNAMED --add-exports 
java.base/jdk.internal.ref=ALL-UNNAMED --add-opens 
java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED 
--add-opens java.base/java.io=ALL-UNNAMED --add-opens 
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED 
--add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-exports 
java.management/com.sun.jmx.remote.internal=ALL-UNNAMED --add-exports 
java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED --add-exports 
java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports 
java.rmi/sun.rmi.server=ALL-UNNAMED --add-op
 ens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.objects=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.runtime=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.options=ALL-UNNAMED" />
+      <option name="VM_PARAMETERS" 
value="-Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml 
-Dcassandra.storagedir=$PROJECT_DIR$/data 
-Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml 
-Dcassandra.logdir=$PROJECT_DIR$/data/logs 
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -ea" />
       <option name="PROGRAM_PARAMETERS" value="" />
       <option name="WORKING_DIRECTORY" value="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -167,7 +167,7 @@
       <option name="MAIN_CLASS_NAME" value="" />
       <option name="METHOD_NAME" value="" />
       <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" 
value="-Dcassandra.config=file://$PROJECT_DIR$/test/conf/cassandra.yaml 
-Dlogback.configurationFile=file://$PROJECT_DIR$/test/conf/logback-test.xml 
-Dcassandra.logdir=$PROJECT_DIR$/build/test/logs 
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin 
-Dlegacy-sstable-root=$PROJECT_DIR$/test/data/legacy-sstables 
-Dinvalid-legacy-sstable-root=$PROJECT_DIR$/test/data/invalid-legacy-sstables 
-Dcassandra.ring_delay_ms=1000 -Dcassandra.skip_sync=true -ea --add-exports 
java.base/jdk.internal.misc=ALL-UNNAMED --add-opens 
java.base/jdk.internal.module=ALL-UNNAMED --add-exports 
java.base/jdk.internal.ref=ALL-UNNAMED --add-opens 
java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED 
--add-opens java.base/java.io=ALL-UNNAMED --add-opens 
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED 
--add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-exports 
java.management/com.sun.jmx.remote.internal=ALL-UNNAMED --add-expor
 ts java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED 
--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports 
java.rmi/sun.rmi.server=ALL-UNNAMED --add-opens 
jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.objects=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.runtime=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.options=ALL-UNNAMED" />
+      <option name="VM_PARAMETERS" 
value="-Dcassandra.config=file://$PROJECT_DIR$/test/conf/cassandra.yaml 
-Dlogback.configurationFile=file://$PROJECT_DIR$/test/conf/logback-test.xml 
-Dcassandra.logdir=$PROJECT_DIR$/build/test/logs 
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin 
-Dlegacy-sstable-root=$PROJECT_DIR$/test/data/legacy-sstables 
-Dinvalid-legacy-sstable-root=$PROJECT_DIR$/test/data/invalid-legacy-sstables 
-Dcassandra.ring_delay_ms=1000 -Dcassandra.skip_sync=true -ea" />
       <option name="PARAMETERS" value="" />
       <option name="WORKING_DIRECTORY" value="" />
       <option name="ENV_VARIABLES" />
@@ -185,7 +185,7 @@
     <configuration default="false" name="Cassandra" type="Application" 
factoryName="Application">
       <extension name="coverage" enabled="false" merge="false" 
sample_coverage="true" runner="idea" />
       <option name="MAIN_CLASS_NAME" 
value="org.apache.cassandra.service.CassandraDaemon" />
-      <option name="VM_PARAMETERS" value="-Dcassandra-foreground=yes 
-Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml 
-Dcassandra.storagedir=$PROJECT_DIR$/data 
-Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml 
-Dcassandra.logdir=$PROJECT_DIR$/data/logs 
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -Dcom.sun.management.jmxremote 
-Dcom.sun.management.jmxremote.port=7199 
-Dcom.sun.management.jmxremote.local.only=false 
-Dcom.sun.management.jmxremote.authenticate=false 
-Dcom.sun.management.jmxremote.ssl=false -ea -Xmx1G --add-exports 
java.base/jdk.internal.misc=ALL-UNNAMED --add-opens 
java.base/jdk.internal.module=ALL-UNNAMED --add-exports 
java.base/jdk.internal.ref=ALL-UNNAMED --add-opens 
java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED 
--add-opens java.base/java.io=ALL-UNNAMED --add-opens 
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED 
--add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-exports
  java.management/com.sun.jmx.remote.internal=ALL-UNNAMED --add-exports 
java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED --add-exports 
java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports 
java.rmi/sun.rmi.server=ALL-UNNAMED --add-opens 
jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.objects=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.runtime=ALL-UNNAMED --add-exports 
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.options=ALL-UNNAMED" />
+      <option name="VM_PARAMETERS" value="-Dcassandra-foreground=yes 
-Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml 
-Dcassandra.storagedir=$PROJECT_DIR$/data 
-Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml 
-Dcassandra.logdir=$PROJECT_DIR$/data/logs 
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -Dcom.sun.management.jmxremote 
-Dcom.sun.management.jmxremote.port=7199 
-Dcom.sun.management.jmxremote.local.only=false 
-Dcom.sun.management.jmxremote.authenticate=false 
-Dcom.sun.management.jmxremote.ssl=false -ea -Xmx1G" />
       <option name="PROGRAM_PARAMETERS" value="" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to