This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
new d54eff3 Remove full project building from the generate-idea-files ant
target
d54eff3 is described below
commit d54eff3a4a59c13b405624e5142aee37ef5f0cc6
Author: Jacek Lewandowski <[email protected]>
AuthorDate: Tue Jun 15 14:07:39 2021 +0200
Remove full project building from the generate-idea-files ant target
- that target was unnecessarily building the whole project which made it
problematic to update the project while merging/rebasing if conflicts in the
code were failing the compilation
- updated system properties for default run test task in Intellij to match
those when running tests from Ant
- fix test-memory target
patch by Jacek Lewandowski; reviewed by Mick Semb Wever for CASSANDRA-16697
---
build.xml | 2 +-
ide/idea/workspace.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 76e84ac..8dc7dfd 100644
--- a/build.xml
+++ b/build.xml
@@ -1753,7 +1753,7 @@
</target>
<!-- Generate IDEA project description files -->
- <target name="generate-idea-files" depends="build-test"
description="Generate IDEA files">
+ <target name="generate-idea-files"
depends="init,maven-ant-tasks-retrieve-build,gen-cql3-grammar,createVersionPropFile"
description="Generate IDEA files">
<mkdir dir=".idea"/>
<mkdir dir=".idea/libraries"/>
<copy todir=".idea">
diff --git a/ide/idea/workspace.xml b/ide/idea/workspace.xml
index 9cf2d96..68408ef 100644
--- a/ide/idea/workspace.xml
+++ b/ide/idea/workspace.xml
@@ -168,7 +168,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 -ea -XX:MaxMetaspaceSize=256M
-XX:SoftRefLRUPolicyMSPerMB=0 -Dcassandra.strict.runtime.checks=true" />
+ <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 -ea -XX:MaxMetaspaceSize=256M
-XX:SoftRefLRUPolicyMSPerMB=0 -Dcassandra.strict.runtime.checks=true
-Dlegacy-sstable-root=$PROJECT_DIR$/test/data/legacy-sstables
-Dinvalid-legacy-sstable-root=$PROJECT_DIR$/test/data/invalid-legacy-sstables
-Dmigration-sstable-r [...]
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="ENV_VARIABLES" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
