diff --git a/.idea/libraries/jgoodies_common.xml b/.idea/libraries/jgoodies_common.xml deleted file mode 100644 index 4a74a9ebb3ae..000000000000 --- a/.idea/libraries/jgoodies_common.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/jgoodies_forms.xml b/.idea/libraries/jgoodies_forms.xml deleted file mode 100644 index a0cab31eec1d..000000000000 --- a/.idea/libraries/jgoodies_forms.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - 26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0 - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 0f5700016232..e1bc5e92acc8 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -873,6 +873,8 @@ + + diff --git a/BUILD.bazel b/BUILD.bazel index fcbb8224c895..fea8547f39a0 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -220,7 +220,7 @@ jvm_library( "//plugins/completion-ml-ranking", "//plugins/stream-debugger-core:debugger-streams-core", "//plugins/stream-debugger:java-debugger-streams", - "@lib//:jgoodies-common", + "//libraries/jgoodies/common", "//plugins/editorconfig:editorconfig-plugin-main", "//plugins/sh/plugin:plugin-main", "//plugins/terminal/sh", @@ -424,7 +424,7 @@ jvm_library( "//plugins/completion-ml-ranking:completionMlRanking-tests_test_lib", "//plugins/stream-debugger-core:debugger-streams-core", "//plugins/stream-debugger:java-debugger-streams", - "@lib//:jgoodies-common", + "//libraries/jgoodies/common", "//plugins/testng_rt/tests:tests_test_lib", "//plugins/editorconfig:editorconfig-plugin-main", "//platform/workspace/storage/tests:tests_test_lib", diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 9e8831d551cd..b2ebc57e1570 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -413,6 +413,8 @@ libraries/jcip libraries/jediterm-core libraries/jediterm-ui libraries/jettison +libraries/jgoodies/common +libraries/jgoodies/forms libraries/jsonpath libraries/jsoup libraries/jsvg diff --git a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt index acef35c1bfc1..df57e6cc7ff4 100644 --- a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt +++ b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt @@ -47,6 +47,7 @@ suspend fun buildCommunityStandaloneJpsBuilder( "intellij.libraries.http.client", "intellij.libraries.cli.parser", "intellij.libraries.asm", + "intellij.libraries.jgoodies.forms", ).map { ModuleItem(moduleName = it, relativeOutputFile = "util.jar", reason = null) }) layout.withModule("intellij.platform.util.rt", "util_rt.jar") @@ -79,7 +80,6 @@ suspend fun buildCommunityStandaloneJpsBuilder( layout.withModule("intellij.groovy.constants.rt", "groovy-constants-rt.jar") layout.withModule("intellij.java.guiForms.jps", "java-guiForms-jps.jar") - layout.withModule("intellij.maven.jps", "maven-jps.jar") layout.withModule("intellij.java.aetherDependencyResolver", "aether-dependency-resolver.jar") layout.withModule("intellij.gradle.jps", "gradle-jps.jar") @@ -97,7 +97,6 @@ suspend fun buildCommunityStandaloneJpsBuilder( "OroMatcher", "protobuf", "Log4J", - "jgoodies-forms", "Eclipse", "netty-jps", "slf4j-api", @@ -132,7 +131,7 @@ suspend fun buildCommunityStandaloneJpsBuilder( platformLayout = null, moduleOutputPatcher = ModuleOutputPatcher(), dryRun = dryRun, - context = context + context = context, ) val targetFile = targetDir.resolve("standalone-jps-$buildNumber.zip") @@ -144,7 +143,8 @@ suspend fun buildCommunityStandaloneJpsBuilder( "intellij.platform.jps.model.tests", "intellij.platform.jps.model.serialization.tests" ), - context) + context = context, + ) zipWithCompression(targetFile = targetFile, dirs = mapOf(tempDir to "")) } diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index 7813839fd556..90a0d2af13b5 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -138,7 +138,7 @@ - + diff --git a/java/compiler/forms-compiler/BUILD.bazel b/java/compiler/forms-compiler/BUILD.bazel index a13c11699ed8..2f3864170d87 100644 --- a/java/compiler/forms-compiler/BUILD.bazel +++ b/java/compiler/forms-compiler/BUILD.bazel @@ -11,7 +11,7 @@ jvm_library( "//platform/util/jdom", "//platform/forms_rt:java-guiForms-rt", "//libraries/asm", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//java/compiler/instrumentation-util", "@lib//:jetbrains-annotations", ], @@ -28,7 +28,7 @@ jvm_library( "//platform/util/jdom", "//platform/forms_rt:java-guiForms-rt", "//libraries/asm", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//java/compiler/instrumentation-util", "//platform/util", "@lib//:jetbrains-annotations", diff --git a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml index 5594e0cabefa..23a6329e3383 100644 --- a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml +++ b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml @@ -11,7 +11,7 @@ - + diff --git a/java/plugin/plugin-content.yaml b/java/plugin/plugin-content.yaml index ed38379c843f..0670cd363234 100644 --- a/java/plugin/plugin-content.yaml +++ b/java/plugin/plugin-content.yaml @@ -88,11 +88,6 @@ files: - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2/jb-jdi-2.jar reason: withProjectLibrary -- name: lib/jgoodies-common.jar - library: jgoodies-common - files: - - name: $MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1/jgoodies-common-1.jar - reason: withProjectLibrary - name: lib/jps-builders-6.jar modules: - name: intellij.platform.jps.build.javac.rt diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel index b9f247ee9cb7..95b194d43047 100644 --- a/jps/jps-builders/BUILD.bazel +++ b/jps/jps-builders/BUILD.bazel @@ -23,7 +23,7 @@ jvm_library( "//libraries/asm", "//platform/util/jdom", "//platform/util/nanoxml", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "@lib//:protobuf", "//jps/model-api:model", "//jps/model-serialization", diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml index a11f78577c63..0ca526a1ef99 100644 --- a/jps/jps-builders/intellij.platform.jps.build.iml +++ b/jps/jps-builders/intellij.platform.jps.build.iml @@ -34,7 +34,7 @@ - + diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index c6bdc51ccd70..12ae07c4296c 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -3365,19 +3365,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "jgoodies-common", - jar = "@com_jgoodies-jgoodies-common-1_4_0_http//file", - source_jar = "@com_jgoodies-jgoodies-common-1_4_0-sources_http//file", - visibility = ["//visibility:public"] -) - -jvm_import( - name = "jgoodies-forms", - jar = "@com_jgoodies-forms-1_1-preview_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "jimfs", jar = "@com_google_jimfs-jimfs-1_3_0_http//file", @@ -5429,6 +5416,19 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "libraries-jgoodies-common-jgoodies-common", + jar = "@com_jgoodies-jgoodies-common-1_4_0_http//file", + source_jar = "@com_jgoodies-jgoodies-common-1_4_0-sources_http//file", + visibility = ["//visibility:public"] +) + +jvm_import( + name = "libraries-jgoodies-forms-jgoodies-forms", + jar = "@com_jgoodies-forms-1_1-preview_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "libraries-jsvg-jsvg", jar = "@com_github_weisj-jsvg-1_3_0-jb_8_http//file", diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index d98dffa07e40..b8b195abcf7a 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -5305,27 +5305,6 @@ http_file( downloaded_file_path = "mlapi-core-0.2.1-sources.jar" ) -http_file( - name = "com_jgoodies-jgoodies-common-1_4_0_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar", - sha256 = "efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc", - downloaded_file_path = "jgoodies-common-1.4.0.jar" -) - -http_file( - name = "com_jgoodies-jgoodies-common-1_4_0-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0-sources.jar", - sha256 = "c2231fc5ac6112407bb39c45db21cb52c76b553d29a3891317e149b8cf4db30b", - downloaded_file_path = "jgoodies-common-1.4.0-sources.jar" -) - -http_file( - name = "com_jgoodies-forms-1_1-preview_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar", - sha256 = "26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0", - downloaded_file_path = "forms-1.1-preview.jar" -) - http_file( name = "com_google_jimfs-jimfs-1_3_0_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/google/jimfs/jimfs/1.3.0/jimfs-1.3.0.jar", @@ -8112,6 +8091,27 @@ http_file( downloaded_file_path = "jettison-1.5.4-sources.jar" ) +http_file( + name = "com_jgoodies-jgoodies-common-1_4_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar", + sha256 = "efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc", + downloaded_file_path = "jgoodies-common-1.4.0.jar" +) + +http_file( + name = "com_jgoodies-jgoodies-common-1_4_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0-sources.jar", + sha256 = "c2231fc5ac6112407bb39c45db21cb52c76b553d29a3891317e149b8cf4db30b", + downloaded_file_path = "jgoodies-common-1.4.0-sources.jar" +) + +http_file( + name = "com_jgoodies-forms-1_1-preview_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar", + sha256 = "26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0", + downloaded_file_path = "forms-1.1-preview.jar" +) + http_file( name = "com_github_weisj-jsvg-1_3_0-jb_8_http", url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/github/weisj/jsvg/1.3.0-jb.8/jsvg-1.3.0-jb.8.jar", diff --git a/libraries/jgoodies/common/BUILD.bazel b/libraries/jgoodies/common/BUILD.bazel new file mode 100644 index 000000000000..e0072dcaf9ef --- /dev/null +++ b/libraries/jgoodies/common/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.jgoodies.common` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "common_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "common", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":common_resources"], + exports = ["@lib//:libraries-jgoodies-common-jgoodies-common"], + runtime_deps = ["@lib//:libraries-jgoodies-common-jgoodies-common"] +) +### auto-generated section `build intellij.libraries.jgoodies.common` end \ No newline at end of file diff --git a/libraries/jgoodies/common/intellij.libraries.jgoodies.common.iml b/libraries/jgoodies/common/intellij.libraries.jgoodies.common.iml new file mode 100644 index 000000000000..eb27313ce2cb --- /dev/null +++ b/libraries/jgoodies/common/intellij.libraries.jgoodies.common.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/jgoodies/common/module-content.yaml b/libraries/jgoodies/common/module-content.yaml new file mode 100644 index 000000000000..1e07786555b7 --- /dev/null +++ b/libraries/jgoodies/common/module-content.yaml @@ -0,0 +1,6 @@ +- name: dist.all/lib/intellij.libraries.jgoodies.common.jar + modules: + - name: intellij.libraries.jgoodies.common + libraries: + jgoodies-common: + - name: $MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1/jgoodies-common-1.jar \ No newline at end of file diff --git a/libraries/jgoodies/common/resources/intellij.libraries.jgoodies.common.xml b/libraries/jgoodies/common/resources/intellij.libraries.jgoodies.common.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/jgoodies/common/resources/intellij.libraries.jgoodies.common.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/jgoodies/forms/BUILD.bazel b/libraries/jgoodies/forms/BUILD.bazel new file mode 100644 index 000000000000..a6e33319cace --- /dev/null +++ b/libraries/jgoodies/forms/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.jgoodies.forms` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "forms_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "forms", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":forms_resources"], + exports = ["@lib//:libraries-jgoodies-forms-jgoodies-forms"], + runtime_deps = ["@lib//:libraries-jgoodies-forms-jgoodies-forms"] +) +### auto-generated section `build intellij.libraries.jgoodies.forms` end \ No newline at end of file diff --git a/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml b/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml new file mode 100644 index 000000000000..823acab75f71 --- /dev/null +++ b/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + 26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0 + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/jgoodies/forms/module-content.yaml b/libraries/jgoodies/forms/module-content.yaml new file mode 100644 index 000000000000..016c314ba310 --- /dev/null +++ b/libraries/jgoodies/forms/module-content.yaml @@ -0,0 +1,6 @@ +- name: dist.all/lib/intellij.libraries.jgoodies.forms.jar + modules: + - name: intellij.libraries.jgoodies.forms + libraries: + jgoodies-forms: + - name: $MAVEN_REPOSITORY$/com/jgoodies/forms/1/forms-1.jar \ No newline at end of file diff --git a/libraries/jgoodies/forms/resources/intellij.libraries.jgoodies.forms.xml b/libraries/jgoodies/forms/resources/intellij.libraries.jgoodies.forms.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/jgoodies/forms/resources/intellij.libraries.jgoodies.forms.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt index beae7bba16dd..0bd8770f8664 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt @@ -80,8 +80,6 @@ object JavaPluginLayout { spec.withModuleLibrary("debugger-agent", "intellij.java.debugger.agent.holder", "rt") spec.withProjectLibrary("Eclipse", "ecj") - // used in JPS - do not use uber jar - spec.withProjectLibrary("jgoodies-common") spec.withProjectLibrary("jps-javac-extension") spec.withProjectLibrary("kotlin-metadata") // gpl-cpe license - do not use uber jar 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 f1df5ab80940..323855dea8e8 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 @@ -88,8 +88,6 @@ private val libsUsedInJps = setOf( // see getBuildProcessApplicationClasspath - used in JPS "jna", "maven-resolver-provider", - "jgoodies-forms", - "jgoodies-common", // see ArtifactRepositoryManager.getClassesFromDependencies "plexus-utils", "kotlin-stdlib", @@ -101,13 +99,6 @@ private val presignedLibNames = setOf( private fun isLibPreSigned(library: JpsLibrary) = presignedLibNames.contains(library.name) -private val notImportantKotlinLibs = setOf( - "kotlinx-collections-immutable", - "kotlinx-coroutines-guava", - "kotlinx-datetime-jvm", - "kotlinx-html-jvm", -) - const val rdJarName: String = "rd.jar" // must be sorted @@ -121,7 +112,7 @@ private val predefinedMergeRules = listOf (name.startsWith("License") || name.startsWith("jetbrains.codeWithMe.lobby.server.")) && filter.isBackendProjectLibrary(name) }, PRODUCT_JAR to { name, filter -> (name.startsWith("License") || name.startsWith("jetbrains.codeWithMe.lobby.server.")) && !filter.isBackendProjectLibrary(name) }, // see ClassPathUtil.getUtilClassPath - UTIL_8_JAR to { it, _ -> libsUsedInJps.contains(it) || (it.startsWith("kotlinx-") && !notImportantKotlinLibs.contains(it)) }, + UTIL_8_JAR to { it, _ -> libsUsedInJps.contains(it) || (it.startsWith("kotlinx-")) }, // used in an external process - see `ConsoleProcessListFetcher.getConsoleProcessCount` UTIL_JAR to { it, _ -> it == "pty4j" || it == "jvm-native-trusted-roots" }, 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 207d84fc3df9..697db10628f1 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 @@ -143,6 +143,8 @@ object CommunityModuleSets { embeddedModule("intellij.libraries.jcef") embeddedModule("intellij.libraries.jediterm.core") embeddedModule("intellij.libraries.jediterm.ui") + embeddedModule("intellij.libraries.jgoodies.common") + embeddedModule("intellij.libraries.jgoodies.forms") embeddedModule("intellij.libraries.miglayout.swing") embeddedModule("intellij.libraries.pty4j") embeddedModule("intellij.libraries.sshj") diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel index 1ac96f3df097..e75153515dbb 100644 --- a/platform/platform-impl/BUILD.bazel +++ b/platform/platform-impl/BUILD.bazel @@ -172,8 +172,8 @@ jvm_library( "@lib//:org-codehaus-groovy-groovy-templates", "@lib//:org-codehaus-groovy-groovy-xml", "@lib//:protobuf", - "@lib//:jgoodies-common", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/common", + "//libraries/jgoodies/forms", "//libraries/bouncy-castle-provider", "//platform/platform-resources:resources", "//platform/platform-resources-en:resources-en", diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml index a7417088b7a0..cc7f5f1cefe7 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.iml @@ -110,8 +110,8 @@ - - + + diff --git a/platform/platform-impl/resources/intellij.platform.ide.impl.xml b/platform/platform-impl/resources/intellij.platform.ide.impl.xml index c8d938eafc82..661fcc2e4fa3 100644 --- a/platform/platform-impl/resources/intellij.platform.ide.impl.xml +++ b/platform/platform-impl/resources/intellij.platform.ide.impl.xml @@ -23,6 +23,8 @@ + + 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 909e6aba4ecc..2b04ccd04b1e 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 @@ -116,6 +116,8 @@ + + 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 c10f9c51e7be..e63b938a6dc1 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 @@ -117,6 +117,8 @@ + + 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 7a288e41289d..c6cf63704b2a 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 @@ -118,6 +118,8 @@ + + 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 a2b21372f5c1..b0892ef84976 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml @@ -119,6 +119,8 @@ + + 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 927eeef0408c..f075b6a424bd 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 @@ -122,6 +122,8 @@ + + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.ide.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.ide.xml index df040dca5150..74b66eca45a0 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.ide.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.ide.xml @@ -7,6 +7,8 @@ + + diff --git a/platform/vcs-impl/BUILD.bazel b/platform/vcs-impl/BUILD.bazel index 0a830042820a..591bb43894e6 100644 --- a/platform/vcs-impl/BUILD.bazel +++ b/platform/vcs-impl/BUILD.bazel @@ -73,7 +73,7 @@ jvm_library( "//libraries/microba", "//platform/kernel/shared:kernel", "//platform/vcs-impl/shared", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//platform/observable", "//platform/platform-impl/concurrency", "//platform/project/shared:project", @@ -159,7 +159,7 @@ jvm_library( "//platform/kernel/shared:kernel", "//platform/vcs-impl/shared", "//platform/vcs-impl/shared:shared_test_lib", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//platform/observable", "//platform/platform-impl/concurrency", "//platform/project/shared:project", diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml index f65095f63bc1..5c4d5be9057f 100644 --- a/platform/vcs-impl/intellij.platform.vcs.impl.iml +++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml @@ -97,7 +97,7 @@ - + diff --git a/plugins/maven/BUILD.bazel b/plugins/maven/BUILD.bazel index 4e291d713bb5..eb8765464353 100644 --- a/plugins/maven/BUILD.bazel +++ b/plugins/maven/BUILD.bazel @@ -54,7 +54,7 @@ jvm_library( "//java/execution/impl", "//java/debugger/impl", "//java/idea-ui:ui", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//libraries/gson", "//plugins/groovy", "//libraries/guava", diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml index 5b6ca2ebf0ff..d7643e6eecd3 100644 --- a/plugins/maven/intellij.maven.iml +++ b/plugins/maven/intellij.maven.iml @@ -41,7 +41,7 @@ - + diff --git a/plugins/testng/BUILD.bazel b/plugins/testng/BUILD.bazel index b6dfe50311d0..82d9bbfc2bed 100644 --- a/plugins/testng/BUILD.bazel +++ b/plugins/testng/BUILD.bazel @@ -60,7 +60,7 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", "//xml/xml-psi-api:psi", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//platform/execution", ] ) @@ -115,7 +115,7 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", "//xml/xml-psi-api:psi", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//platform/execution", ] ) diff --git a/plugins/testng/intellij.testng.iml b/plugins/testng/intellij.testng.iml index c41b2a4e0d9e..0f56763d3f35 100644 --- a/plugins/testng/intellij.testng.iml +++ b/plugins/testng/intellij.testng.iml @@ -47,7 +47,7 @@ - + diff --git a/plugins/ui-designer/BUILD.bazel b/plugins/ui-designer/BUILD.bazel index e900966df7cb..1b7e74052cee 100644 --- a/plugins/ui-designer/BUILD.bazel +++ b/plugins/ui-designer/BUILD.bazel @@ -52,7 +52,7 @@ jvm_library( "//platform/editor-ui-ex:editor-ex", "//java/compiler/impl", "//platform/icons", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//libraries/asm", "//plugins/java-i18n", "//java/idea-ui:ui", @@ -122,7 +122,7 @@ jvm_library( "//platform/editor-ui-ex:editor-ex", "//java/compiler/impl", "//platform/icons", - "@lib//:jgoodies-forms", + "//libraries/jgoodies/forms", "//libraries/asm", "//plugins/java-i18n", "//plugins/java-i18n:java-i18n_test_lib", diff --git a/plugins/ui-designer/intellij.java.guiForms.designer.iml b/plugins/ui-designer/intellij.java.guiForms.designer.iml index 670f22140d40..c577f39f28a3 100644 --- a/plugins/ui-designer/intellij.java.guiForms.designer.iml +++ b/plugins/ui-designer/intellij.java.guiForms.designer.iml @@ -40,7 +40,7 @@ - +