Repository: cassandra Updated Branches: refs/heads/trunk 76c7d02c9 -> 9bc15bace
Default project generation to java8 Patch by marcuse; reviewed by Benedict for CASSANDRA-14613 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bc15bac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bc15bac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bc15bac Branch: refs/heads/trunk Commit: 9bc15baceaed0407a1faa321980b9521dbc00dc7 Parents: 76c7d02 Author: Marcus Eriksson <[email protected]> Authored: Tue Jul 31 08:12:53 2018 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Jul 31 15:57:56 2018 +0200 ---------------------------------------------------------------------- build.xml | 1 + ide/idea-iml-file.xml | 4 ++-- ide/idea/misc.xml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bc15bac/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 903e1ec..311bd7d 100644 --- a/build.xml +++ b/build.xml @@ -1840,6 +1840,7 @@ <echo file=".classpath"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/java"/> + <classpathentry kind="src" path="src/java8"/> <classpathentry kind="src" path="src/resources"/> <classpathentry kind="src" path="src/gen-java"/> <classpathentry kind="src" path="conf" including="hotspot_compiler"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bc15bac/ide/idea-iml-file.xml ---------------------------------------------------------------------- diff --git a/ide/idea-iml-file.xml b/ide/idea-iml-file.xml index de35985..2512b1d 100644 --- a/ide/idea-iml-file.xml +++ b/ide/idea-iml-file.xml @@ -18,13 +18,13 @@ --> <module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_10" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/.idea/out/main" /> <output-test url="file://$MODULE_DIR$/.idea/out/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/java11" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/java8" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/gen-java" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/tools/stress/src" isTestSource="false" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bc15bac/ide/idea/misc.xml ---------------------------------------------------------------------- diff --git a/ide/idea/misc.xml b/ide/idea/misc.xml index 7f70ab9..ac1f706 100644 --- a/ide/idea/misc.xml +++ b/ide/idea/misc.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK" /> -</project> \ No newline at end of file + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> +</project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
