IJPL-222388 IJ-MR-184993 IJ-MR-179029 IJ-MR-146078 convert netty as otherwise scrambling may faile for JB Client

cwm uses netty — packaging already fixed in another separate commit, but still we need to convert netty to simplify our build scripts

GitOrigin-RevId: a169f1203799f4fdb1adbc62c3ba2071f08325c6

.idea/libraries/netty_codec_compression.xml

@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="netty-codec-compression" type="repository">
-    <properties include-transitive-deps="false" maven-id="io.netty:netty-codec-compression:4.2.0.RC2">
-      <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2.jar">
-          <sha256sum>7251646a8ea8d56a2415311de6040159479ac0e35de36dab70b667ed899ac931</sha256sum>
-        </artifact>
-      </verification>
-    </properties>
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/modules.xml

@@ -920,6 +920,9 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/miglayout-swing/intellij.libraries.miglayout.swing.iml" filepath="$PROJECT_DIR$/libraries/miglayout-swing/intellij.libraries.miglayout.swing.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/mockito/intellij.libraries.mockito.iml" filepath="$PROJECT_DIR$/libraries/mockito/intellij.libraries.mockito.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/mvstore/intellij.libraries.mvstore.iml" filepath="$PROJECT_DIR$/libraries/mvstore/intellij.libraries.mvstore.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/netty/buffer/intellij.libraries.netty.buffer.iml" filepath="$PROJECT_DIR$/libraries/netty/buffer/intellij.libraries.netty.buffer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/netty/codec-compression/intellij.libraries.netty.codec.compression.iml" filepath="$PROJECT_DIR$/libraries/netty/codec-compression/intellij.libraries.netty.codec.compression.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/netty/codec-http/intellij.libraries.netty.codec.http.iml" filepath="$PROJECT_DIR$/libraries/netty/codec-http/intellij.libraries.netty.codec.http.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/opencsv/intellij.libraries.opencsv.iml" filepath="$PROJECT_DIR$/libraries/opencsv/intellij.libraries.opencsv.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/oro-matcher/intellij.libraries.oro.matcher.iml" filepath="$PROJECT_DIR$/libraries/oro-matcher/intellij.libraries.oro.matcher.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/plexus-utils/intellij.libraries.plexus.utils.iml" filepath="$PROJECT_DIR$/libraries/plexus-utils/intellij.libraries.plexus.utils.iml" />

build/bazel-generated-file-list.txt

@@ -456,6 +456,9 @@ libraries/microba
 libraries/miglayout-swing
 libraries/mockito
 libraries/mvstore
+libraries/netty/buffer
+libraries/netty/codec-compression
+libraries/netty/codec-http
 libraries/opencsv
 libraries/oro-matcher
 libraries/plexus-utils

build/jvm-rules/zip/intellij.idea.community.build.zip.iml

@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" />
   </component>

java/compiler/impl/BUILD.bazel

