IJI-2422: community/plugins: move resources under resources root

GitOrigin-RevId: 8eb1f83f015e7e1a7626f69f9e64d7c328ba7765
2025-12-15 11:53:49 +07:00 · 2025-01-31 14:59:49 +01:00
parent d379d00522
commit 2f2ab1fe14
812 changed files with 56 additions and 32 deletions
--- a/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyNestedCompletionTest.kt
+++ b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyNestedCompletionTest.kt
@@ -358,7 +358,7 @@ class JsonBySchemaHeavyNestedCompletionTest : JsonBySchemaHeavyCompletionTestBas
    }
  }

-  override fun getTestDataPath(): String = PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/schema/data/completion/temp"
+  override fun getTestDataPath(): String = PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testData/org/jetbrains/yaml/schema/data/completion/temp"
  override fun getBasePath(): String = throw IllegalStateException("Use getTestDataPath instead")

  private val workingFolder get() = File(testDataPath)
--- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
+++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
@@ -21,6 +21,9 @@ class IntellijIconClassGeneratorConfig : IconClasses() {
        // inspection icons are loaded by com.intellij.internal.inspector.components.HierarchyTree.Icons
        excludePackages = listOf("com.intellij.internal.inspector.icons"),
      )
+      "intellij.libraries.microba" -> IntellijIconClassGeneratorModuleConfig(
+        excludePackages = listOf("com.michaelbaranov.microba.calendar.resource"),
+      )
      // force generating "Groovy" inner class to preserve backward compatiblity
      "intellij.groovy.psi" -> IntellijIconClassGeneratorModuleConfig(className = "JetgroovyIcons", iconDirectory = "icons")
      "intellij.clouds.docker" -> IntellijIconClassGeneratorModuleConfig(className = "DockerIcons", packageName = "com.intellij.docker")
--- a/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
+++ b/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
@@ -20,6 +20,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/IntelliLang/intellilang-jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
+++ b/plugins/IntelliLang/intellilang-jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
--- a/plugins/IntelliLang/intellilang-jps-plugin/resources/META-INF/services/org.jetbrains.jps.intellilang.model.JpsIntelliLangExtensionService
+++ b/plugins/IntelliLang/intellilang-jps-plugin/resources/META-INF/services/org.jetbrains.jps.intellilang.model.JpsIntelliLangExtensionService
--- a/plugins/IntelliLang/intellilang-jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
+++ b/plugins/IntelliLang/intellilang-jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
--- a/plugins/ant/resources/inspectionDescriptions/AntDuplicateTargetsInspection.html
+++ b/plugins/ant/resources/inspectionDescriptions/AntDuplicateTargetsInspection.html
--- a/plugins/ant/resources/inspectionDescriptions/AntMissingPropertiesFileInspection.html
+++ b/plugins/ant/resources/inspectionDescriptions/AntMissingPropertiesFileInspection.html
--- a/plugins/ant/resources/inspectionDescriptions/AntResolveInspection.html
+++ b/plugins/ant/resources/inspectionDescriptions/AntResolveInspection.html
--- a/plugins/ant/resources/inspectionDescriptions/metaInformation.json
+++ b/plugins/ant/resources/inspectionDescriptions/metaInformation.json
--- a/plugins/eclipse/jps-plugin/intellij.eclipse.jps.iml
+++ b/plugins/eclipse/jps-plugin/intellij.eclipse.jps.iml
@@ -20,6 +20,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/eclipse/jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
+++ b/plugins/eclipse/jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
--- a/plugins/eclipse/resources/org/jetbrains/idea/eclipse/conversion/template.empty.project.xml
+++ b/plugins/eclipse/resources/org/jetbrains/idea/eclipse/conversion/template.empty.project.xml
--- a/plugins/eclipse/resources/org/jetbrains/idea/eclipse/conversion/template.project.xml
+++ b/plugins/eclipse/resources/org/jetbrains/idea/eclipse/conversion/template.project.xml
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/completions/fixtures/.env
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/completions/fixtures/.env
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/completions/fixtures/.env.example
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/completions/fixtures/.env.example
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/completions/fixtures/phpunit.xml
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/completions/fixtures/phpunit.xml
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/dotenv/fixtures/.env
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/dotenv/fixtures/.env
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/.env
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/.env
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/phpunit.xml
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/phpunit.xml
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/phpunit.xsd
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/phpunit.xsd
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.go
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.go
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.php
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.php
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.py
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.py
--- a/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.rb
+++ b/plugins/env-files-support/tests/testResources/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.rb
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -31,6 +31,7 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/compatibilityResources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/testResources" type="java-test-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/git4idea/testResources/META-INF/plugin.xml
+++ b/plugins/git4idea/testResources/META-INF/plugin.xml
--- a/plugins/github/github-core/resources/schema.graphql
+++ b/plugins/github/github-core/resources/schema.graphql
--- a/plugins/gitlab/gitlab-core/resources/schema.graphql
+++ b/plugins/gitlab/gitlab-core/resources/schema.graphql
--- a/plugins/gitlab/gitlab-core/testResources/compose.yml
+++ b/plugins/gitlab/gitlab-core/testResources/compose.yml
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
@@ -23,6 +23,7 @@
    </annotation-paths>
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
@@ -18,6 +18,9 @@
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
    <exclude-output />
