From f5a9724ea54b3837619beaf68cfbc4168dfccb97 Mon Sep 17 00:00:00 2001
From: Nikita Iarychenko <n.iarychenko@haulmont.com>
Date: Thu, 20 Nov 2025 14:40:55 +0400
Subject: [PATCH] OpenIDE fix bundle lombok plugin

(cherry picked from commit d1ce46c7b1975c0d3ddd3a2533d27e149ed266e9)
(cherry picked from commit f04510db42ed689ec4d9b9e20ac7d28924ec4b62)
(cherry picked from commit 301f8fce68a720314588a1f8290c528f5f993b96)
---
 openide/src/ru/openide/OpenIdePluginBundler.kt                | 1 -
 .../src/org/jetbrains/intellij/build/BaseIdeaProperties.kt    | 1 +
 plugins/lombok/src/main/resources/META-INF/plugin.xml         | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openide/src/ru/openide/OpenIdePluginBundler.kt b/openide/src/ru/openide/OpenIdePluginBundler.kt
index 7483d3224a15..d15d69966704 100644
--- a/openide/src/ru/openide/OpenIdePluginBundler.kt
+++ b/openide/src/ru/openide/OpenIdePluginBundler.kt
@@ -29,7 +29,6 @@ object OpenIdePluginBundler {
   private const val PLUGINS_DOWNLOAD_URL = "https://plugins.openide.ru/pluginManager"
 
   private val plugins = listOf(
-    PluginInfo("Lombook Plugin", "lombok"),
     PluginInfo("com.haulmont.intellij.rupack", "ru_pack"),
     PluginInfo("com.haulmont.amplicode", "amplicode")
   )
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
index be3e0114c42c..0d15f8b30d87 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
@@ -61,6 +61,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + per
   "intellij.keymap.netbeans",
   "intellij.performanceTesting",
   "intellij.compose.ide.plugin",
+  "intellij.lombok"
 )
 
 val CE_CLASS_VERSIONS: Map<String, String> = mapOf(
diff --git a/plugins/lombok/src/main/resources/META-INF/plugin.xml b/plugins/lombok/src/main/resources/META-INF/plugin.xml
index b5d9173e8bc2..e1b950c22315 100644
--- a/plugins/lombok/src/main/resources/META-INF/plugin.xml
+++ b/plugins/lombok/src/main/resources/META-INF/plugin.xml
@@ -2,10 +2,10 @@
 <idea-plugin>
   <id>Lombook Plugin</id>
   <name>Lombok</name>
-  <vendor>JetBrains</vendor>
+  <vendor>OpenIDE</vendor>
   <resource-bundle>messages.LombokBundle</resource-bundle>
   <description><![CDATA[
-<h1>IntelliJ Lombok plugin</h1>
+<h1>OpenIDE Lombok plugin</h1>
 <br/>
 <b>A plugin that adds first-class support for Project Lombok</b>
 <br/>