@@ -57,11 +57,11 @@ jvm_library(
     "//libraries/asm",
     "@lib//:kotlin-stdlib",
     "//libraries/protobuf",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/stream",
     "//libraries/fastutil",
     "@lib//:jps-javac-extension",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//libraries/winp",
     "//libraries/jackson/jackson",
     "//libraries/jackson/databind",

java/compiler/impl/intellij.java.compiler.impl.iml

@@ -57,11 +57,11 @@
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.protobuf" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="library" name="jps-javac-extension" level="project" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.libraries.winp" />
     <orderEntry type="module" module-name="intellij.libraries.jackson" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.databind" />

jupyter/BUILD.bazel

@@ -21,8 +21,8 @@ jvm_library(
     "//platform/platform-util-netty:ide-util-netty",
     "//libraries/http-client",
     "//platform/util",
-    "@lib//:netty-buffer",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/projectModel-api:projectModel",
     "//platform/analysis-api:analysis",
   ]

jupyter/intellij.notebooks.jupyter.core.iml

@@ -16,8 +16,8 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.libraries.http.client" />
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
   </component>

lib/BUILD.bazel

@@ -5554,6 +5554,13 @@ jvm_import(
   visibility = ["//visibility:public"]
 )
 
+jvm_import(
+  name = "libraries-netty-codec-compression-netty-codec-compression",
+  jar = "@io_netty-netty-codec-compression-4_2_0_RC2_http//file",
+  source_jar = "@io_netty-netty-codec-compression-4_2_0_RC2-sources_http//file",
+  visibility = ["//visibility:public"]
+)
+
 java_library(
   name = "libraries-opencsv-opencsv",
   exports = [
@@ -8105,13 +8112,6 @@ java_library(
   visibility = ["//visibility:public"]
 )
 
-jvm_import(
-  name = "netty-codec-compression",
-  jar = "@io_netty-netty-codec-compression-4_2_0_RC2_http//file",
-  source_jar = "@io_netty-netty-codec-compression-4_2_0_RC2-sources_http//file",
-  visibility = ["//visibility:public"]
-)
-
 java_library(
   name = "netty-codec-http",
   exports = [

lib/MODULE.bazel

@@ -8385,6 +8385,20 @@ http_file(
   downloaded_file_path = "h2-mvstore-2.3.232-sources.jar"
 )
 
+http_file(
+  name = "io_netty-netty-codec-compression-4_2_0_RC2_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2.jar",
+  sha256 = "7251646a8ea8d56a2415311de6040159479ac0e35de36dab70b667ed899ac931",
+  downloaded_file_path = "netty-codec-compression-4.2.0.RC2.jar"
+)
+
+http_file(
+  name = "io_netty-netty-codec-compression-4_2_0_RC2-sources_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2-sources.jar",
+  sha256 = "e304b486132cc49a02ac5110d6b6b9a5de30483fbf4cc6ea768ec3690dfc8496",
+  downloaded_file_path = "netty-codec-compression-4.2.0.RC2-sources.jar"
+)
+
 http_file(
   name = "com_opencsv-opencsv-5_10_http",
   url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/opencsv/opencsv/5.10/opencsv-5.10.jar",
@@ -12074,20 +12088,6 @@ http_file(
   downloaded_file_path = "mockito-kotlin-6.0.0-sources.jar"
 )
 
-http_file(
-  name = "io_netty-netty-codec-compression-4_2_0_RC2_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2.jar",
-  sha256 = "7251646a8ea8d56a2415311de6040159479ac0e35de36dab70b667ed899ac931",
-  downloaded_file_path = "netty-codec-compression-4.2.0.RC2.jar"
-)
-
-http_file(
-  name = "io_netty-netty-codec-compression-4_2_0_RC2-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2-sources.jar",
-  sha256 = "e304b486132cc49a02ac5110d6b6b9a5de30483fbf4cc6ea768ec3690dfc8496",
-  downloaded_file_path = "netty-codec-compression-4.2.0.RC2-sources.jar"
-)
-
 http_file(
   name = "io_netty-netty-codec-http2-4_2_0_RC2_http",
   url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-http2/4.2.0.RC2/netty-codec-http2-4.2.0.RC2.jar",

libraries/netty/buffer/BUILD.bazel

@@ -0,0 +1,18 @@
+### auto-generated section `build intellij.libraries.netty.buffer` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "buffer_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "buffer",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":buffer_resources"],
+  exports = ["@lib//:netty-buffer"],
+  runtime_deps = ["@lib//:netty-buffer"]
+)
+### auto-generated section `build intellij.libraries.netty.buffer` end

libraries/netty/buffer/intellij.libraries.netty.buffer.iml

@@ -0,0 +1,12 @@
+<?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="library" exported="" name="netty-buffer" level="project" />
+  </component>
+</module>

libraries/netty/buffer/module-content.yaml

@@ -0,0 +1,7 @@
+- name: dist.all/lib/intellij.libraries.netty.buffer.jar
+  modules:
+  - name: intellij.libraries.netty.buffer
+  library: netty-buffer
+  files:
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-buffer/4/netty-buffer-4.jar
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-common/4/netty-common-4.jar

libraries/netty/buffer/resources/intellij.libraries.netty.buffer.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

libraries/netty/codec-compression/BUILD.bazel

@@ -0,0 +1,21 @@
+### auto-generated section `build intellij.libraries.netty.codec.compression` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "libraries-netty-codec-compression_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "libraries-netty-codec-compression",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":libraries-netty-codec-compression_resources"],
+  exports = ["@lib//:libraries-netty-codec-compression-netty-codec-compression"],
+  runtime_deps = [
+    "@lib//:libraries-netty-codec-compression-netty-codec-compression",
+    "//libraries/netty/buffer",
+  ]
+)
+### auto-generated section `build intellij.libraries.netty.codec.compression` end

libraries/netty/codec-compression/intellij.libraries.netty.codec.compression.iml

@@ -0,0 +1,30 @@
+<?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="netty-codec-compression" type="repository">
+        <properties include-transitive-deps="false" maven-id="io.netty:netty-codec-compression:4.2.0.RC2">
+          <verification>
+            <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2.jar">
+              <sha256sum>7251646a8ea8d56a2415311de6040159479ac0e35de36dab70b667ed899ac931</sha256sum>
+            </artifact>
+          </verification>
+        </properties>
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.RC2/netty-codec-compression-4.2.0.RC2-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
+  </component>
+</module>

libraries/netty/codec-compression/module-content.yaml

@@ -0,0 +1,6 @@
+- name: dist.all/lib/intellij.libraries.netty.codec.compression.jar
+  modules:
+  - name: intellij.libraries.netty.codec.compression
+  library: netty-codec-compression
+  files:
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4/netty-codec-compression-4.jar

libraries/netty/codec-compression/resources/intellij.libraries.netty.codec.compression.xml

@@ -0,0 +1,5 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.libraries.netty.buffer"/>
+  </dependencies>
+</idea-plugin>

libraries/netty/codec-http/BUILD.bazel

@@ -0,0 +1,21 @@
+### auto-generated section `build intellij.libraries.netty.codec.http` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "libraries-netty-codec-http_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "libraries-netty-codec-http",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":libraries-netty-codec-http_resources"],
+  exports = ["@lib//:netty-codec-http"],
+  runtime_deps = [
+    "@lib//:netty-codec-http",
+    "//libraries/netty/buffer",
+  ]
+)
+### auto-generated section `build intellij.libraries.netty.codec.http` end

libraries/netty/codec-http/intellij.libraries.netty.codec.http.iml

@@ -0,0 +1,13 @@
+<?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="library" exported="" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
+  </component>
+</module>

libraries/netty/codec-http/module-content.yaml

@@ -0,0 +1,13 @@
+- name: dist.all/lib/intellij.libraries.netty.codec.http.jar
+  modules:
+  - name: intellij.libraries.netty.codec.http
+  library: netty-codec-http
+  files:
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4/netty-codec-http2-4.jar
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-transport/4/netty-transport-4.jar
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-resolver/4/netty-resolver-4.jar
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-codec/4/netty-codec-4.jar
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-base/4/netty-codec-base-4.jar
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-handler/4/netty-handler-4.jar
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4/netty-transport-native-unix-common-4.jar
+  - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-http/4/netty-codec-http-4.jar

libraries/netty/codec-http/resources/intellij.libraries.netty.codec.http.xml

@@ -0,0 +1,5 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.libraries.netty.buffer"/>
+  </dependencies>
+</idea-plugin>

platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt

@@ -151,8 +151,6 @@ internal suspend fun createPlatformLayout(projectLibrariesUsedByPlugins: SortedS
     "javax.activation",
     "jaxb-runtime",
     "jaxb-api",
-    // todo - convert to product module
-    "netty-codec-compression"
   ))
 
   layout.withProjectLibraries(

platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt

@@ -123,6 +123,9 @@ object CommunityModuleSets  {
     embeddedModule("intellij.libraries.lz4")
     embeddedModule("intellij.libraries.markdown")
     embeddedModule("intellij.libraries.mvstore")
+    embeddedModule("intellij.libraries.netty.buffer")
+    embeddedModule("intellij.libraries.netty.codec.compression")
+    embeddedModule("intellij.libraries.netty.codec.http")
     embeddedModule("intellij.libraries.oro.matcher")
     embeddedModule("intellij.libraries.protobuf")
     embeddedModule("intellij.libraries.proxy.vole")

platform/build-scripts/tests/BUILD.bazel

@@ -42,7 +42,7 @@ jvm_library(
     "//platform/util/jdom",
     "//platform/util-ex",
     "@community//build:zip",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//libraries/hash4j",
     "//libraries/fastutil",
     "//libraries/maven-resolver-provider",

platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml

@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" scope="TEST" />
     <orderEntry type="module" module-name="intellij.idea.community.build.zip" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.maven.resolver.provider" scope="TEST" />

platform/built-in-server-api/BUILD.bazel

@@ -16,7 +16,7 @@ jvm_library(
   deps = [
     "//platform/core-api:core",
     "@lib//:kotlin-stdlib",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/util-ex",
     "//platform/util",
     "//platform/platform-util-io:ide-util-io",

platform/built-in-server-api/intellij.platform.builtInServer.iml

@@ -10,7 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />

platform/built-in-server-api/resources/intellij.platform.builtInServer.xml

@@ -1,6 +1,7 @@
 <idea-plugin visibility="internal">
   <!-- editor-fold desc="Generated dependencies - do not edit manually" -->
   <dependencies>
+    <module name="intellij.libraries.netty.codec.http"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.core"/>
     <module name="intellij.platform.ide.core"/>

platform/built-in-server/BUILD.bazel

@@ -30,11 +30,11 @@ jvm_library(
     "//platform/built-in-server-api:builtInServer",
     "//platform/diff-api:diff",
     "@lib//:kotlin-stdlib",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/fastutil",
     "//libraries/jackson/jackson",
     "//libraries/jackson/jr-objects:libraries-jackson-jr-objects",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//libraries/caffeine",
     "//platform/util/concurrency",
     "//platform/core-ui",
@@ -42,7 +42,7 @@ jvm_library(
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/util/progress",
     "//libraries/kotlinx/coroutines/core",
-    "@lib//:netty-codec-compression",
+    "//libraries/netty/codec-compression:libraries-netty-codec-compression",
     "//platform/execution",
   ],
   exports = ["//platform/built-in-server-api:builtInServer"]
@@ -92,9 +92,9 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "@lib//:assert_j",
     "//platform/built-in-server:builtInServer-impl",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/kotlinx/coroutines/core",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/core-ui",
     "//platform/platform-util-io:ide-util-io",
     "//platform/platform-util-netty:ide-util-netty",

platform/built-in-server/intellij.platform.builtInServer.impl.iml

@@ -27,11 +27,11 @@
     <orderEntry type="module" module-name="intellij.platform.builtInServer" exported="" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.jackson" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.jr.objects" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
@@ -39,7 +39,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.util.progress" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
-    <orderEntry type="library" name="netty-codec-compression" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.compression" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
   </component>
 </module>

platform/built-in-server/intellij.platform.builtInServer.tests.iml

@@ -31,9 +31,9 @@
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
-    <orderEntry type="library" scope="TEST" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" scope="TEST" />

platform/built-in-server/resources/intellij.platform.builtInServer.impl.xml

@@ -9,6 +9,9 @@
     <module name="intellij.libraries.jackson"/>
     <module name="intellij.libraries.jackson.jr.objects"/>
     <module name="intellij.libraries.kotlinx.coroutines.core"/>
+    <module name="intellij.libraries.netty.buffer"/>
+    <module name="intellij.libraries.netty.codec.compression"/>
+    <module name="intellij.libraries.netty.codec.http"/>
     <module name="intellij.platform.analysis"/>
     <module name="intellij.platform.builtInServer"/>
     <module name="intellij.platform.core"/>

platform/collaboration-tools/auth-base/BUILD.bazel

@@ -18,8 +18,8 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/platform-util-io:ide-util-io",
     "//platform/platform-api:ide",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "//platform/platform-util-netty:ide-util-netty",
   ],
   runtime_deps = ["//platform/backend"]

platform/collaboration-tools/auth-base/intellij.platform.collaborationTools.auth.base.iml

@@ -13,8 +13,8 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
   </component>
 </module>

platform/collaboration-tools/auth/BUILD.bazel

@@ -18,8 +18,8 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/platform-util-io:ide-util-io",
     "//platform/platform-api:ide",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/collaboration-tools/auth-base:collaborationTools-auth-base",
     "//platform/built-in-server:builtInServer-impl",

platform/collaboration-tools/auth/intellij.platform.collaborationTools.auth.iml

@@ -12,8 +12,8 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.collaborationTools.auth.base" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />

platform/external-process-auth-helper/BUILD.bazel

@@ -24,8 +24,8 @@ jvm_library(
     "//platform/external-process-auth-helper/rt",
     "//platform/built-in-server:builtInServer-impl",
     "//platform/platform-util-netty:ide-util-netty",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "//platform/eel",
     "//platform/eel-provider",
   ],
@@ -48,8 +48,8 @@ jvm_library(
     "//platform/external-process-auth-helper/rt",
     "//platform/built-in-server:builtInServer-impl",
     "//platform/platform-util-netty:ide-util-netty",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "@lib//:junit5",
     "//platform/eel",
     "//platform/eel-provider",

platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml

@@ -19,8 +19,8 @@
     <orderEntry type="module" module-name="intellij.platform.externalProcessAuthHelper.rt" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.eel" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />

platform/external-process-auth-helper/resources/intellij.platform.externalProcessAuthHelper.xml

@@ -1,6 +1,8 @@
 <idea-plugin visibility="internal">
   <!-- editor-fold desc="Generated dependencies - do not edit manually" -->
   <dependencies>
+    <module name="intellij.libraries.netty.buffer"/>
+    <module name="intellij.libraries.netty.codec.http"/>
     <module name="intellij.platform.builtInServer"/>
     <module name="intellij.platform.builtInServer.impl"/>
     <module name="intellij.platform.core"/>

platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml

@@ -64,6 +64,9 @@
     <module name="intellij.libraries.lz4" loading="embedded"/>
     <module name="intellij.libraries.markdown" loading="embedded"/>
     <module name="intellij.libraries.mvstore" loading="embedded"/>
+    <module name="intellij.libraries.netty.buffer" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.compression" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.http" loading="embedded"/>
     <module name="intellij.libraries.oro.matcher" loading="embedded"/>
     <module name="intellij.libraries.protobuf" loading="embedded"/>
     <module name="intellij.libraries.proxy.vole" loading="embedded"/>

platform/platform-impl/BUILD.bazel

@@ -70,7 +70,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//libraries/stream",
     "//libraries/kotlinx/coroutines/core",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/jackson/jackson",
     "@lib//:java_compatibility",
     "//libraries/kotlin/reflect",
@@ -89,7 +89,7 @@ jvm_library(
     "//libraries/fastutil",
     "//libraries/blockmap",
     "//platform/util-class-loader:util-classLoader",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/util/progress",
     "//platform/util/concurrency",
     "//platform/core-ui",
@@ -232,7 +232,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//libraries/stream",
     "//libraries/kotlinx/coroutines/core",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/jackson/jackson",
     "@lib//:java_compatibility",
     "//libraries/kotlin/reflect",
@@ -253,7 +253,7 @@ jvm_library(
     "//libraries/fastutil",
     "//libraries/blockmap",
     "//platform/util-class-loader:util-classLoader",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/util/progress",
     "//platform/util/concurrency",
     "//platform/util/concurrency:concurrency_test_lib",

platform/platform-impl/bootstrap/BUILD.bazel

@@ -42,7 +42,7 @@ jvm_library(
     "//libraries/hash4j",
     "//libraries/jbr",
     "@lib//:googlecode-plist-dd",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/eel-impl",
     "//platform/platform-impl/initial-config-import",
     "//platform/eel-provider",

platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml

@@ -42,7 +42,7 @@
     <orderEntry type="module" module-name="intellij.libraries.hash4j" />
     <orderEntry type="module" module-name="intellij.libraries.jbr" />
     <orderEntry type="library" name="googlecode.plist.dd" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.eel.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.initialConfigImport" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />

platform/platform-impl/intellij.platform.ide.impl.iml

@@ -71,7 +71,7 @@
     <orderEntry type="library" scope="RUNTIME" name="slf4j-jdk14" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.libraries.jackson" />
     <orderEntry type="library" name="Java Compatibility" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" />
@@ -95,7 +95,7 @@
     <orderEntry type="library" scope="RUNTIME" name="org.codehaus.groovy:groovy-xml" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.blockmap" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.util.progress" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />

platform/platform-impl/resources/intellij.platform.ide.impl.xml

@@ -34,6 +34,8 @@
     <module name="intellij.libraries.kotlinx.serialization.json"/>
     <module name="intellij.libraries.lz4"/>
     <module name="intellij.libraries.miglayout.swing"/>
+    <module name="intellij.libraries.netty.buffer"/>
+    <module name="intellij.libraries.netty.codec.http"/>
     <module name="intellij.libraries.oro.matcher"/>
     <module name="intellij.libraries.protobuf"/>
     <module name="intellij.libraries.pty4j"/>

platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml

@@ -65,6 +65,9 @@
     <module name="intellij.libraries.lz4" loading="embedded"/>
     <module name="intellij.libraries.markdown" loading="embedded"/>
     <module name="intellij.libraries.mvstore" loading="embedded"/>
+    <module name="intellij.libraries.netty.buffer" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.compression" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.http" loading="embedded"/>
     <module name="intellij.libraries.oro.matcher" loading="embedded"/>
     <module name="intellij.libraries.protobuf" loading="embedded"/>
     <module name="intellij.libraries.proxy.vole" loading="embedded"/>

platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml

@@ -66,6 +66,9 @@
     <module name="intellij.libraries.lz4" loading="embedded"/>
     <module name="intellij.libraries.markdown" loading="embedded"/>
     <module name="intellij.libraries.mvstore" loading="embedded"/>
+    <module name="intellij.libraries.netty.buffer" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.compression" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.http" loading="embedded"/>
     <module name="intellij.libraries.oro.matcher" loading="embedded"/>
     <module name="intellij.libraries.protobuf" loading="embedded"/>
     <module name="intellij.libraries.proxy.vole" loading="embedded"/>

platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml

@@ -66,6 +66,9 @@
     <module name="intellij.libraries.lz4" loading="embedded"/>
     <module name="intellij.libraries.markdown" loading="embedded"/>
     <module name="intellij.libraries.mvstore" loading="embedded"/>
+    <module name="intellij.libraries.netty.buffer" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.compression" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.http" loading="embedded"/>
     <module name="intellij.libraries.oro.matcher" loading="embedded"/>
     <module name="intellij.libraries.protobuf" loading="embedded"/>
     <module name="intellij.libraries.proxy.vole" loading="embedded"/>

platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml

@@ -67,6 +67,9 @@
     <module name="intellij.libraries.lz4" loading="embedded"/>
     <module name="intellij.libraries.markdown" loading="embedded"/>
     <module name="intellij.libraries.mvstore" loading="embedded"/>
+    <module name="intellij.libraries.netty.buffer" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.compression" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.http" loading="embedded"/>
     <module name="intellij.libraries.oro.matcher" loading="embedded"/>
     <module name="intellij.libraries.protobuf" loading="embedded"/>
     <module name="intellij.libraries.proxy.vole" loading="embedded"/>

platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml

@@ -70,6 +70,9 @@
     <module name="intellij.libraries.lz4" loading="embedded"/>
     <module name="intellij.libraries.markdown" loading="embedded"/>
     <module name="intellij.libraries.mvstore" loading="embedded"/>
+    <module name="intellij.libraries.netty.buffer" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.compression" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.http" loading="embedded"/>
     <module name="intellij.libraries.oro.matcher" loading="embedded"/>
     <module name="intellij.libraries.protobuf" loading="embedded"/>
     <module name="intellij.libraries.proxy.vole" loading="embedded"/>

platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml

@@ -63,6 +63,9 @@
     <module name="intellij.libraries.lz4" loading="embedded"/>
     <module name="intellij.libraries.markdown" loading="embedded"/>
     <module name="intellij.libraries.mvstore" loading="embedded"/>
+    <module name="intellij.libraries.netty.buffer" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.compression" loading="embedded"/>
+    <module name="intellij.libraries.netty.codec.http" loading="embedded"/>
     <module name="intellij.libraries.oro.matcher" loading="embedded"/>
     <module name="intellij.libraries.protobuf" loading="embedded"/>
     <module name="intellij.libraries.proxy.vole" loading="embedded"/>

platform/platform-tests/BUILD.bazel

@@ -93,7 +93,7 @@ jvm_library(
     "//libraries/fastutil",
     "//libraries/jcef",
     "//platform/util-class-loader:util-classLoader",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//libraries/lz4",
     "//libraries/caffeine",
     "//libraries/jackson/jackson",

platform/platform-tests/intellij.platform.tests.iml

@@ -79,7 +79,7 @@
     <orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.jcef" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.lz4" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.caffeine" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.jackson" scope="TEST" />

platform/platform-util-netty/BUILD.bazel

@@ -11,9 +11,9 @@ jvm_library(
     "//platform/core-api:core",
     "//libraries/guava",
     "//libraries/fastutil",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/util",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/platform-util-io:ide-util-io",
     "//libraries/kotlinx/coroutines/core",
   ]

platform/platform-util-netty/intellij.platform.ide.util.netty.iml

@@ -11,9 +11,9 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
   </component>

platform/script-debugger/backend/BUILD.bazel

@@ -19,9 +19,9 @@ jvm_library(
     "//platform/script-debugger/protocol/protocol-reader-runtime",
     "//platform/platform-api:ide",
     "//platform/platform-impl:ide-impl",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/fastutil",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/platform-util-io:ide-util-io",
     "//platform/util/concurrency",
     "//platform/platform-util-netty:ide-util-netty",

platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml

@@ -13,9 +13,9 @@
     <orderEntry type="module" module-name="intellij.platform.scriptDebugger.protocolReaderRuntime" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />

platform/script-debugger/debugger-ui/BUILD.bazel

@@ -26,9 +26,9 @@ jvm_library(
     "//platform/xdebugger-impl:debugger-impl",
     "//libraries/guava",
     "//platform/execution-impl",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/fastutil",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/core-ui",
     "//platform/projectModel-api:projectModel",
     "//platform/platform-util-io:ide-util-io",

platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml

@@ -20,10 +20,10 @@
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.debugger.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />

platform/script-debugger/protocol/protocol-reader-runtime/BUILD.bazel

@@ -18,9 +18,9 @@ jvm_library(
     "//libraries/gson",
     "//platform/util",
     "//platform/platform-impl:ide-impl",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/fastutil",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
   ],
   runtime_deps = ["//platform/backend"]
 )

platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml

@@ -13,8 +13,8 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
   </component>
 </module>

platform/testFramework/ui/BUILD.bazel

@@ -21,8 +21,8 @@ jvm_library(
     "//platform/built-in-server:builtInServer-impl",
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/platform-util-io-impl:ide-util-io-impl",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "@lib//:platform-test_framework-ui-intellij-remoterobot-robot-server-core",
     "//libraries/gson",
   ],

platform/testFramework/ui/intellij.platform.testFramework.ui.iml

@@ -33,8 +33,8 @@
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module-library" exported="">
       <library name="intellij.remoterobot.robot.server.core" type="repository">
         <properties maven-id="com.intellij.remoterobot:robot-server-core:0.11.19">

platform/util-ex/BUILD.bazel

@@ -21,7 +21,7 @@ jvm_library(
     "//libraries/jcip",
     "//libraries/kotlinx/coroutines/core",
     "//libraries/fastutil",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//libraries/caffeine",
     "//platform/util/base",
     "//platform/util-class-loader:util-classLoader",

platform/util-ex/intellij.platform.util.ex.iml

@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.libraries.jcip" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />

platform/util-ex/resources/intellij.platform.util.ex.xml

@@ -9,6 +9,7 @@
     <module name="intellij.libraries.kotlinx.coroutines.core"/>
     <module name="intellij.libraries.lz4"/>
     <module name="intellij.libraries.mvstore"/>
+    <module name="intellij.libraries.netty.buffer"/>
   </dependencies>
   <!-- end editor-fold -->
 </idea-plugin>

platform/util/BUILD.bazel

@@ -180,7 +180,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//libraries/fastutil",
     "//platform/util-ex",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//libraries/caffeine",
     "//libraries/aalto-xml",
     "//platform/util/xmlDom",

platform/util/intellij.platform.util.ui.iml

@@ -38,7 +38,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.libraries.aalto.xml" />
     <orderEntry type="module" module-name="intellij.platform.util.xmlDom" />

platform/util/ui/resources/intellij.platform.util.ui.xml

@@ -12,6 +12,7 @@
     <module name="intellij.libraries.kotlinx.serialization.core"/>
     <module name="intellij.libraries.kotlinx.serialization.protobuf"/>
     <module name="intellij.libraries.mvstore"/>
+    <module name="intellij.libraries.netty.buffer"/>
     <module name="intellij.platform.util.ex"/>
   </dependencies>
   <!-- end editor-fold -->

plugins/built-in-help/BUILD.bazel

@@ -15,7 +15,7 @@ jvm_library(
   resources = [":built-in-help_resources"],
   deps = [
     "@lib//:kotlin-stdlib",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "@lib//:lucene-codecs",
     "@lib//:lucene-memory",
     "@lib//:lucene-queries",
@@ -36,7 +36,7 @@ jvm_library(
     "//platform/util-ex",
     "//platform/built-in-server:builtInServer-impl",
     "//libraries/lucene.common",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/platform-util-io:ide-util-io",
     "//platform/platform-util-netty:ide-util-netty",
     "//libraries/jackson/jackson",

plugins/built-in-help/intellij.builtInHelp.iml

@@ -9,7 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="library" name="lucene-codecs" level="project" />
     <orderEntry type="library" name="lucene-memory" level="project" />
     <orderEntry type="library" name="lucene-queries" level="project" />
@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
     <orderEntry type="module" module-name="intellij.libraries.lucene.common" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.libraries.jackson" />

plugins/devkit/devkit-core/BUILD.bazel

@@ -71,9 +71,9 @@ jvm_library(
     "//libraries/stream",
     "//platform/xdebugger-impl:debugger-impl",
     "//java/debugger/impl",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/util-class-loader:util-classLoader",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/core-ui",
     "//libraries/fastutil",
     "//plugins/properties/properties-psi-impl:backend-psi",

plugins/devkit/devkit-core/intellij.devkit.core.iml

@@ -77,9 +77,9 @@
     <orderEntry type="module" module-name="intellij.libraries.stream" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.properties.backend.psi" />

plugins/github/github-core/BUILD.bazel

@@ -61,9 +61,9 @@ jvm_library(
     "//platform/diff-impl",
     "//platform/statistics",
     "//platform/built-in-server:builtInServer-impl",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/collaboration-tools",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/core-ui",
     "//libraries/fastutil",
     "//platform/platform-util-io:ide-util-io",
@@ -135,10 +135,10 @@ jvm_library(
     "//platform/statistics",
     "//platform/statistics:statistics_test_lib",
     "//platform/built-in-server:builtInServer-impl",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/collaboration-tools",
     "//platform/collaboration-tools:collaboration-tools_test_lib",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/core-ui",
     "//libraries/fastutil",
     "//platform/platform-util-io:ide-util-io",

plugins/github/github-core/intellij.vcs.github.iml

@@ -68,9 +68,9 @@
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.collaborationTools" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />

plugins/markdown/core/BUILD.bazel

@@ -29,7 +29,7 @@ jvm_library(
     "//platform/analysis-impl",
     "//platform/platform-impl:ide-impl",
     "//platform/observable",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/ide-core-impl",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
@@ -37,7 +37,7 @@ jvm_library(
     "//platform/editor-ui-ex:editor-ex",
     "//libraries/jcef",
     "//libraries/jsoup",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/core-ui",
     "//platform/code-style-impl:codeStyle-impl",
     "//libraries/markdown",

plugins/markdown/core/intellij.markdown.iml

@@ -49,7 +49,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
@@ -57,7 +57,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.libraries.jcef" />
     <orderEntry type="module" module-name="intellij.libraries.jsoup" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.libraries.markdown" />

plugins/performanceTesting/core/BUILD.bazel

@@ -60,8 +60,8 @@ jvm_library(
     "//platform/xdebugger-impl:debugger-impl",
     "//libraries/caffeine",
     "//platform/remote-driver/core:driver-impl",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "//platform/diagnostic/startUpPerformanceReporter",
     "//platform/service-container",
     "//platform/remote-driver/client",
@@ -130,8 +130,8 @@ jvm_library(
     "//platform/xdebugger-impl:debugger-impl_test_lib",
     "//libraries/caffeine",
     "//platform/remote-driver/core:driver-impl",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "//platform/diagnostic/startUpPerformanceReporter",
     "//platform/service-container",
     "//platform/service-container:service-container_test_lib",

plugins/performanceTesting/core/intellij.performanceTesting.iml

@@ -52,8 +52,8 @@
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.driver.impl" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.startUpPerformanceReporter" />
     <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
     <orderEntry type="module" module-name="intellij.driver.client" />

plugins/performanceTesting/event-bus/BUILD.bazel

@@ -20,10 +20,10 @@ jvm_library(
     "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin",
     "//libraries/jackson/databind",
     "//libraries/kotlin/reflect",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "//platform/platform-util-netty:ide-util-netty",
-    "@lib//:netty-codec-compression",
+    "//libraries/netty/codec-compression:libraries-netty-codec-compression",
   ]
 )
 
@@ -40,10 +40,10 @@ jvm_library(
     "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin",
     "//libraries/jackson/databind",
     "//libraries/kotlin/reflect",
-    "@lib//:netty-codec-http",
-    "@lib//:netty-buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
+    "//libraries/netty/buffer",
     "//platform/platform-util-netty:ide-util-netty",
-    "@lib//:netty-codec-compression",
+    "//libraries/netty/codec-compression:libraries-netty-codec-compression",
   ]
 )
 ### auto-generated section `build intellij.tools.ide.starter.bus` end

plugins/performanceTesting/event-bus/intellij.tools.ide.starter.bus.iml

@@ -16,9 +16,9 @@
     <orderEntry type="module" module-name="intellij.libraries.jackson.module.kotlin" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.databind" />
     <orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
-    <orderEntry type="library" name="netty-codec-compression" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.compression" />
   </component>
 </module>

plugins/performanceTesting/remote-driver/BUILD.bazel

@@ -22,8 +22,8 @@ jvm_library(
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/built-in-server-api:builtInServer",
     "//platform/built-in-server:builtInServer-impl",
-    "@lib//:netty-buffer",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//platform/core-api:core",
     "//platform/remote-driver/model",
     "//platform/platform-api:ide",

plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml

@@ -16,8 +16,8 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.driver.model" />
     <orderEntry type="module" module-name="intellij.platform.ide" />

plugins/remote-control/BUILD.bazel

@@ -21,8 +21,8 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/platform-impl:ide-impl",
-    "@lib//:netty-buffer",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/gson",
     "//platform/analysis-api:analysis",
     "//platform/projectModel-api:projectModel",
@@ -42,8 +42,8 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/platform-impl:ide-impl",
-    "@lib//:netty-buffer",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/buffer",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/gson",
     "//platform/analysis-api:analysis",
     "//platform/projectModel-api:projectModel",

plugins/remote-control/intellij.remoteControl.iml

@@ -16,8 +16,8 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />

python/BUILD.bazel

@@ -284,7 +284,7 @@ jvm_library(
     "@lib//:libthrift",
     "@lib//:slf4j-api",
     "@lib//:slf4j-jdk14",
-    "@lib//:netty-codec-http",
+    "//libraries/netty/codec-http:libraries-netty-codec-http",
     "//libraries/jsoup",
     "//libraries/javax/annotation",
     "@lib//ant/lib:ant-antlr-provided",
@@ -295,7 +295,7 @@ jvm_library(
     "//platform/statistics",
     "@lib//:python-community-impl-ml-completion-prev-exprs-models",
     "//platform/util",
-    "@lib//:netty-buffer",
+    "//libraries/netty/buffer",
     "//platform/core-ui",
     "//platform/code-style-impl:codeStyle-impl",
     "//libraries/fastutil",

python/intellij.python.community.impl.iml

@@ -80,7 +80,7 @@
     <orderEntry type="library" name="libthrift" level="project" />
     <orderEntry type="library" name="slf4j-api" level="project" />
     <orderEntry type="library" name="slf4j-jdk14" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.codec.http" />
     <orderEntry type="module" module-name="intellij.libraries.jsoup" />
     <orderEntry type="module" module-name="intellij.libraries.javax.annotation" />
     <orderEntry type="library" scope="PROVIDED" name="Ant" level="project" />
@@ -113,7 +113,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.netty.buffer" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />