diff --git a/.idea/modules.xml b/.idea/modules.xml index c52ecbc5c249..c33f8926957a 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -923,6 +923,7 @@ + diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 0911cacd3568..03033caab069 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -329,6 +329,7 @@ java/remote-servers/api java/remote-servers/impl java/structuralsearch-java java/testFramework +java/testFramework/backend java/testFramework/shared java/typeMigration java/unscramble @@ -439,6 +440,7 @@ libraries/kotlinx/coroutines/test libraries/kotlinx/datetime libraries/kotlinx/document-store-mvstore libraries/kotlinx/html +libraries/kotlinx/serialization/cbor libraries/kotlinx/serialization/core libraries/kotlinx/serialization/json libraries/kotlinx/serialization/protobuf @@ -459,6 +461,7 @@ libraries/mvstore libraries/netty/buffer libraries/netty/codec-compression libraries/netty/codec-http +libraries/netty/handler-proxy libraries/opencsv libraries/oro-matcher libraries/plexus-utils diff --git a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt index c64e9d04bb81..1c7023ee2d74 100644 --- a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt +++ b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt @@ -46,7 +46,6 @@ suspend fun buildCommunityStandaloneJpsBuilder( "intellij.libraries.lz4", "intellij.libraries.http.client", "intellij.libraries.cli.parser", - "intellij.libraries.plexus.utils", "intellij.libraries.asm", "intellij.libraries.jgoodies.forms", "intellij.libraries.oro.matcher", diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 7510137101c8..20f9e035edac 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -420,34 +420,6 @@ jvm_import( visibility = ["//visibility:public"] ) -java_library( - name = "asm-tools", - exports = [ - ":org_ow2_asm-asm-analysis-9_8_http_import", - ":org_ow2_asm-asm-tree-9_8_http_import", - ":org_ow2_asm-asm-9_8_http_import", - ], - visibility = ["//visibility:public"] -) - -jvm_import( - name = "org_ow2_asm-asm-analysis-9_8_http_import", - jar = "@org_ow2_asm-asm-analysis-9_8_http//file", - source_jar = "@org_ow2_asm-asm-analysis-9_8-sources_http//file" -) - -jvm_import( - name = "org_ow2_asm-asm-tree-9_8_http_import", - jar = "@org_ow2_asm-asm-tree-9_8_http//file", - source_jar = "@org_ow2_asm-asm-tree-9_8-sources_http//file" -) - -jvm_import( - name = "org_ow2_asm-asm-9_8_http_import", - jar = "@org_ow2_asm-asm-9_8_http//file", - source_jar = "@org_ow2_asm-asm-9_8-sources_http//file" -) - jvm_import( name = "assert_j", jar = "@org_assertj-assertj-core-4_0_0-M1_http//file", @@ -462,13 +434,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "automaton", - jar = "@dk_brics-automaton-1_12-4_http//file", - source_jar = "@dk_brics-automaton-1_12-4-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "bouncy-castle-pgp", jar = "@org_bouncycastle-bcpg-jdk18on-1_81_http//file", @@ -595,13 +560,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "commons-imaging", - jar = "@org_jetbrains_intellij_deps-commons-imaging-1_0-RC-1_http//file", - source_jar = "@org_jetbrains_intellij_deps-commons-imaging-1_0-RC-1-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "commons-io", jar = "@commons-io-commons-io-2_18_0_http//file", @@ -616,13 +574,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "commons-logging", - jar = "@commons-logging-commons-logging-1_2_http//file", - source_jar = "@commons-logging-commons-logging-1_2-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "completion_ml_ranking_models-completion-ranking-cpp-exp", jar = "@org_jetbrains_intellij_deps_completion-completion-ranking-cpp-0_1_5_http//file", @@ -2578,13 +2529,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "imgscalr", - jar = "@org_imgscalr-imgscalr-lib-4_2_http//file", - source_jar = "@org_imgscalr-imgscalr-lib-4_2-sources_http//file", - visibility = ["//visibility:public"] -) - java_library( name = "intellij-plugin-structure", exports = [ @@ -2823,13 +2767,6 @@ jvm_import( source_jar = "@io_qameta_allure-allure-model-2_25_0-sources_http//file" ) -jvm_import( - name = "ion", - jar = "@com_amazon_ion-ion-java-1_11_10_http//file", - source_jar = "@com_amazon_ion-ion-java-1_11_10-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "jackson", jar = "@com_fasterxml_jackson_core-jackson-core-2_19_0_http//file", @@ -3156,13 +3093,6 @@ jvm_import( source_jar = "@com_sun_activation-jakarta_activation-1_2_2-sources_http//file" ) -jvm_import( - name = "jaxen", - jar = "@jaxen-jaxen-1_2_0_http//file", - source_jar = "@jaxen-jaxen-1_2_0-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "jb-jdi", jar = "@org_jetbrains_intellij_deps-jb-jdi-2_45_http//file", @@ -3177,13 +3107,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "jcip", - jar = "@net_jcip-jcip-annotations-1_0_http//file", - source_jar = "@net_jcip-jcip-annotations-1_0-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "jediterm-core", jar = "@org_jetbrains_jediterm-jediterm-core-3_57_http//file", @@ -3804,13 +3727,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "jzlib", - jar = "@com_jcraft-jzlib-1_1_3_http//file", - source_jar = "@com_jcraft-jzlib-1_1_3-sources_http//file", - visibility = ["//visibility:public"] -) - java_library( name = "kaml", exports = [ @@ -4463,27 +4379,6 @@ jvm_import( visibility = ["//visibility:public"] ) -java_library( - name = "kotlinx-document-store-mvstore", - exports = [ - ":com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http_import", - ":com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http_import", - ], - visibility = ["//visibility:public"] -) - -jvm_import( - name = "com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http_import", - jar = "@com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http//file", - source_jar = "@com_github_lamba92-kotlinx-document-store-mvstore-0_0_4-sources_http//file" -) - -jvm_import( - name = "com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http_import", - jar = "@com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http//file", - source_jar = "@com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4-sources_http//file" -) - java_library( name = "kotlinx-io-core", exports = [ @@ -4505,13 +4400,6 @@ jvm_import( source_jar = "@org_jetbrains_kotlinx-kotlinx-io-bytestring-jvm-0_7_0-sources_http//file" ) -jvm_import( - name = "kotlinx-serialization-cbor", - jar = "@org_jetbrains_kotlinx-kotlinx-serialization-cbor-jvm-1_9_0_http//file", - source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-cbor-jvm-1_9_0-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "kotlinx-serialization-core", jar = "@org_jetbrains_kotlinx-kotlinx-serialization-core-jvm-1_9_0_http//file", @@ -4534,13 +4422,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "kotlinx-serialization-protobuf", - jar = "@org_jetbrains_kotlinx-kotlinx-serialization-protobuf-jvm-1_9_0_http//file", - source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-protobuf-jvm-1_9_0-sources_http//file", - visibility = ["//visibility:public"] -) - java_library( name = "ktor-client-cio", exports = [ @@ -4866,6 +4747,41 @@ jvm_import( visibility = ["//visibility:public"] ) +java_library( + name = "libraries-asm-tools-asm-tools", + exports = [ + ":org_ow2_asm-asm-analysis-9_8_http_import", + ":org_ow2_asm-asm-tree-9_8_http_import", + ":org_ow2_asm-asm-9_8_http_import", + ], + visibility = ["//visibility:public"] +) + +jvm_import( + name = "org_ow2_asm-asm-analysis-9_8_http_import", + jar = "@org_ow2_asm-asm-analysis-9_8_http//file", + source_jar = "@org_ow2_asm-asm-analysis-9_8-sources_http//file" +) + +jvm_import( + name = "org_ow2_asm-asm-tree-9_8_http_import", + jar = "@org_ow2_asm-asm-tree-9_8_http//file", + source_jar = "@org_ow2_asm-asm-tree-9_8-sources_http//file" +) + +jvm_import( + name = "org_ow2_asm-asm-9_8_http_import", + jar = "@org_ow2_asm-asm-9_8_http//file", + source_jar = "@org_ow2_asm-asm-9_8-sources_http//file" +) + +jvm_import( + name = "libraries-automaton-automaton", + jar = "@dk_brics-automaton-1_12-4_http//file", + source_jar = "@dk_brics-automaton-1_12-4-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-blockmap-blockmap", jar = "@org_jetbrains_intellij-blockmap-1_0_7_http//file", @@ -4971,6 +4887,20 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-commons-imaging-commons-imaging", + jar = "@org_jetbrains_intellij_deps-commons-imaging-1_0-RC-1_http//file", + source_jar = "@org_jetbrains_intellij_deps-commons-imaging-1_0-RC-1-sources_http//file", + visibility = ["//visibility:public"] +) + +jvm_import( + name = "libraries-commons-logging-commons-logging", + jar = "@commons-logging-commons-logging-1_2_http//file", + source_jar = "@commons-logging-commons-logging-1_2-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-commons-text-commons-text", jar = "@org_apache_commons-commons-text-1_14_0_http//file", @@ -5400,6 +5330,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-imgscalr-imgscalr", + jar = "@org_imgscalr-imgscalr-lib-4_2_http//file", + source_jar = "@org_imgscalr-imgscalr-lib-4_2-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-ini4j-ini4j", jar = "@org_jetbrains_intellij_deps-ini4j-0_5_5-2_http//file", @@ -5407,6 +5344,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-ion-ion", + jar = "@com_amazon_ion-ion-java-1_11_10_http//file", + source_jar = "@com_amazon_ion-ion-java-1_11_10-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-jackson-jr-objects-jackson-jr-objects", jar = "@com_fasterxml_jackson_jr-jackson-jr-objects-2_19_0_http//file", @@ -5414,6 +5358,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-jaxen-_jaxen", + jar = "@jaxen-jaxen-1_2_0_http//file", + source_jar = "@jaxen-jaxen-1_2_0-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-jcef-jcef", jar = "@org_jetbrains_intellij_deps_jcef-jcef-137_0_17-gf354b0e-chromium-137_0_7151_104-api-1_20-261-b15_http//file", @@ -5421,6 +5372,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-jcip-jcip", + jar = "@net_jcip-jcip-annotations-1_0_http//file", + source_jar = "@net_jcip-jcip-annotations-1_0-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-jediterm-ui-jediterm-ui", jar = "@org_jetbrains_jediterm-jediterm-ui-3_57_http//file", @@ -5455,6 +5413,34 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-jzlib-jzlib", + jar = "@com_jcraft-jzlib-1_1_3_http//file", + source_jar = "@com_jcraft-jzlib-1_1_3-sources_http//file", + visibility = ["//visibility:public"] +) + +java_library( + name = "libraries-kotlinx-document-store-mvstore-kotlinx-document-store-mvstore", + exports = [ + ":com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http_import", + ":com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http_import", + ], + visibility = ["//visibility:public"] +) + +jvm_import( + name = "com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http_import", + jar = "@com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http//file", + source_jar = "@com_github_lamba92-kotlinx-document-store-mvstore-0_0_4-sources_http//file" +) + +jvm_import( + name = "com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http_import", + jar = "@com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http//file", + source_jar = "@com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4-sources_http//file" +) + jvm_import( name = "libraries-kotlinx-html-kotlinx-html-jvm", jar = "@org_jetbrains_kotlinx-kotlinx-html-jvm-0_12_0_http//file", @@ -5462,6 +5448,20 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-kotlinx-serialization-cbor-kotlinx-serialization-cbor", + jar = "@org_jetbrains_kotlinx-kotlinx-serialization-cbor-jvm-1_9_0_http//file", + source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-cbor-jvm-1_9_0-sources_http//file", + visibility = ["//visibility:public"] +) + +jvm_import( + name = "libraries-kotlinx-serialization-protobuf-kotlinx-serialization-protobuf", + jar = "@org_jetbrains_kotlinx-kotlinx-serialization-protobuf-jvm-1_9_0_http//file", + source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-protobuf-jvm-1_9_0-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-kryo5-kryo", jar = "@com_esotericsoftware-kryo5-5_6_0_http//file", @@ -5526,6 +5526,13 @@ jvm_import( source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-core-jvm-1_9_0-sources_http//file" ) +jvm_import( + name = "libraries-lz4-lz4-java", + jar = "@org_lz4-lz4-java-1_8_0_http//file", + source_jar = "@org_lz4-lz4-java-1_8_0-sources_http//file", + visibility = ["//visibility:public"] +) + java_library( name = "libraries-miglayout-swing-miglayout-swing", exports = [ @@ -5561,6 +5568,27 @@ jvm_import( visibility = ["//visibility:public"] ) +java_library( + name = "libraries-netty-handler-proxy-netty-handler-proxy", + exports = [ + ":io_netty-netty-handler-proxy-4_2_0_RC2_http_import", + ":io_netty-netty-codec-socks-4_2_0_RC2_http_import", + ], + visibility = ["//visibility:public"] +) + +jvm_import( + name = "io_netty-netty-handler-proxy-4_2_0_RC2_http_import", + jar = "@io_netty-netty-handler-proxy-4_2_0_RC2_http//file", + source_jar = "@io_netty-netty-handler-proxy-4_2_0_RC2-sources_http//file" +) + +jvm_import( + name = "io_netty-netty-codec-socks-4_2_0_RC2_http_import", + jar = "@io_netty-netty-codec-socks-4_2_0_RC2_http//file", + source_jar = "@io_netty-netty-codec-socks-4_2_0_RC2-sources_http//file" +) + java_library( name = "libraries-opencsv-opencsv", exports = [ @@ -5582,6 +5610,13 @@ jvm_import( source_jar = "@commons-beanutils-commons-beanutils-1_10_0-sources_http//file" ) +jvm_import( + name = "libraries-oro-matcher-_oro_matcher", + jar = "@oro-oro-2_0_8_http//file", + source_jar = "@oro-oro-2_0_8-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-plexus-utils-plexus-utils", jar = "@org_codehaus_plexus-plexus-utils-3_5_1_http//file", @@ -5687,6 +5722,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-swingx-swingx", + jar = "@org_swinglabs-swingx-core-1_6_2-2_http//file", + source_jar = "@org_swinglabs-swingx-core-1_6_2-2-sources_http//file", + visibility = ["//visibility:public"] +) + java_library( name = "libraries-system-stubs-jupiter-uk-webcompere-system-stubs-jupiter", exports = [ @@ -5853,13 +5895,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "lz4-java", - jar = "@org_lz4-lz4-java-1_8_0_http//file", - source_jar = "@org_lz4-lz4-java-1_8_0-sources_http//file", - visibility = ["//visibility:public"] -) - java_library( name = "maven-artifact_resolver-common-org-apache-maven-maven-artifact-3-0-5", exports = [ @@ -8531,13 +8566,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "oro_matcher", - jar = "@oro-oro-2_0_8_http//file", - source_jar = "@oro-oro-2_0_8-sources_http//file", - visibility = ["//visibility:public"] -) - java_library( name = "package-search-api-client", exports = [ @@ -9747,13 +9775,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "swingx", - jar = "@org_swinglabs-swingx-core-1_6_2-2_http//file", - source_jar = "@org_swinglabs-swingx-core-1_6_2-2-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "tasks-core-commons-discovery", jar = "@commons-discovery-commons-discovery-0_4_http//file", diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 175eb5e62559..8949a4aa739f 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -8399,6 +8399,34 @@ http_file( downloaded_file_path = "netty-codec-compression-4.2.0.RC2-sources.jar" ) +http_file( + name = "io_netty-netty-handler-proxy-4_2_0_RC2_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-handler-proxy/4.2.0.RC2/netty-handler-proxy-4.2.0.RC2.jar", + sha256 = "f6ac4b798b5094817277cf4d8647bc6f00a6aa4a4031122dcea2fb0bd862c7ac", + downloaded_file_path = "netty-handler-proxy-4.2.0.RC2.jar" +) + +http_file( + name = "io_netty-netty-codec-socks-4_2_0_RC2_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-socks/4.2.0.RC2/netty-codec-socks-4.2.0.RC2.jar", + sha256 = "a758f05e33784a212a6531486563928e57796e1502462f72394122029befff40", + downloaded_file_path = "netty-codec-socks-4.2.0.RC2.jar" +) + +http_file( + name = "io_netty-netty-handler-proxy-4_2_0_RC2-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-handler-proxy/4.2.0.RC2/netty-handler-proxy-4.2.0.RC2-sources.jar", + sha256 = "b23f36cc501178d9804fdc2143fa63fd0e42d8fa7bdf5e1a17ad0f4a5002401c", + downloaded_file_path = "netty-handler-proxy-4.2.0.RC2-sources.jar" +) + +http_file( + name = "io_netty-netty-codec-socks-4_2_0_RC2-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-socks/4.2.0.RC2/netty-codec-socks-4.2.0.RC2-sources.jar", + sha256 = "a2e73438bb1540220e65f8ede4e5ff55e84865c181e9371e18712dceeb8dfc3f", + downloaded_file_path = "netty-codec-socks-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", diff --git a/libraries/netty/codec-compression/module-content.yaml b/libraries/netty/codec-compression/module-content.yaml index cfc747b03210..0e24aaa21305 100644 --- a/libraries/netty/codec-compression/module-content.yaml +++ b/libraries/netty/codec-compression/module-content.yaml @@ -1,6 +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 \ No newline at end of file + libraries: + netty-codec-compression: + - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4/netty-codec-compression-4.jar \ No newline at end of file diff --git a/libraries/netty/handler-proxy/BUILD.bazel b/libraries/netty/handler-proxy/BUILD.bazel new file mode 100644 index 000000000000..dc07d4ec8c1b --- /dev/null +++ b/libraries/netty/handler-proxy/BUILD.bazel @@ -0,0 +1,22 @@ +### auto-generated section `build intellij.libraries.netty.handler.proxy` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "libraries-netty-handler-proxy_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "libraries-netty-handler-proxy", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":libraries-netty-handler-proxy_resources"], + exports = ["@lib//:libraries-netty-handler-proxy-netty-handler-proxy"], + runtime_deps = [ + "@lib//:libraries-netty-handler-proxy-netty-handler-proxy", + "//libraries/netty/buffer", + "//libraries/netty/codec-http:libraries-netty-codec-http", + ] +) +### auto-generated section `build intellij.libraries.netty.handler.proxy` end \ No newline at end of file diff --git a/libraries/netty/handler-proxy/intellij.libraries.netty.handler.proxy.iml b/libraries/netty/handler-proxy/intellij.libraries.netty.handler.proxy.iml new file mode 100644 index 000000000000..8b289c288924 --- /dev/null +++ b/libraries/netty/handler-proxy/intellij.libraries.netty.handler.proxy.iml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + f6ac4b798b5094817277cf4d8647bc6f00a6aa4a4031122dcea2fb0bd862c7ac + + + a758f05e33784a212a6531486563928e57796e1502462f72394122029befff40 + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/netty/handler-proxy/module-content.yaml b/libraries/netty/handler-proxy/module-content.yaml new file mode 100644 index 000000000000..dab9c682ec7a --- /dev/null +++ b/libraries/netty/handler-proxy/module-content.yaml @@ -0,0 +1,7 @@ +- name: dist.all/lib/intellij.libraries.netty.handler.proxy.jar + modules: + - name: intellij.libraries.netty.handler.proxy + libraries: + netty-handler-proxy: + - name: $MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4/netty-handler-proxy-4.jar + - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4/netty-codec-socks-4.jar \ No newline at end of file diff --git a/libraries/netty/handler-proxy/resources/intellij.libraries.netty.handler.proxy.xml b/libraries/netty/handler-proxy/resources/intellij.libraries.netty.handler.proxy.xml new file mode 100644 index 000000000000..084977d9f693 --- /dev/null +++ b/libraries/netty/handler-proxy/resources/intellij.libraries.netty.handler.proxy.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/libraries/swingx/BUILD.bazel b/libraries/swingx/BUILD.bazel index c1795f128e1b..c4e599bfacb1 100644 --- a/libraries/swingx/BUILD.bazel +++ b/libraries/swingx/BUILD.bazel @@ -12,7 +12,7 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), resources = [":swingx_resources"], - exports = ["@lib//:swingx"], - runtime_deps = ["@lib//:swingx"] + exports = ["@lib//:libraries-swingx-swingx"], + runtime_deps = ["@lib//:libraries-swingx-swingx"] ) ### auto-generated section `build intellij.libraries.swingx` end \ No newline at end of file diff --git a/libraries/swingx/module-content.yaml b/libraries/swingx/module-content.yaml index f3349763e095..d88895c1579d 100644 --- a/libraries/swingx/module-content.yaml +++ b/libraries/swingx/module-content.yaml @@ -1,6 +1,6 @@ - name: dist.all/lib/intellij.libraries.swingx.jar modules: - name: intellij.libraries.swingx - library: swingx - files: - - name: $MAVEN_REPOSITORY$/org/swinglabs/swingx-core/1/swingx-core-1.jar \ No newline at end of file + libraries: + swingx: + - name: $MAVEN_REPOSITORY$/org/swinglabs/swingx-core/1/swingx-core-1.jar \ No newline at end of file diff --git a/platform/build-scripts/product-dsl/src/ModuleDescriptorDependencyGenerator.kt b/platform/build-scripts/product-dsl/src/ModuleDescriptorDependencyGenerator.kt index 31492343bbfd..629dba9fcdeb 100644 --- a/platform/build-scripts/product-dsl/src/ModuleDescriptorDependencyGenerator.kt +++ b/platform/build-scripts/product-dsl/src/ModuleDescriptorDependencyGenerator.kt @@ -49,7 +49,7 @@ internal suspend fun generateModuleDescriptorDependencies( ): DependencyGenerationResult = coroutineScope { val allModuleSets = communityModuleSets + coreModuleSets + ultimateModuleSets val embeddedModules = embeddedModulesDeferred?.await() ?: emptySet() - val modulesToProcess = collectModulesToProcess(allModuleSets, embeddedModules) + val modulesToProcess = collectModulesToProcess(allModuleSets) if (modulesToProcess.isEmpty()) { return@coroutineScope DependencyGenerationResult(emptyList()) } @@ -157,11 +157,14 @@ internal class ModuleDescriptorCache(private val moduleOutputProvider: ModuleOut * 1. Modules with includeDependencies=true * 2. Library modules (intellij.libraries.*) that are not embedded */ -private fun collectModulesToProcess(moduleSets: List, embeddedModules: Set): Set { +private fun collectModulesToProcess(moduleSets: List): Set { val result = mutableSetOf() for (set in moduleSets) { visitAllModules(set) { module -> - if (module.includeDependencies || module.name.startsWith(LIB_MODULE_PREFIX)) { + // todo enable for all on the next stage + if (module.includeDependencies || + module.name.startsWith(LIB_MODULE_PREFIX) || + module.name.startsWith("intellij.platform.settings.")) { result.add(module.name) } } diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt index 7c6921f85358..8712b910c9c3 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt @@ -78,10 +78,7 @@ import kotlin.io.path.invariantSeparatorsPathString private val JAR_NAME_WITH_VERSION_PATTERN = "(.*)-\\d+(?:\\.\\d+)*\\.jar*".toPattern() private val libsUsedInJps = setOf( - "netty-buffer", - "netty-codec-http", "netty-codec-protobuf", - "netty-handler-proxy", "Log4J", "slf4j-api", "slf4j-jdk14", diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt index cbdef16ca0ee..0f4fce6b5b20 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt @@ -126,6 +126,7 @@ object CommunityModuleSets { embeddedModule("intellij.libraries.netty.buffer") embeddedModule("intellij.libraries.netty.codec.compression") embeddedModule("intellij.libraries.netty.codec.http") + embeddedModule("intellij.libraries.netty.handler.proxy") embeddedModule("intellij.libraries.oro.matcher") embeddedModule("intellij.libraries.protobuf") embeddedModule("intellij.libraries.proxy.vole") diff --git a/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml b/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml index 2db39daa62c8..b9ff4614742f 100644 --- a/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml +++ b/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml @@ -67,6 +67,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml index fa5df978f013..b60dc9cb28e3 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml @@ -68,6 +68,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml index b21a20643729..24e55830d041 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml @@ -69,6 +69,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml index 3f8de8b3bc61..07f7caa64baf 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml @@ -10,6 +10,7 @@ + @@ -69,6 +70,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml index ce2542639d17..c19ca425357c 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml @@ -11,6 +11,7 @@ + @@ -70,6 +71,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml index 07ea901c9fbf..f91e19b1f79a 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml @@ -14,6 +14,7 @@ + @@ -73,6 +74,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml index 90d462d9c72c..8ef3422c5696 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml @@ -66,6 +66,7 @@ +