IJPL-221111 convert jgoodies libs to product modules

GitOrigin-RevId: 6c592db1f28d1e62967b0bb27afd0f668439a204
2026-09-27 10:03:11 +07:00 · 2025-12-03 09:04:31 +00:00
parent 21173fe47a
commit 9ffdb65f0b
42 changed files with 190 additions and 112 deletions
@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="jgoodies-common" type="repository">
-    <properties maven-id="com.jgoodies:jgoodies-common:1.4.0">
-      <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar">
-          <sha256sum>efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc</sha256sum>
-        </artifact>
-      </verification>
-    </properties>
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
@@ -1,16 +0,0 @@
-<component name="libraryTable">
-  <library name="jgoodies-forms" type="repository">
-    <properties maven-id="com.jgoodies:forms:1.1-preview">
-      <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar">
-          <sha256sum>26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0</sha256sum>
-        </artifact>
-      </verification>
-    </properties>
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
@@ -873,6 +873,8 @@
      <module fileurl="file://$PROJECT_DIR$/libraries/jediterm-core/intellij.libraries.jediterm.core.iml" filepath="$PROJECT_DIR$/libraries/jediterm-core/intellij.libraries.jediterm.core.iml" />
      <module fileurl="file://$PROJECT_DIR$/libraries/jediterm-ui/intellij.libraries.jediterm.ui.iml" filepath="$PROJECT_DIR$/libraries/jediterm-ui/intellij.libraries.jediterm.ui.iml" />
      <module fileurl="file://$PROJECT_DIR$/libraries/jettison/intellij.libraries.jettison.iml" filepath="$PROJECT_DIR$/libraries/jettison/intellij.libraries.jettison.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/jgoodies/common/intellij.libraries.jgoodies.common.iml" filepath="$PROJECT_DIR$/libraries/jgoodies/common/intellij.libraries.jgoodies.common.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml" filepath="$PROJECT_DIR$/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml" />
      <module fileurl="file://$PROJECT_DIR$/libraries/jsonpath/intellij.libraries.jsonpath.iml" filepath="$PROJECT_DIR$/libraries/jsonpath/intellij.libraries.jsonpath.iml" />
      <module fileurl="file://$PROJECT_DIR$/libraries/jsoup/intellij.libraries.jsoup.iml" filepath="$PROJECT_DIR$/libraries/jsoup/intellij.libraries.jsoup.iml" />
      <module fileurl="file://$PROJECT_DIR$/libraries/jsvg/intellij.libraries.jsvg.iml" filepath="$PROJECT_DIR$/libraries/jsvg/intellij.libraries.jsvg.iml" />