+    <content url="file://$MODULE_DIR$/testResources">
+      <sourceFolder url="file://$MODULE_DIR$/testResources" type="java-test-resource" />
+    </content>
    <content url="file://$MODULE_DIR$/testSources">
      <sourceFolder url="file://$MODULE_DIR$/testSources" isTestSource="true" />
    </content>
--- a/plugins/gradle/tooling-extension-impl/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
+++ b/plugins/gradle/tooling-extension-impl/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
--- a/plugins/gradle/tooling-extension-impl/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.serialization.SerializationService
+++ b/plugins/gradle/tooling-extension-impl/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.serialization.SerializationService
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/ApplicationTaskInitScript.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/ApplicationTaskInitScript.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/ClassPathExtensionInitScript.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/ClassPathExtensionInitScript.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/EnhanceGradleDaemonClasspathInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/EnhanceGradleDaemonClasspathInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/FileComparisonTestEventLogger.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/FileComparisonTestEventLogger.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/FileComparisonTestEventLoggerInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/FileComparisonTestEventLoggerInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/IdeaPluginConfigurator.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/IdeaPluginConfigurator.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/IjTestEventLogger.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/IjTestEventLogger.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/IjTestEventLoggerInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/IjTestEventLoggerInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/Init.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/Init.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/JetGradlePlugin.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/JetGradlePlugin.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/JvmDebugInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/JvmDebugInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/JvmOptionsInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/JvmOptionsInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/MapperInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/MapperInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/RegistryProcessor.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/RegistryProcessor.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/TaskInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/TaskInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/TestEventLogger.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/TestEventLogger.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/TestInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/TestInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/WrapperInit.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/WrapperInit.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/downloadArtifact.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/downloadArtifact.gradle
--- a/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/legacyDownloadArtifact.gradle
+++ b/plugins/gradle/tooling-extension-impl/resources/org/jetbrains/plugins/gradle/tooling/internal/init/legacyDownloadArtifact.gradle
--- a/plugins/gradle/tooling-extension-impl/testResources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
+++ b/plugins/gradle/tooling-extension-impl/testResources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
--- a/plugins/grazie/src/test/intellij.grazie.tests.iml
+++ b/plugins/grazie/src/test/intellij.grazie.tests.iml
@@ -4,6 +4,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/kotlin" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/testResources" type="java-test-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/grazie/src/test/testResources/tests/testGroups.properties
+++ b/plugins/grazie/src/test/testResources/tests/testGroups.properties
--- a/plugins/groovy/groovy-psi/resources/org/jetbrains/plugins/groovy/lang/lexer/grammar.text
+++ b/plugins/groovy/groovy-psi/resources/org/jetbrains/plugins/groovy/lang/lexer/grammar.text
--- a/plugins/groovy/groovy-psi/resources/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton
+++ b/plugins/groovy/groovy-psi/resources/org/jetbrains/plugins/groovy/lang/lexer/groovy.skeleton
--- a/plugins/groovy/resources/org/jetbrains/plugins/groovy/config/groovy.sdk.xml
+++ b/plugins/groovy/resources/org/jetbrains/plugins/groovy/config/groovy.sdk.xml
--- a/plugins/groovy/rt/classLoader/intellij.groovy.rt.classLoader.iml
+++ b/plugins/groovy/rt/classLoader/intellij.groovy.rt.classLoader.iml
@@ -4,6 +4,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/groovy/rt/classLoader/resources/com/intellij/util/lang/java6/fastutil/LICENSE.txt
+++ b/plugins/groovy/rt/classLoader/resources/com/intellij/util/lang/java6/fastutil/LICENSE.txt
--- a/plugins/groovy/structuralsearch-groovy/intellij.groovy.structuralSearch.iml
+++ b/plugins/groovy/structuralsearch-groovy/intellij.groovy.structuralSearch.iml
@@ -5,6 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/groovy/structuralsearch-groovy/resources/META-INF/groovy-structural-search.xml
+++ b/plugins/groovy/structuralsearch-groovy/resources/META-INF/groovy-structural-search.xml
--- a/plugins/ide-features-trainer/res/HowToCreateLessons.md
+++ b/plugins/ide-features-trainer/res/HowToCreateLessons.md
--- a/plugins/javaFX/resources/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxRedundantPropertyValueInspection8.txt
+++ b/plugins/javaFX/resources/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxRedundantPropertyValueInspection8.txt
--- a/plugins/javaFX/resources/org/jetbrains/plugins/javaFX/fxml/fx.xsd
+++ b/plugins/javaFX/resources/org/jetbrains/plugins/javaFX/fxml/fx.xsd
--- a/plugins/javaFX/resources/org/jetbrains/plugins/javaFX/refactoring/migration/JavaFx89.xml
+++ b/plugins/javaFX/resources/org/jetbrains/plugins/javaFX/refactoring/migration/JavaFx89.xml
--- a/plugins/junit/resources/com/intellij/execution/junit2/refactoring/JUnit45.xml
+++ b/plugins/junit/resources/com/intellij/execution/junit2/refactoring/JUnit45.xml
--- a/plugins/maven/artifact-resolver-m31/intellij.maven.artifactResolver.m31.iml
+++ b/plugins/maven/artifact-resolver-m31/intellij.maven.artifactResolver.m31.iml
@@ -4,6 +4,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/maven/artifact-resolver-m31/resources/META-INF/plexus/components.xml
+++ b/plugins/maven/artifact-resolver-m31/resources/META-INF/plexus/components.xml
--- a/plugins/maven/maven3-server-impl/intellij.maven.server.m3.impl.iml
+++ b/plugins/maven/maven3-server-impl/intellij.maven.server.m3.impl.iml
@@ -4,6 +4,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/maven/maven3-server-impl/resources/META-INF/plexus/components.xml
+++ b/plugins/maven/maven3-server-impl/resources/META-INF/plexus/components.xml
--- a/plugins/maven/maven3-server-impl/resources/META-INF/sisu/javax.inject.Named
+++ b/plugins/maven/maven3-server-impl/resources/META-INF/sisu/javax.inject.Named
--- a/plugins/maven/maven36-server-impl/intellij.maven.server.m36.impl.iml
+++ b/plugins/maven/maven36-server-impl/intellij.maven.server.m36.impl.iml
@@ -4,6 +4,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
      <excludeFolder url="file://$MODULE_DIR$/lib" />
    </content>
    <orderEntry type="inheritedJdk" />
