diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml index 254d659ef16e..a9c542232628 100644 --- a/.idea/inspectionProfiles/idea_default.xml +++ b/.idea/inspectionProfiles/idea_default.xml @@ -668,7 +668,7 @@ - + diff --git a/.idea/inspectionProfiles/idea_default_ci.xml b/.idea/inspectionProfiles/idea_default_ci.xml index 46cc94bd6272..c424821d69de 100644 --- a/.idea/inspectionProfiles/idea_default_ci.xml +++ b/.idea/inspectionProfiles/idea_default_ci.xml @@ -3367,7 +3367,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 05ec66c315a2..df4f909c27a4 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -51,7 +51,7 @@ - + @@ -673,9 +673,9 @@ + - diff --git a/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt b/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt index d9b118859703..0fad9910b01a 100644 --- a/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt +++ b/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt @@ -36,7 +36,7 @@ open class IdeaCommunityProperties(private val communityHomeDir: Path) : BaseIde init { platformPrefix = "Idea" - applicationInfoModule = "intellij.idea.community.resources" + applicationInfoModule = "intellij.idea.community.customization" additionalIDEPropertiesFilePaths = persistentListOf(communityHomeDir.resolve("build/conf/ideaCE.properties")) toolsJarRequired = true scrambleMainJar = false @@ -47,7 +47,7 @@ open class IdeaCommunityProperties(private val communityHomeDir: Path) : BaseIde so this property is set only when IDEA CE is built from the intellij-ultimate project. */ embeddedJetBrainsClientMainModule = null - productLayout.productImplementationModules = listOf("intellij.platform.main", "intellij.idea.community.resources") + productLayout.productImplementationModules = listOf("intellij.platform.main", "intellij.idea.community.customization") productLayout.bundledPluginModules = IDEA_BUNDLED_PLUGINS .add("intellij.javaFX.community") .toMutableList() diff --git a/community-resources/intellij.idea.community.resources.iml b/community-resources/intellij.idea.community.customization.iml similarity index 100% rename from community-resources/intellij.idea.community.resources.iml rename to community-resources/intellij.idea.community.customization.iml diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index 8afaa1f08153..1ea1c1085daa 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -61,7 +61,7 @@ - + diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index 0bf307c5163a..e2d6409b181f 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -17,7 +17,7 @@ - + diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt index af14995bf5cd..930e266d22ce 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt @@ -92,7 +92,7 @@ class PluginModelValidator(sourceModules: List) { val id = descriptor.getChild("id")?.content ?: descriptor.getChild("name")?.content // can't specify 'com.intellij', because there is ultimate plugin with the same ID - ?: if (sourceModuleName == "intellij.idea.community.resources") "com.intellij.community" else null + ?: if (sourceModuleName == "intellij.idea.community.customization") "com.intellij.community" else null if (id == null) { _errors.add(PluginValidationError( "Plugin id is not specified", @@ -543,7 +543,7 @@ class PluginModelValidator(sourceModules: List) { return } - val pluginFileName = if (moduleName == "intellij.idea.community.resources") "IdeaPlugin.xml" else "plugin.xml" + val pluginFileName = if (moduleName == "intellij.idea.community.customization") "IdeaPlugin.xml" else "plugin.xml" val pluginDescriptorFile = metaInf / pluginFileName val pluginDescriptor = pluginDescriptorFile.readXmlAsModel()