@@ -220,7 +220,7 @@ jvm_library(
    "//plugins/completion-ml-ranking",
    "//plugins/stream-debugger-core:debugger-streams-core",
    "//plugins/stream-debugger:java-debugger-streams",
-    "@lib//:jgoodies-common",
+    "//libraries/jgoodies/common",
    "//plugins/editorconfig:editorconfig-plugin-main",
    "//plugins/sh/plugin:plugin-main",
    "//plugins/terminal/sh",
@@ -424,7 +424,7 @@ jvm_library(
    "//plugins/completion-ml-ranking:completionMlRanking-tests_test_lib",
    "//plugins/stream-debugger-core:debugger-streams-core",
    "//plugins/stream-debugger:java-debugger-streams",
-    "@lib//:jgoodies-common",
+    "//libraries/jgoodies/common",
    "//plugins/testng_rt/tests:tests_test_lib",
    "//plugins/editorconfig:editorconfig-plugin-main",
    "//platform/workspace/storage/tests:tests_test_lib",
@@ -413,6 +413,8 @@ libraries/jcip
 libraries/jediterm-core
 libraries/jediterm-ui
 libraries/jettison
+libraries/jgoodies/common
+libraries/jgoodies/forms
 libraries/jsonpath
 libraries/jsoup
 libraries/jsvg
@@ -47,6 +47,7 @@ suspend fun buildCommunityStandaloneJpsBuilder(
    "intellij.libraries.http.client",
    "intellij.libraries.cli.parser",
    "intellij.libraries.asm",
+    "intellij.libraries.jgoodies.forms",
  ).map { ModuleItem(moduleName = it, relativeOutputFile = "util.jar", reason = null) })

  layout.withModule("intellij.platform.util.rt", "util_rt.jar")
@@ -79,7 +80,6 @@ suspend fun buildCommunityStandaloneJpsBuilder(
  layout.withModule("intellij.groovy.constants.rt", "groovy-constants-rt.jar")
  layout.withModule("intellij.java.guiForms.jps", "java-guiForms-jps.jar")

-
  layout.withModule("intellij.maven.jps", "maven-jps.jar")
  layout.withModule("intellij.java.aetherDependencyResolver", "aether-dependency-resolver.jar")
  layout.withModule("intellij.gradle.jps", "gradle-jps.jar")
@@ -97,7 +97,6 @@ suspend fun buildCommunityStandaloneJpsBuilder(
    "OroMatcher",
    "protobuf",
    "Log4J",
-    "jgoodies-forms",
    "Eclipse",
    "netty-jps",
    "slf4j-api",
@@ -132,7 +131,7 @@ suspend fun buildCommunityStandaloneJpsBuilder(
      platformLayout = null,
      moduleOutputPatcher = ModuleOutputPatcher(),
      dryRun = dryRun,
-      context = context
+      context = context,
    )

    val targetFile = targetDir.resolve("standalone-jps-$buildNumber.zip")
@@ -144,7 +143,8 @@ suspend fun buildCommunityStandaloneJpsBuilder(
          "intellij.platform.jps.model.tests",
          "intellij.platform.jps.model.serialization.tests"
        ),
-        context)
+        context = context,
+      )
      zipWithCompression(targetFile = targetFile, dirs = mapOf(tempDir to ""))
    }

@@ -138,7 +138,7 @@
    <orderEntry type="module" module-name="intellij.completionMlRanking.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.debugger.streams.core" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.java.debugger.streams" scope="RUNTIME" />
-    <orderEntry type="library" scope="RUNTIME" name="jgoodies-common" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.common" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.testng.rt.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.editorconfig.plugin.main" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.workspace.storage.tests" scope="TEST" />
@@ -11,7 +11,7 @@ jvm_library(
    "//platform/util/jdom",
    "//platform/forms_rt:java-guiForms-rt",
    "//libraries/asm",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//java/compiler/instrumentation-util",
    "@lib//:jetbrains-annotations",
  ],