--- a/plugins/maven/maven36-server-impl/resources/META-INF/plexus/components.xml
+++ b/plugins/maven/maven36-server-impl/resources/META-INF/plexus/components.xml
--- a/plugins/maven/maven40-server-impl/intellij.maven.server.m40.iml
+++ b/plugins/maven/maven40-server-impl/intellij.maven.server.m40.iml
@@ -4,6 +4,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
      <excludeFolder url="file://$MODULE_DIR$/lib" />
    </content>
    <orderEntry type="inheritedJdk" />
--- a/plugins/maven/maven40-server-impl/resources/META-INF/sisu/javax.inject.Named
+++ b/plugins/maven/maven40-server-impl/resources/META-INF/sisu/javax.inject.Named
--- a/plugins/maven/src/main/resources/org/jetbrains/idea/maven/dom/converters/repositories/repositories.xml
+++ b/plugins/maven/src/main/resources/org/jetbrains/idea/maven/dom/converters/repositories/repositories.xml
--- a/plugins/maven/src/main/resources/org/jetbrains/idea/maven/indices/maven_indices.md
+++ b/plugins/maven/src/main/resources/org/jetbrains/idea/maven/indices/maven_indices.md
--- a/plugins/maven/src/main/resources/org/jetbrains/idea/maven/statistics/maven-whitelist-plugins.txt
+++ b/plugins/maven/src/main/resources/org/jetbrains/idea/maven/statistics/maven-whitelist-plugins.txt
--- a/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml
+++ b/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml
@@ -4,6 +4,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/performanceTesting/vcs/resources/intellij.performanceTesting.vcs.xml
+++ b/plugins/performanceTesting/vcs/resources/intellij.performanceTesting.vcs.xml
--- a/plugins/properties/intellij.properties.iml
+++ b/plugins/properties/intellij.properties.iml
@@ -4,6 +4,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/properties/resources/META-INF/plugin.xml
+++ b/plugins/properties/resources/META-INF/plugin.xml
--- a/plugins/properties/resources/intellij.properties.copyright.xml
+++ b/plugins/properties/resources/intellij.properties.copyright.xml
--- a/plugins/properties/resources/intentionDescriptions/CopyPropertyKeyToClipboardIntention/after.txt.template
+++ b/plugins/properties/resources/intentionDescriptions/CopyPropertyKeyToClipboardIntention/after.txt.template
--- a/plugins/properties/resources/intentionDescriptions/CopyPropertyKeyToClipboardIntention/before.properties.template
+++ b/plugins/properties/resources/intentionDescriptions/CopyPropertyKeyToClipboardIntention/before.properties.template
--- a/plugins/properties/resources/intentionDescriptions/CopyPropertyKeyToClipboardIntention/description.html
+++ b/plugins/properties/resources/intentionDescriptions/CopyPropertyKeyToClipboardIntention/description.html
--- a/plugins/properties/resources/intentionDescriptions/CopyPropertyValueToClipboardIntention/after.txt.template
+++ b/plugins/properties/resources/intentionDescriptions/CopyPropertyValueToClipboardIntention/after.txt.template
--- a/plugins/properties/resources/intentionDescriptions/CopyPropertyValueToClipboardIntention/before.properties.template
+++ b/plugins/properties/resources/intentionDescriptions/CopyPropertyValueToClipboardIntention/before.properties.template
--- a/plugins/properties/resources/intentionDescriptions/CopyPropertyValueToClipboardIntention/description.html
+++ b/plugins/properties/resources/intentionDescriptions/CopyPropertyValueToClipboardIntention/description.html
--- a/plugins/remote-control/resources/org/jetbrains/ide/ProjectSetRequestHandler.coffee
+++ b/plugins/remote-control/resources/org/jetbrains/ide/ProjectSetRequestHandler.coffee
--- a/plugins/space/jps-plugin/intellij.space.java.jps.iml
+++ b/plugins/space/jps-plugin/intellij.space.java.jps.iml
@@ -20,6 +20,7 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/space/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.dependencies.DependencyAuthenticationDataProvider
+++ b/plugins/space/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.dependencies.DependencyAuthenticationDataProvider
--- a/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml
+++ b/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml
@@ -5,6 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/plugins/tasks/tasks-core/jira/resources/com/intellij/tasks/jira/soap/JiraXmlRpcApi.txt
+++ b/plugins/tasks/tasks-core/jira/resources/com/intellij/tasks/jira/soap/JiraXmlRpcApi.txt
--- a/plugins/tasks/tasks-core/resources/com/intellij/tasks/generic/connectors/asana.xml
+++ b/plugins/tasks/tasks-core/resources/com/intellij/tasks/generic/connectors/asana.xml
--- a/Show More
+++ b/Show More