From 5618f0cf0a69e1e4ed42a2706d56986455dec052 Mon Sep 17 00:00:00 2001
From: Ilia Kirianovskii <Ilia.Kirianovskii@jetbrains.com>
Date: Tue, 14 Oct 2025 16:22:57 +0200
Subject: [PATCH] [testFramework] Add intellij.libraries.junit5.vintage (not
 JUnit5Vintage library) to dependencies in intellij.tools.testsBootstrap
 module (IJPL-116621)

Also adds intellij.libraries.junit5.vintage module.

GitOrigin-RevId: 437e895b730e777cbe70c2c78a05bc68a10fd196
---
 .idea/modules.xml                             |  1 +
 build/bazel-generated-file-list.txt           |  1 +
 lib/BUILD.bazel                               |  7 ------
 libraries/junit5-vintage/BUILD.bazel          | 22 +++++++++++++++++++
 .../intellij.libraries.junit5.vintage.iml     | 14 ++++++++++++
 .../intellij.libraries.junit5.vintage.xml     |  6 +++++
 platform/testFramework/bootstrap/BUILD.bazel  |  9 ++++++--
 .../intellij.tools.testsBootstrap.iml         |  2 +-
 .../intellij.tools.testsBootstrap.xml         |  1 +
 9 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 libraries/junit5-vintage/BUILD.bazel
 create mode 100644 libraries/junit5-vintage/intellij.libraries.junit5.vintage.iml
 create mode 100644 libraries/junit5-vintage/resources/intellij.libraries.junit5.vintage.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index fa144c3f6d53..cdc43c7ecbb7 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -864,6 +864,7 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/junit5-launcher/intellij.libraries.junit5.launcher.iml" filepath="$PROJECT_DIR$/libraries/junit5-launcher/intellij.libraries.junit5.launcher.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit5-params/intellij.libraries.junit5.params.iml" filepath="$PROJECT_DIR$/libraries/junit5-params/intellij.libraries.junit5.params.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit5-pioneer/intellij.libraries.junit5.pioneer.iml" filepath="$PROJECT_DIR$/libraries/junit5-pioneer/intellij.libraries.junit5.pioneer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/junit5-vintage/intellij.libraries.junit5.vintage.iml" filepath="$PROJECT_DIR$/libraries/junit5-vintage/intellij.libraries.junit5.vintage.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jvm-native-trusted-roots/intellij.libraries.jvm.native.trusted.roots.iml" filepath="$PROJECT_DIR$/libraries/jvm-native-trusted-roots/intellij.libraries.jvm.native.trusted.roots.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jzlib/intellij.libraries.jzlib.iml" filepath="$PROJECT_DIR$/libraries/jzlib/intellij.libraries.jzlib.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/kotlin/reflect/intellij.libraries.kotlin.reflect.iml" filepath="$PROJECT_DIR$/libraries/kotlin/reflect/intellij.libraries.kotlin.reflect.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 8f1d4e191cff..799c70df5b61 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -413,6 +413,7 @@ libraries/junit5
 libraries/junit5-launcher
 libraries/junit5-params
 libraries/junit5-pioneer
+libraries/junit5-vintage
 libraries/jvm-native-trusted-roots
 libraries/jzlib
 libraries/kotlin/reflect
diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel
index 560f6878643b..59704f2a5acf 100644
--- a/lib/BUILD.bazel
+++ b/lib/BUILD.bazel
@@ -3629,13 +3629,6 @@ jvm_import(
   visibility = ["//visibility:public"]
 )
 