@@ -28,7 +28,7 @@ jvm_library(
    "//platform/util/jdom",
    "//platform/forms_rt:java-guiForms-rt",
    "//libraries/asm",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//java/compiler/instrumentation-util",
    "//platform/util",
    "@lib//:jetbrains-annotations",
@@ -11,7 +11,7 @@
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
    <orderEntry type="module" module-name="intellij.libraries.asm" />
-    <orderEntry type="library" name="jgoodies-forms" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" />
    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" exported="" />
    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
    <orderEntry type="library" name="jetbrains-annotations" level="project" />
@@ -88,11 +88,6 @@
  files:
  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2/jb-jdi-2.jar
  reason: withProjectLibrary
- name: lib/jgoodies-common.jar
-  library: jgoodies-common
-  files:
-  - name: $MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1/jgoodies-common-1.jar
-  reason: withProjectLibrary
 - name: lib/jps-builders-6.jar
  modules:
  - name: intellij.platform.jps.build.javac.rt
@@ -23,7 +23,7 @@ jvm_library(
    "//libraries/asm",
    "//platform/util/jdom",
    "//platform/util/nanoxml",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "@lib//:protobuf",
    "//jps/model-api:model",
    "//jps/model-serialization",
@@ -34,7 +34,7 @@
    <orderEntry type="module" module-name="intellij.libraries.asm" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
-    <orderEntry type="library" name="jgoodies-forms" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" />
    <orderEntry type="library" name="protobuf" level="project" />
    <orderEntry type="module" module-name="intellij.java.rt" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
@@ -3365,19 +3365,6 @@ jvm_import(
  visibility = ["//visibility:public"]
 )

-jvm_import(
-  name = "jgoodies-common",
-  jar = "@com_jgoodies-jgoodies-common-1_4_0_http//file",
-  source_jar = "@com_jgoodies-jgoodies-common-1_4_0-sources_http//file",
-  visibility = ["//visibility:public"]
-)
-
-jvm_import(
-  name = "jgoodies-forms",
-  jar = "@com_jgoodies-forms-1_1-preview_http//file",
-  visibility = ["//visibility:public"]
-)
-
 jvm_import(
  name = "jimfs",
  jar = "@com_google_jimfs-jimfs-1_3_0_http//file",
@@ -5429,6 +5416,19 @@ jvm_import(
  visibility = ["//visibility:public"]
 )

+jvm_import(
+  name = "libraries-jgoodies-common-jgoodies-common",
+  jar = "@com_jgoodies-jgoodies-common-1_4_0_http//file",
+  source_jar = "@com_jgoodies-jgoodies-common-1_4_0-sources_http//file",
+  visibility = ["//visibility:public"]
+)
+
+jvm_import(
+  name = "libraries-jgoodies-forms-jgoodies-forms",
+  jar = "@com_jgoodies-forms-1_1-preview_http//file",
+  visibility = ["//visibility:public"]
+)
+
 jvm_import(
  name = "libraries-jsvg-jsvg",
  jar = "@com_github_weisj-jsvg-1_3_0-jb_8_http//file",
@@ -5305,27 +5305,6 @@ http_file(
  downloaded_file_path = "mlapi-core-0.2.1-sources.jar"
 )

-http_file(
-  name = "com_jgoodies-jgoodies-common-1_4_0_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar",
-  sha256 = "efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc",
-  downloaded_file_path = "jgoodies-common-1.4.0.jar"
-)
-
-http_file(
-  name = "com_jgoodies-jgoodies-common-1_4_0-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0-sources.jar",
-  sha256 = "c2231fc5ac6112407bb39c45db21cb52c76b553d29a3891317e149b8cf4db30b",
-  downloaded_file_path = "jgoodies-common-1.4.0-sources.jar"
-)
-
-http_file(
-  name = "com_jgoodies-forms-1_1-preview_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar",
-  sha256 = "26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0",
-  downloaded_file_path = "forms-1.1-preview.jar"
-)
-
 http_file(
  name = "com_google_jimfs-jimfs-1_3_0_http",
  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/google/jimfs/jimfs/1.3.0/jimfs-1.3.0.jar",
@@ -8112,6 +8091,27 @@ http_file(
  downloaded_file_path = "jettison-1.5.4-sources.jar"
 )

+http_file(
+  name = "com_jgoodies-jgoodies-common-1_4_0_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar",
+  sha256 = "efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc",
+  downloaded_file_path = "jgoodies-common-1.4.0.jar"
+)
+
+http_file(
+  name = "com_jgoodies-jgoodies-common-1_4_0-sources_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0-sources.jar",
+  sha256 = "c2231fc5ac6112407bb39c45db21cb52c76b553d29a3891317e149b8cf4db30b",
+  downloaded_file_path = "jgoodies-common-1.4.0-sources.jar"
+)
+
+http_file(
+  name = "com_jgoodies-forms-1_1-preview_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar",
+  sha256 = "26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0",
+  downloaded_file_path = "forms-1.1-preview.jar"
+)
+
 http_file(
  name = "com_github_weisj-jsvg-1_3_0-jb_8_http",
  url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/github/weisj/jsvg/1.3.0-jb.8/jsvg-1.3.0-jb.8.jar",
@@ -0,0 +1,18 @@
+### auto-generated section `build intellij.libraries.jgoodies.common` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "common_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "common",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":common_resources"],
+  exports = ["@lib//:libraries-jgoodies-common-jgoodies-common"],
+  runtime_deps = ["@lib//:libraries-jgoodies-common-jgoodies-common"]
+)
+### auto-generated section `build intellij.libraries.jgoodies.common` end
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" exported="">
+      <library name="jgoodies-common" type="repository">
+        <properties maven-id="com.jgoodies:jgoodies-common:1.4.0">
+          <verification>
+            <artifact url="file://$MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar">
+              <sha256sum>efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc</sha256sum>
+            </artifact>
+          </verification>
+        </properties>
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+  </component>
+</module>
@@ -0,0 +1,6 @@
+- name: dist.all/lib/intellij.libraries.jgoodies.common.jar
+  modules:
+  - name: intellij.libraries.jgoodies.common
+    libraries:
+      jgoodies-common:
+      - name: $MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1/jgoodies-common-1.jar
@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>
@@ -0,0 +1,18 @@
+### auto-generated section `build intellij.libraries.jgoodies.forms` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "forms_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "forms",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":forms_resources"],
+  exports = ["@lib//:libraries-jgoodies-forms-jgoodies-forms"],
+  runtime_deps = ["@lib//:libraries-jgoodies-forms-jgoodies-forms"]
+)
+### auto-generated section `build intellij.libraries.jgoodies.forms` end
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" exported="">
+      <library name="jgoodies-forms" type="repository">
+        <properties maven-id="com.jgoodies:forms:1.1-preview">
+          <verification>
+            <artifact url="file://$MAVEN_REPOSITORY$/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar">
+              <sha256sum>26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0</sha256sum>
+            </artifact>
+          </verification>
+        </properties>
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
@@ -0,0 +1,6 @@
+- name: dist.all/lib/intellij.libraries.jgoodies.forms.jar
+  modules:
+  - name: intellij.libraries.jgoodies.forms
+    libraries:
+      jgoodies-forms:
+      - name: $MAVEN_REPOSITORY$/com/jgoodies/forms/1/forms-1.jar
@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>
@@ -80,8 +80,6 @@ object JavaPluginLayout {
      spec.withModuleLibrary("debugger-agent", "intellij.java.debugger.agent.holder", "rt")

      spec.withProjectLibrary("Eclipse", "ecj")
-      // used in JPS - do not use uber jar
-      spec.withProjectLibrary("jgoodies-common")
      spec.withProjectLibrary("jps-javac-extension")
      spec.withProjectLibrary("kotlin-metadata")
      // gpl-cpe license - do not use uber jar
@@ -88,8 +88,6 @@ private val libsUsedInJps = setOf(
  // see getBuildProcessApplicationClasspath - used in JPS
  "jna",
  "maven-resolver-provider",
-  "jgoodies-forms",
-  "jgoodies-common",
  // see ArtifactRepositoryManager.getClassesFromDependencies
  "plexus-utils",
  "kotlin-stdlib",
@@ -101,13 +99,6 @@ private val presignedLibNames = setOf(

 private fun isLibPreSigned(library: JpsLibrary) = presignedLibNames.contains(library.name)

-private val notImportantKotlinLibs = setOf(
-  "kotlinx-collections-immutable",
-  "kotlinx-coroutines-guava",
-  "kotlinx-datetime-jvm",
-  "kotlinx-html-jvm",
-)
-
 const val rdJarName: String = "rd.jar"

 // must be sorted
@@ -121,7 +112,7 @@ private val predefinedMergeRules = listOf<Pair<String, (String, FrontendModuleFi
  PRODUCT_BACKEND_JAR to { name, filter -> (name.startsWith("License") || name.startsWith("jetbrains.codeWithMe.lobby.server.")) && filter.isBackendProjectLibrary(name) },
  PRODUCT_JAR to { name, filter -> (name.startsWith("License") || name.startsWith("jetbrains.codeWithMe.lobby.server.")) && !filter.isBackendProjectLibrary(name) },
  // see ClassPathUtil.getUtilClassPath
-  UTIL_8_JAR to { it, _ -> libsUsedInJps.contains(it) || (it.startsWith("kotlinx-") && !notImportantKotlinLibs.contains(it)) },
+  UTIL_8_JAR to { it, _ -> libsUsedInJps.contains(it) || (it.startsWith("kotlinx-")) },

  // used in an external process - see `ConsoleProcessListFetcher.getConsoleProcessCount`
  UTIL_JAR to { it, _ -> it == "pty4j" || it == "jvm-native-trusted-roots" },
@@ -143,6 +143,8 @@ object CommunityModuleSets  {
    embeddedModule("intellij.libraries.jcef")
    embeddedModule("intellij.libraries.jediterm.core")
    embeddedModule("intellij.libraries.jediterm.ui")
+    embeddedModule("intellij.libraries.jgoodies.common")
+    embeddedModule("intellij.libraries.jgoodies.forms")
    embeddedModule("intellij.libraries.miglayout.swing")
    embeddedModule("intellij.libraries.pty4j")
    embeddedModule("intellij.libraries.sshj")
@@ -172,8 +172,8 @@ jvm_library(
    "@lib//:org-codehaus-groovy-groovy-templates",
    "@lib//:org-codehaus-groovy-groovy-xml",
    "@lib//:protobuf",
-    "@lib//:jgoodies-common",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/common",
+    "//libraries/jgoodies/forms",
    "//libraries/bouncy-castle-provider",
    "//platform/platform-resources:resources",
    "//platform/platform-resources-en:resources-en",
@@ -110,8 +110,8 @@
    <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
    <orderEntry type="module" module-name="intellij.libraries.aalto.xml" />
-    <orderEntry type="library" scope="RUNTIME" name="jgoodies-common" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="jgoodies-forms" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.common" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.libraries.jbr" />
    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
@@ -23,6 +23,8 @@
    <module name="intellij.libraries.jackson.jr.objects"/>
    <module name="intellij.libraries.jbr"/>
    <module name="intellij.libraries.jcef"/>
+    <module name="intellij.libraries.jgoodies.common"/>
+    <module name="intellij.libraries.jgoodies.forms"/>
    <module name="intellij.libraries.jsoup"/>
    <module name="intellij.libraries.jvm.native.trusted.roots"/>
    <module name="intellij.libraries.kotlin.reflect"/>
@@ -116,6 +116,8 @@
    <module name="intellij.libraries.jcef" loading="embedded"/>
    <module name="intellij.libraries.jediterm.core" loading="embedded"/>
    <module name="intellij.libraries.jediterm.ui" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.common" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.forms" loading="embedded"/>
    <module name="intellij.libraries.miglayout.swing" loading="embedded"/>
    <module name="intellij.libraries.pty4j" loading="embedded"/>
    <module name="intellij.libraries.sshj" loading="embedded"/>
@@ -117,6 +117,8 @@
    <module name="intellij.libraries.jcef" loading="embedded"/>
    <module name="intellij.libraries.jediterm.core" loading="embedded"/>
    <module name="intellij.libraries.jediterm.ui" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.common" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.forms" loading="embedded"/>
    <module name="intellij.libraries.miglayout.swing" loading="embedded"/>
    <module name="intellij.libraries.pty4j" loading="embedded"/>
    <module name="intellij.libraries.sshj" loading="embedded"/>
@@ -118,6 +118,8 @@
    <module name="intellij.libraries.jcef" loading="embedded"/>
    <module name="intellij.libraries.jediterm.core" loading="embedded"/>
    <module name="intellij.libraries.jediterm.ui" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.common" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.forms" loading="embedded"/>
    <module name="intellij.libraries.miglayout.swing" loading="embedded"/>
    <module name="intellij.libraries.pty4j" loading="embedded"/>
    <module name="intellij.libraries.sshj" loading="embedded"/>
@@ -119,6 +119,8 @@
    <module name="intellij.libraries.jcef" loading="embedded"/>
    <module name="intellij.libraries.jediterm.core" loading="embedded"/>
    <module name="intellij.libraries.jediterm.ui" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.common" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.forms" loading="embedded"/>
    <module name="intellij.libraries.miglayout.swing" loading="embedded"/>
    <module name="intellij.libraries.pty4j" loading="embedded"/>
    <module name="intellij.libraries.sshj" loading="embedded"/>
@@ -122,6 +122,8 @@
    <module name="intellij.libraries.jcef" loading="embedded"/>
    <module name="intellij.libraries.jediterm.core" loading="embedded"/>
    <module name="intellij.libraries.jediterm.ui" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.common" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.forms" loading="embedded"/>
    <module name="intellij.libraries.miglayout.swing" loading="embedded"/>
    <module name="intellij.libraries.pty4j" loading="embedded"/>
    <module name="intellij.libraries.sshj" loading="embedded"/>
@@ -7,6 +7,8 @@
    <module name="intellij.libraries.jcef" loading="embedded"/>
    <module name="intellij.libraries.jediterm.core" loading="embedded"/>
    <module name="intellij.libraries.jediterm.ui" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.common" loading="embedded"/>
+    <module name="intellij.libraries.jgoodies.forms" loading="embedded"/>
    <module name="intellij.libraries.miglayout.swing" loading="embedded"/>
    <module name="intellij.libraries.pty4j" loading="embedded"/>
    <module name="intellij.libraries.sshj" loading="embedded"/>
@@ -73,7 +73,7 @@ jvm_library(
    "//libraries/microba",
    "//platform/kernel/shared:kernel",
    "//platform/vcs-impl/shared",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//platform/observable",
    "//platform/platform-impl/concurrency",
    "//platform/project/shared:project",
@@ -159,7 +159,7 @@ jvm_library(
    "//platform/kernel/shared:kernel",
    "//platform/vcs-impl/shared",
    "//platform/vcs-impl/shared:shared_test_lib",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//platform/observable",
    "//platform/platform-impl/concurrency",
    "//platform/project/shared:project",
@@ -97,7 +97,7 @@
    <orderEntry type="module" module-name="intellij.libraries.microba" />
    <orderEntry type="module" module-name="intellij.platform.kernel" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl.shared" />
-    <orderEntry type="library" name="jgoodies-forms" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
    <orderEntry type="module" module-name="intellij.platform.ide.concurrency" />
    <orderEntry type="module" module-name="intellij.platform.project" />
@@ -54,7 +54,7 @@ jvm_library(
    "//java/execution/impl",
    "//java/debugger/impl",
    "//java/idea-ui:ui",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//libraries/gson",
    "//plugins/groovy",
    "//libraries/guava",
@@ -41,7 +41,7 @@
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
    <orderEntry type="module" module-name="intellij.java.ui" exported="" />
    <orderEntry type="module" module-name="intellij.java.guiForms.rt" exported="" scope="PROVIDED" />
-    <orderEntry type="library" name="jgoodies-forms" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" />
    <orderEntry type="module" module-name="intellij.libraries.gson" />
    <orderEntry type="module" module-name="intellij.groovy" />
    <orderEntry type="module" module-name="intellij.libraries.guava" />
@@ -60,7 +60,7 @@ jvm_library(
    "//java/java-impl-refactorings:impl-refactorings",
    "//platform/util/jdom",
    "//xml/xml-psi-api:psi",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//platform/execution",
  ]
 )
@@ -115,7 +115,7 @@ jvm_library(
    "//java/java-impl-refactorings:impl-refactorings",
    "//platform/util/jdom",
    "//xml/xml-psi-api:psi",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//platform/execution",
  ]
 )
@@ -47,7 +47,7 @@
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.xml.psi" />
-    <orderEntry type="library" name="jgoodies-forms" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" />
    <orderEntry type="module" module-name="intellij.platform.execution" />
  </component>
  <component name="copyright">
@@ -52,7 +52,7 @@ jvm_library(
    "//platform/editor-ui-ex:editor-ex",
    "//java/compiler/impl",
    "//platform/icons",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//libraries/asm",
    "//plugins/java-i18n",
    "//java/idea-ui:ui",
@@ -122,7 +122,7 @@ jvm_library(
    "//platform/editor-ui-ex:editor-ex",
    "//java/compiler/impl",
    "//platform/icons",
-    "@lib//:jgoodies-forms",
+    "//libraries/jgoodies/forms",
    "//libraries/asm",
    "//plugins/java-i18n",
    "//plugins/java-i18n:java-i18n_test_lib",
@@ -40,7 +40,7 @@
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
    <orderEntry type="module" module-name="intellij.platform.icons" />
-    <orderEntry type="library" name="jgoodies-forms" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" />
    <orderEntry type="module" module-name="intellij.libraries.asm" />
    <orderEntry type="module" module-name="intellij.java.i18n" exported="" />
    <orderEntry type="module" module-name="intellij.java.ui" />