fix test data — remove inherit-compiler-output="false"
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 4 Nov 2016 15:31:22 +0000 (16:31 +0100)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 4 Nov 2016 15:32:30 +0000 (16:32 +0100)
14 files changed:
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/multiJDKConflict/moduleJava4/java4.iml
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/multiJDKConflict/moduleJava5/java5.iml
jps/model-serialization/testData/sampleProject/util/util.iml
plugins/eclipse/testData/iml/empty/expected/expected.iml
plugins/eclipse/testData/iml/emptySrc/expected/expected.iml
plugins/eclipse/testData/iml/root/expected/expected.iml
plugins/eclipse/testData/iml/srcBinJREProject/expected/expected.iml
plugins/eclipse/testData/iml/workspaceOnly/expected/expected.iml
plugins/eclipse/testData/linked/resolvedVarsInIml/expected/expected.iml
plugins/eclipse/testData/linked/resolvedVarsInLibImlCheck/expected/expected.iml
plugins/eclipse/testData/linked/resolvedVarsInOutputImlCheck/expected/expected.iml
plugins/maven/jps-plugin/testData/compiler/classpathTest/dep-test/dep-test.iml
plugins/maven/jps-plugin/testData/compiler/classpathTest/dep/dep.iml
samples/conditionalOperatorConvertor/conditionalOperatorConvertor.iml

index e2a1e755cb1efe018042c6db263fa503a7191aed..e7ddeb560fbdd906ad52013213177b8cacb02b3c 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="5">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_4" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_4">
     <output url="file://$MODULE_DIR$/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
index 0479ef60077fa754f819ffba54e75c5dc57a7a19..4d22b406988363e18892d88331c150dfb8578508 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="5">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
     <output url="file://$MODULE_DIR$/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
index bde922eec436182716bc046b86810b72de03eeb0..aeaded153dad11775ec66def18db3373a30b43d4 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/../out/production-util" />
     <output-test url="file://$MODULE_DIR$/../out/test-util" />
     <exclude-output />
index a2f6d644701f667e57c23ce0c497ea1ecc8b4b01..1808864b355b2b20313bcf3812d9e5afa82e2852 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$/out/production/testProject" />
   <exclude-output />
   <content url="file://$MODULE_DIR$" />
index 739c0f9ea674935461ec21dde8918fa30b582f56..63a2d37b19104fcca5e66953cfded8c9ad3d88c6 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$/out/production/testProject" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
index 3bc460fbb775f92ade13317b8b46f75d15e7fe3d..a056de8d82b4efa82b9462b719703b017d476f20 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
index b66163e1282f503166ff5cc1b6dcd59e255b0b33..cbfcd7bfba27953b33e57fcaf3401724017e76c1 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$/out/production/testProject" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
index e28087b791ea55da475e1b567e0069c0aa02d177..70150be164bbb0ccc58cf27bdd73e68c63e07739 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$/bin" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
index 7599bf43d8250bbd778fcf4b309a7b57e0f85773..937c94e9e88523cb096d61bc2b13fbbd9b61015c 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$/bin" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
index 1026fef7b6f52ac5f0ab7c07b764857c609898cc..cf4be6071a9383f0dad75fb02271f6aa4519f30c 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$MODULE_DIR$/bin" />
   <exclude-output />
   <content url="file://$MODULE_DIR$" />
index d99fb199d68dea66ea2313ee0931d05f0cff24e0..4e0014cf099ef8de22c993a3aac9ce4b540e1881 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root inherit-compiler-output="false">
+<root>
   <output url="file://$variable$/project1" />
   <exclude-output />
   <content url="file://$MODULE_DIR$">
index 099f44bf718a4ef2fe9a017c0e1caa69cf4bbf3a..c6712e8d2ec56248374a595e73f773b1d5e08f38 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
index 099f44bf718a4ef2fe9a017c0e1caa69cf4bbf3a..c6712e8d2ec56248374a595e73f773b1d5e08f38 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
index 16a756ac2d471580ff470684125ab56af2a4b410..15797de9b46a14f8b936d7f5eea92d37b6e3aca2 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
     <output url="file://$MODULE_DIR$/out" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">