-java_library(
-  name = "junit5Vintage-provided",
-  exports = [":junit5Vintage"],
-  neverlink = True,
-  visibility = ["//visibility:public"]
-)
-
 java_library(
   name = "junit6",
   exports = [
diff --git a/libraries/junit5-vintage/BUILD.bazel b/libraries/junit5-vintage/BUILD.bazel
new file mode 100644
index 000000000000..5166c89eac7b
--- /dev/null
+++ b/libraries/junit5-vintage/BUILD.bazel
@@ -0,0 +1,22 @@
+### auto-generated section `build intellij.libraries.junit5.vintage` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "junit5-vintage_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "junit5-vintage",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":junit5-vintage_resources"],
+  exports = ["@lib//:junit5Vintage"],
+  runtime_deps = [
+    "@lib//:junit5Vintage",
+    "//libraries/junit4",
+    "//libraries/junit5-launcher",
+  ]
+)
+### auto-generated section `build intellij.libraries.junit5.vintage` end
\ No newline at end of file
diff --git a/libraries/junit5-vintage/intellij.libraries.junit5.vintage.iml b/libraries/junit5-vintage/intellij.libraries.junit5.vintage.iml
new file mode 100644
index 000000000000..5a9890fc3e58
--- /dev/null
+++ b/libraries/junit5-vintage/intellij.libraries.junit5.vintage.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" 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="JUnit5Vintage" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.junit4" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.libraries.junit5.launcher" scope="RUNTIME" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/libraries/junit5-vintage/resources/intellij.libraries.junit5.vintage.xml b/libraries/junit5-vintage/resources/intellij.libraries.junit5.vintage.xml
new file mode 100644
index 000000000000..b7e2a3955bb8
--- /dev/null
+++ b/libraries/junit5-vintage/resources/intellij.libraries.junit5.vintage.xml
@@ -0,0 +1,6 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.libraries.junit4"/>
+    <module name="intellij.libraries.junit5.launcher"/>
+  </dependencies>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/testFramework/bootstrap/BUILD.bazel b/platform/testFramework/bootstrap/BUILD.bazel
index cb69aff06f9a..255f48dfb097 100644
--- a/platform/testFramework/bootstrap/BUILD.bazel
+++ b/platform/testFramework/bootstrap/BUILD.bazel
@@ -1,5 +1,5 @@
 ### auto-generated section `build intellij.tools.testsBootstrap` start
-load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_provided_library", "resourcegroup")
 
 resourcegroup(
   name = "tools-testsBootstrap_resources",
@@ -7,6 +7,11 @@ resourcegroup(
   strip_prefix = "resources"
 )
 
+jvm_provided_library(
+  name = "libraries_junit5-vintage_provided",
+  lib = "//libraries/junit5-vintage"
+)
+
 jvm_library(
   name = "tools-testsBootstrap",
   module_name = "intellij.tools.testsBootstrap",
@@ -18,11 +23,11 @@ jvm_library(
     "@lib//:hamcrest",
     "@lib//:junit5Launcher-provided",
     "@lib//:junit5-provided",
-    "@lib//:junit5Vintage-provided",
     "@lib//:tc_service_messages",
     "@lib//:junit5Jupiter-provided",
     "@lib//:opentest4j",
     "//platform/core-nio-fs",
+    ":libraries_junit5-vintage_provided",
   ],
   runtime_deps = ["//platform/boot"]
 )
diff --git a/platform/testFramework/bootstrap/intellij.tools.testsBootstrap.iml b/platform/testFramework/bootstrap/intellij.tools.testsBootstrap.iml
index ab73b4535f1a..65cb2492b578 100644
--- a/platform/testFramework/bootstrap/intellij.tools.testsBootstrap.iml
+++ b/platform/testFramework/bootstrap/intellij.tools.testsBootstrap.iml
@@ -13,7 +13,7 @@
     <orderEntry type="library" name="hamcrest" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="JUnit5Launcher" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="JUnit5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="JUnit5Vintage" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.junit5.vintage" scope="PROVIDED" />
     <orderEntry type="library" name="tcServiceMessages" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="JUnit5Jupiter" level="project" />
     <orderEntry type="library" name="opentest4j" level="project" />
diff --git a/platform/testFramework/bootstrap/resources/intellij.tools.testsBootstrap.xml b/platform/testFramework/bootstrap/resources/intellij.tools.testsBootstrap.xml
index 18c74d21ac5f..5770ab1cf70b 100644
--- a/platform/testFramework/bootstrap/resources/intellij.tools.testsBootstrap.xml
+++ b/platform/testFramework/bootstrap/resources/intellij.tools.testsBootstrap.xml
@@ -1,5 +1,6 @@
 <idea-plugin visibility="internal">
   <dependencies>
     <module name="intellij.libraries.junit5.launcher"/>
+    <module name="intellij.libraries.junit5.vintage"/>
   </dependencies>
 </idea-plugin>
\ No newline at end of file