diff --git a/java/compiler/javac2/BUILD.bazel b/java/compiler/javac2/BUILD.bazel index 82c03783988d..df3aa37d446d 100644 --- a/java/compiler/javac2/BUILD.bazel +++ b/java/compiler/javac2/BUILD.bazel @@ -8,7 +8,7 @@ jvm_library( srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), kotlinc_opts = "@community//:k8", deps = [ - "@lib//ant/lib:ant-antlr-provided", + "@lib//ant/lib:ant-provided", "//java/compiler/forms-compiler:java-guiForms-compiler", "//platform/forms_rt:java-guiForms-rt", "//libraries/asm", diff --git a/jps/antLayout/BUILD.bazel b/jps/antLayout/BUILD.bazel index 609878bc4142..fbabe11a2771 100644 --- a/jps/antLayout/BUILD.bazel +++ b/jps/antLayout/BUILD.bazel @@ -14,6 +14,6 @@ jvm_library( srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), resources = [":tools-jps-antTasks_resources"], kotlinc_opts = "@community//:k8", - deps = ["@lib//ant/lib:ant-antlr-provided"] + deps = ["@lib//ant/lib:ant-provided"] ) ### auto-generated section `build intellij.tools.jps.antTasks` end \ No newline at end of file diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel index ea6023cac712..558adec7d04e 100644 --- a/jps/jps-builders/BUILD.bazel +++ b/jps/jps-builders/BUILD.bazel @@ -92,7 +92,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/compiler/instrumentation-util", - "@lib//:ecj-4-25", + "@lib//:eclipse", "@lib//:kotlin-stdlib", "//libraries/asm", "//jps/model-impl", diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index efa974d6f3f8..2fdd982df2ea 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -50,36 +50,36 @@ kt_compiler_plugin( load("@rules_java//java:defs.bzl", "java_import", "java_library") java_import( - name = "commons-httpclient-3-1-patched", - jars = ["commons-httpclient-3.1-patched.jar"], - visibility = ["//visibility:public"] -) - -java_import( - name = "eawtstub", - jars = ["eawtstub.jar"], - visibility = ["//visibility:public"] -) - -java_library( - name = "eawtstub-provided", - exports = [":eawtstub"], - neverlink = True, - visibility = ["//visibility:public"] -) - -java_import( - name = "ecj-4-25", + name = "eclipse", jars = ["ecj-4.25.jar"], visibility = ["//visibility:public"] ) java_library( - name = "ecj-4-25-provided", - exports = [":ecj-4-25"], + name = "eclipse-provided", + exports = [":eclipse"], neverlink = True, visibility = ["//visibility:public"] ) + +java_import( + name = "mac", + jars = ["eawtstub.jar"], + visibility = ["//visibility:public"] +) + +java_library( + name = "mac-provided", + exports = [":mac"], + neverlink = True, + visibility = ["//visibility:public"] +) + +java_import( + name = "tasks-compatibility-http-client-3-1", + jars = ["commons-httpclient-3.1-patched.jar"], + visibility = ["//visibility:public"] +) ### auto-generated section `local-libs` end ### auto-generated section `maven libs` start diff --git a/lib/ant/lib/BUILD.bazel b/lib/ant/lib/BUILD.bazel index c104adcabcfc..9a3c21e3694f 100644 --- a/lib/ant/lib/BUILD.bazel +++ b/lib/ant/lib/BUILD.bazel @@ -2,7 +2,7 @@ load("@rules_java//java:defs.bzl", "java_import", "java_library") java_import( - name = "ant-antlr", + name = "ant", jars = [ "ant-antlr.jar", "ant-apache-bcel.jar", @@ -35,8 +35,8 @@ java_import( ) java_library( - name = "ant-antlr-provided", - exports = [":ant-antlr"], + name = "ant-provided", + exports = [":ant"], neverlink = True, visibility = ["//visibility:public"] ) diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel index 811d10fbf885..ec7de716ea73 100644 --- a/platform/platform-impl/BUILD.bazel +++ b/platform/platform-impl/BUILD.bazel @@ -32,7 +32,7 @@ jvm_library( resources = [":ide-impl_resources"], javac_opts = ":custom-javac-options", deps = [ - "@lib//:eawtstub-provided", + "@lib//:mac-provided", "//platform/analysis-api:analysis", "//platform/code-style-api:codeStyle", "//platform/core-api:core", @@ -194,7 +194,7 @@ jvm_library( javac_opts = ":custom-javac-options", associates = [":ide-impl"], deps = [ - "@lib//:eawtstub-provided", + "@lib//:mac-provided", "//platform/analysis-api:analysis", "//platform/code-style-api:codeStyle", "//platform/core-api:core", diff --git a/platform/util/BUILD.bazel b/platform/util/BUILD.bazel index 8712a92438b5..5a89f52896a2 100644 --- a/platform/util/BUILD.bazel +++ b/platform/util/BUILD.bazel @@ -177,7 +177,7 @@ jvm_library( resources = [":util-ui_resources"], javac_opts = ":custom-javac-options", deps = [ - "@lib//:eawtstub-provided", + "@lib//:mac-provided", "//platform/util", "//libraries/imgscalr", "@lib//:jna", diff --git a/plugins/ant/BUILD.bazel b/plugins/ant/BUILD.bazel index af18638146f0..b7f4d40b0fb1 100644 --- a/plugins/ant/BUILD.bazel +++ b/plugins/ant/BUILD.bazel @@ -15,7 +15,7 @@ jvm_library( resources = [":ant_resources"], deps = [ "//java/openapi:java", - "@lib//ant/lib:ant-antlr", + "@lib//ant/lib:ant", "//platform/analysis-api:analysis", "//xml/xml-analysis-api:analysis", "//platform/core-api:core", @@ -70,7 +70,7 @@ jvm_library( "//java/openapi:java", "//java/testFramework", "@lib//:junit4", - "@lib//ant/lib:ant-antlr", + "@lib//ant/lib:ant", "//platform/analysis-api:analysis", "//xml/xml-analysis-api:analysis", "//platform/core-api:core", diff --git a/plugins/gradle/java/BUILD.bazel b/plugins/gradle/java/BUILD.bazel index 38181f8641ba..ff1117a3c529 100644 --- a/plugins/gradle/java/BUILD.bazel +++ b/plugins/gradle/java/BUILD.bazel @@ -79,7 +79,7 @@ jvm_library( "//platform/execution", ], exports = ["//plugins/gradle:gradle-common"], - runtime_deps = ["@lib//ant/lib:ant-antlr"] + runtime_deps = ["@lib//ant/lib:ant"] ) ### auto-generated section `build intellij.gradle.java` end diff --git a/plugins/groovy/jps-plugin/BUILD.bazel b/plugins/groovy/jps-plugin/BUILD.bazel index 7e964f78e665..dd1958e2f087 100644 --- a/plugins/groovy/jps-plugin/BUILD.bazel +++ b/plugins/groovy/jps-plugin/BUILD.bazel @@ -23,7 +23,7 @@ jvm_library( "//jps/model-serialization", "//jps/model-impl", "//java/compiler/instrumentation-util", - "@lib//:ecj-4-25-provided", + "@lib//:eclipse-provided", "//platform/util-class-loader:util-classLoader", "//libraries/asm", "//platform/util/jdom", diff --git a/plugins/jshell/execution/BUILD.bazel b/plugins/jshell/execution/BUILD.bazel index 4f23ad9b9e32..3c731c696978 100644 --- a/plugins/jshell/execution/BUILD.bazel +++ b/plugins/jshell/execution/BUILD.bazel @@ -2,7 +2,7 @@ load("@rules_java//java:defs.bzl", "java_import") java_import( - name = "jshell-frontend", + name = "java-jshell-execution-jshell-frontend", jars = ["jshell-frontend.jar"], visibility = ["//visibility:public"] ) @@ -15,6 +15,6 @@ jvm_library( name = "execution", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - runtime_deps = ["//plugins/jshell/execution:jshell-frontend"] + runtime_deps = ["//plugins/jshell/execution:java-jshell-execution-jshell-frontend"] ) ### auto-generated section `build intellij.java.jshell.execution` end \ No newline at end of file diff --git a/plugins/tasks/tasks-compatibility/BUILD.bazel b/plugins/tasks/tasks-compatibility/BUILD.bazel index 1239878c6788..c3e27929f368 100644 --- a/plugins/tasks/tasks-compatibility/BUILD.bazel +++ b/plugins/tasks/tasks-compatibility/BUILD.bazel @@ -10,8 +10,8 @@ jvm_library( "//platform/platform-api:ide", "//platform/projectModel-api:projectModel", "//plugins/tasks/tasks-api:tasks", - "@lib//:commons-httpclient-3-1-patched", + "@lib//:tasks-compatibility-http-client-3-1", ], - exports = ["@lib//:commons-httpclient-3-1-patched"] + exports = ["@lib//:tasks-compatibility-http-client-3-1"] ) ### auto-generated section `build intellij.tasks.compatibility` end \ No newline at end of file diff --git a/plugins/tasks/tasks-core/BUILD.bazel b/plugins/tasks/tasks-core/BUILD.bazel index 6cec0716bd1b..dea1c89d5401 100644 --- a/plugins/tasks/tasks-core/BUILD.bazel +++ b/plugins/tasks/tasks-core/BUILD.bazel @@ -23,7 +23,7 @@ jvm_library( "//platform/vcs-api:vcs", "//platform/lang-impl", "//platform/vcs-impl", - "//plugins/tasks/tasks-core/lib:axis-1-4", + "//plugins/tasks/tasks-core/lib:tasks-core-axis-1-4", "//libraries/gson", "//xml/impl", "//platform/core-api:core", @@ -47,6 +47,6 @@ jvm_library( "//platform/polySymbols", "//platform/forms_rt:java-guiForms-rt", ], - exports = ["//plugins/tasks/tasks-core/lib:axis-1-4"] + exports = ["//plugins/tasks/tasks-core/lib:tasks-core-axis-1-4"] ) ### auto-generated section `build intellij.tasks.core` end \ No newline at end of file diff --git a/plugins/tasks/tasks-core/lib/BUILD.bazel b/plugins/tasks/tasks-core/lib/BUILD.bazel index ed841b3a563f..cdfe1773f875 100644 --- a/plugins/tasks/tasks-core/lib/BUILD.bazel +++ b/plugins/tasks/tasks-core/lib/BUILD.bazel @@ -2,7 +2,7 @@ load("@rules_java//java:defs.bzl", "java_import") java_import( - name = "axis-1-4", + name = "tasks-core-axis-1-4", jars = [ "axis-1.4.jar", "axis-jaxrpc-1.4.jar", diff --git a/plugins/webp/BUILD.bazel b/plugins/webp/BUILD.bazel index beb243d27519..fa4bd7003c3a 100644 --- a/plugins/webp/BUILD.bazel +++ b/plugins/webp/BUILD.bazel @@ -18,7 +18,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/platform-impl:ide-impl", "//platform/lang-impl", - "//plugins/webp/lib:libwebp", + "//plugins/webp/lib:webp-libwebp", ] ) ### auto-generated section `build intellij.webp` end \ No newline at end of file diff --git a/plugins/webp/lib/BUILD.bazel b/plugins/webp/lib/BUILD.bazel index f5454dbf7072..9aa71a101852 100644 --- a/plugins/webp/lib/BUILD.bazel +++ b/plugins/webp/lib/BUILD.bazel @@ -2,7 +2,7 @@ load("@rules_java//java:defs.bzl", "java_import") java_import( - name = "libwebp", + name = "webp-libwebp", jars = ["libwebp.jar"], visibility = ["//visibility:public"] ) diff --git a/plugins/xslt-debugger/engine/BUILD.bazel b/plugins/xslt-debugger/engine/BUILD.bazel index d3320df7a96a..ee70348e526c 100644 --- a/plugins/xslt-debugger/engine/BUILD.bazel +++ b/plugins/xslt-debugger/engine/BUILD.bazel @@ -9,7 +9,7 @@ jvm_library( kotlinc_opts = "@community//:k8", deps = [ "//plugins/xpath/xslt-rt:rt", - "//plugins/xslt-debugger/engine/lib:rmi-stubs", + "//plugins/xslt-debugger/engine/lib:xslt-debugger-rt-_r_m_i_stubs", ] ) ### auto-generated section `build intellij.xslt.debugger.rt` end \ No newline at end of file diff --git a/plugins/xslt-debugger/engine/impl/BUILD.bazel b/plugins/xslt-debugger/engine/impl/BUILD.bazel index 6a315ad34ddb..03e1da1eaf89 100644 --- a/plugins/xslt-debugger/engine/impl/BUILD.bazel +++ b/plugins/xslt-debugger/engine/impl/BUILD.bazel @@ -10,8 +10,8 @@ jvm_library( deps = [ "//plugins/xpath/xslt-rt:rt", "//plugins/xslt-debugger/engine:xslt-debugger-rt", - "//plugins/xslt-debugger/engine/impl/lib:saxon9he", - "//plugins/xslt-debugger/engine/impl/lib:saxon", + "//plugins/xslt-debugger/engine/impl/lib:xslt-debugger-impl-rt-_saxon-9_h_e", + "//plugins/xslt-debugger/engine/impl/lib:xslt-debugger-impl-rt-_saxon-6-5-5", "@lib//:xslt-debugger-impl-rt-_xalan-2-7-3", "@lib//:xslt-debugger-impl-rt-_serializer-2-7-3", ] @@ -26,8 +26,8 @@ jvm_library( deps = [ "//plugins/xpath/xslt-rt:rt", "//plugins/xslt-debugger/engine:xslt-debugger-rt", - "//plugins/xslt-debugger/engine/impl/lib:saxon9he", - "//plugins/xslt-debugger/engine/impl/lib:saxon", + "//plugins/xslt-debugger/engine/impl/lib:xslt-debugger-impl-rt-_saxon-9_h_e", + "//plugins/xslt-debugger/engine/impl/lib:xslt-debugger-impl-rt-_saxon-6-5-5", "@lib//:xslt-debugger-impl-rt-_xalan-2-7-3", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", diff --git a/plugins/xslt-debugger/engine/impl/lib/BUILD.bazel b/plugins/xslt-debugger/engine/impl/lib/BUILD.bazel index 1bdc8800145e..62b49160a0df 100644 --- a/plugins/xslt-debugger/engine/impl/lib/BUILD.bazel +++ b/plugins/xslt-debugger/engine/impl/lib/BUILD.bazel @@ -2,13 +2,13 @@ load("@rules_java//java:defs.bzl", "java_import") java_import( - name = "saxon", + name = "xslt-debugger-impl-rt-_saxon-6-5-5", jars = ["saxon.jar"], visibility = ["//visibility:public"] ) java_import( - name = "saxon9he", + name = "xslt-debugger-impl-rt-_saxon-9_h_e", jars = ["saxon9he.jar"], visibility = ["//visibility:public"] ) diff --git a/plugins/xslt-debugger/engine/lib/BUILD.bazel b/plugins/xslt-debugger/engine/lib/BUILD.bazel index 050afd916743..4d340b52a722 100644 --- a/plugins/xslt-debugger/engine/lib/BUILD.bazel +++ b/plugins/xslt-debugger/engine/lib/BUILD.bazel @@ -2,7 +2,7 @@ load("@rules_java//java:defs.bzl", "java_import") java_import( - name = "rmi-stubs", + name = "xslt-debugger-rt-_r_m_i_stubs", jars = ["rmi-stubs.jar"], visibility = ["//visibility:public"] ) diff --git a/python/BUILD.bazel b/python/BUILD.bazel index a089e8866264..2de2ab76785b 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -243,7 +243,7 @@ jvm_library( "//libraries/netty/codec-http:libraries-netty-codec-http", "//libraries/jsoup", "//libraries/javax/annotation", - "@lib//ant/lib:ant-antlr-provided", + "@lib//ant/lib:ant-provided", "//python/python-psi-impl:psi-impl", "//python/python-sdk:sdk", "//python/python-sdk-ui:sdk-ui", @@ -607,7 +607,7 @@ jvm_library( runtime_deps = [ ":python-helpers-tests", "//python:python-helpers", - "@lib//ant/lib:ant-antlr", + "@lib//ant/lib:ant", "@lib//:kotlin-stdlib", ] ) diff --git a/python/tools/BUILD.bazel b/python/tools/BUILD.bazel index 9b8a6a98b32d..45147b85e2c9 100644 --- a/python/tools/BUILD.bazel +++ b/python/tools/BUILD.bazel @@ -24,7 +24,7 @@ jvm_library( "//libraries/guava", "//python/python-sdk:sdk", "@lib//:kotlin-script-runtime", - "@lib//ant/lib:ant-antlr-provided", + "@lib//ant/lib:ant-provided", "//python/testFramework", ], runtime_deps = [ diff --git a/xml/relaxng/BUILD.bazel b/xml/relaxng/BUILD.bazel index 0bbee8e23d44..63dde1c4cf9c 100644 --- a/xml/relaxng/BUILD.bazel +++ b/xml/relaxng/BUILD.bazel @@ -27,9 +27,9 @@ jvm_library( "//xml/dom-openapi:dom", "//platform/platform-impl:ide-impl", "//platform/lang-impl", - "//xml/relaxng/lib:rngom-20051226-patched", + "//xml/relaxng/lib:relaxng-rngom-20051226-patched", "@lib//:relaxng-isorelax", - "//xml/relaxng/lib:trang-core", + "//xml/relaxng/lib:relaxng-trang-core", "@lib//:relaxng-jing", "//platform/util/nanoxml", "//libraries/fastutil", @@ -66,9 +66,9 @@ jvm_library( "//platform/lang-impl", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", - "//xml/relaxng/lib:rngom-20051226-patched", + "//xml/relaxng/lib:relaxng-rngom-20051226-patched", "@lib//:relaxng-isorelax", - "//xml/relaxng/lib:trang-core", + "//xml/relaxng/lib:relaxng-trang-core", "@lib//:relaxng-jing", "//platform/util/nanoxml", "//libraries/fastutil", diff --git a/xml/relaxng/lib/BUILD.bazel b/xml/relaxng/lib/BUILD.bazel index 10c54d2deac1..6d5d73fdd5f5 100644 --- a/xml/relaxng/lib/BUILD.bazel +++ b/xml/relaxng/lib/BUILD.bazel @@ -2,13 +2,13 @@ load("@rules_java//java:defs.bzl", "java_import") java_import( - name = "rngom-20051226-patched", + name = "relaxng-rngom-20051226-patched", jars = ["rngom-20051226-patched.jar"], visibility = ["//visibility:public"] ) java_import( - name = "trang-core", + name = "relaxng-trang-core", jars = ["trang-core.jar"], visibility = ["//visibility:public"] )