From 201a4d0ef5d0ffdc2a6dd5c18867174bb7d8d061 Mon Sep 17 00:00:00 2001 From: Aleksey Dobrynin Date: Wed, 8 Oct 2025 16:51:10 +0200 Subject: [PATCH] [junit6] update JUnit to stable 6.0.0 IDEA-379307 GitOrigin-RevId: 09634187fdae94e6c140469d24d12d9dc9ff8b01 --- .idea/libraries/JUnit6.xml | 18 +++--- .idea/libraries/JUnit6Launcher.xml | 18 +++--- lib/BUILD.bazel | 32 +++++----- lib/MODULE.bazel | 64 +++++++++---------- .../configuration/JUnitModulePathTest.java | 2 +- .../com/intellij/junit6/JUnit6Constants.java | 2 +- 6 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.idea/libraries/JUnit6.xml b/.idea/libraries/JUnit6.xml index dcdbd5ccd639..af726360a425 100644 --- a/.idea/libraries/JUnit6.xml +++ b/.idea/libraries/JUnit6.xml @@ -1,15 +1,15 @@ - + - - db1404414d23effbeb1202025f1e984f9069ddeed6d4c1826bb70bce8c70fb31 + + 88d690d2d373cd66170770c317977196ce9e465f2388930f4bc9665e887385f6 48e2df636cab6563ced64dcdff8abb2355627cb236ef0bf37598682ddf742f1b - - 7f7d65576d02547d4d6b44ec3d49dd37904cd8927baae5bddd541cd24d513a39 + + 86e8faf87f3151a3d545850852a0f2cc55ea8a2434eee9e08f83881c52d55992 b509448ac506d607319f182537f0b35d71007582ec741832a1f111e5b5b70b38 @@ -20,17 +20,17 @@ - + - + - + - + diff --git a/.idea/libraries/JUnit6Launcher.xml b/.idea/libraries/JUnit6Launcher.xml index 5cc8cca3c7fc..643fec157851 100644 --- a/.idea/libraries/JUnit6Launcher.xml +++ b/.idea/libraries/JUnit6Launcher.xml @@ -1,12 +1,12 @@ - + - - 3c41ec667a185ec0b51ca8d9d68e5f0e425d6645c6e4eb64b8a81716a4deaed1 + + 5f097b00c6714bb71ecfb5dec62b59bb4c2f789763fafd1ece96c4ef0e6c280f - - 8f5e8cb552c311d4a236334975a5ff9ec4db5f64e84151d01500f31fa19edfba + + 6f81842e9c13e997cac66b44614522f3639419e2388ae2d000c4bc0a6b92d93f 1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab @@ -19,14 +19,14 @@ - - + + - - + + diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 388f2161ae2a..8c8729026bc3 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -3256,9 +3256,9 @@ java_library( java_library( name = "junit6", exports = [ - ":org_junit_jupiter-junit-jupiter-api-6_0_0-RC2_http_import", + ":org_junit_jupiter-junit-jupiter-api-6_0_0_http_import", ":org_opentest4j-opentest4j-1_3_0_http_import", - ":org_junit_platform-junit-platform-commons-6_0_0-RC2_http_import", + ":org_junit_platform-junit-platform-commons-6_0_0_http_import", ":org_apiguardian-apiguardian-api-1_1_2_http_import", ":org_jspecify-jspecify-1_0_0_http_import", ], @@ -3266,15 +3266,15 @@ java_library( ) jvm_import( - name = "org_junit_jupiter-junit-jupiter-api-6_0_0-RC2_http_import", - jar = "@org_junit_jupiter-junit-jupiter-api-6_0_0-RC2_http//file", - source_jar = "@org_junit_jupiter-junit-jupiter-api-6_0_0-RC2_http//file" + name = "org_junit_jupiter-junit-jupiter-api-6_0_0_http_import", + jar = "@org_junit_jupiter-junit-jupiter-api-6_0_0_http//file", + source_jar = "@org_junit_jupiter-junit-jupiter-api-6_0_0_http//file" ) jvm_import( - name = "org_junit_platform-junit-platform-commons-6_0_0-RC2_http_import", - jar = "@org_junit_platform-junit-platform-commons-6_0_0-RC2_http//file", - source_jar = "@org_junit_platform-junit-platform-commons-6_0_0-RC2_http//file" + name = "org_junit_platform-junit-platform-commons-6_0_0_http_import", + jar = "@org_junit_platform-junit-platform-commons-6_0_0_http//file", + source_jar = "@org_junit_platform-junit-platform-commons-6_0_0_http//file" ) jvm_import( @@ -3293,23 +3293,23 @@ java_library( java_library( name = "junit6Launcher", exports = [ - ":org_junit_platform-junit-platform-launcher-6_0_0-RC2_http_import", - ":org_junit_platform-junit-platform-engine-6_0_0-RC2_http_import", + ":org_junit_platform-junit-platform-launcher-6_0_0_http_import", + ":org_junit_platform-junit-platform-engine-6_0_0_http_import", ":org_jspecify-jspecify-1_0_0_http_import", ], visibility = ["//visibility:public"] ) jvm_import( - name = "org_junit_platform-junit-platform-launcher-6_0_0-RC2_http_import", - jar = "@org_junit_platform-junit-platform-launcher-6_0_0-RC2_http//file", - source_jar = "@org_junit_platform-junit-platform-launcher-6_0_0-RC2_http//file" + name = "org_junit_platform-junit-platform-launcher-6_0_0_http_import", + jar = "@org_junit_platform-junit-platform-launcher-6_0_0_http//file", + source_jar = "@org_junit_platform-junit-platform-launcher-6_0_0_http//file" ) jvm_import( - name = "org_junit_platform-junit-platform-engine-6_0_0-RC2_http_import", - jar = "@org_junit_platform-junit-platform-engine-6_0_0-RC2_http//file", - source_jar = "@org_junit_platform-junit-platform-engine-6_0_0-RC2_http//file" + name = "org_junit_platform-junit-platform-engine-6_0_0_http_import", + jar = "@org_junit_platform-junit-platform-engine-6_0_0_http//file", + source_jar = "@org_junit_platform-junit-platform-engine-6_0_0_http//file" ) java_library( diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 43bea186c535..e6924d4b7623 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -4606,17 +4606,17 @@ http_file( ) http_file( - name = "org_junit_jupiter-junit-jupiter-api-6_0_0-RC2_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/6.0.0-RC2/junit-jupiter-api-6.0.0-RC2.jar", - sha256 = "db1404414d23effbeb1202025f1e984f9069ddeed6d4c1826bb70bce8c70fb31", - downloaded_file_path = "junit-jupiter-api-6.0.0-RC2.jar" + name = "org_junit_jupiter-junit-jupiter-api-6_0_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/6.0.0/junit-jupiter-api-6.0.0.jar", + sha256 = "88d690d2d373cd66170770c317977196ce9e465f2388930f4bc9665e887385f6", + downloaded_file_path = "junit-jupiter-api-6.0.0.jar" ) http_file( - name = "org_junit_platform-junit-platform-commons-6_0_0-RC2_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-commons/6.0.0-RC2/junit-platform-commons-6.0.0-RC2.jar", - sha256 = "7f7d65576d02547d4d6b44ec3d49dd37904cd8927baae5bddd541cd24d513a39", - downloaded_file_path = "junit-platform-commons-6.0.0-RC2.jar" + name = "org_junit_platform-junit-platform-commons-6_0_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-commons/6.0.0/junit-platform-commons-6.0.0.jar", + sha256 = "86e8faf87f3151a3d545850852a0f2cc55ea8a2434eee9e08f83881c52d55992", + downloaded_file_path = "junit-platform-commons-6.0.0.jar" ) http_file( @@ -4627,17 +4627,17 @@ http_file( ) http_file( - name = "org_junit_jupiter-junit-jupiter-api-6_0_0-RC2-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/6.0.0-RC2/junit-jupiter-api-6.0.0-RC2-sources.jar", - sha256 = "4addc5bf25b7ecdd2b24b2710632fca9854410cc96d5e2332c0ac3b123ebb080", - downloaded_file_path = "junit-jupiter-api-6.0.0-RC2-sources.jar" + name = "org_junit_jupiter-junit-jupiter-api-6_0_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/6.0.0/junit-jupiter-api-6.0.0-sources.jar", + sha256 = "52a9bb01e348a87c5743c6555274be8999d72ebdae0db3991b99f24bcd078e5e", + downloaded_file_path = "junit-jupiter-api-6.0.0-sources.jar" ) http_file( - name = "org_junit_platform-junit-platform-commons-6_0_0-RC2-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-commons/6.0.0-RC2/junit-platform-commons-6.0.0-RC2-sources.jar", - sha256 = "e1469584f6c28fcf4eaf44dc3fd300bbeb51912f4052edbef7ee5ee0a28ff744", - downloaded_file_path = "junit-platform-commons-6.0.0-RC2-sources.jar" + name = "org_junit_platform-junit-platform-commons-6_0_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-commons/6.0.0/junit-platform-commons-6.0.0-sources.jar", + sha256 = "eb76cc1b09296370774f1de11c2fa037464753d98f0d542312e270b647a4c106", + downloaded_file_path = "junit-platform-commons-6.0.0-sources.jar" ) http_file( @@ -4648,31 +4648,31 @@ http_file( ) http_file( - name = "org_junit_platform-junit-platform-launcher-6_0_0-RC2_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/6.0.0-RC2/junit-platform-launcher-6.0.0-RC2.jar", - sha256 = "3c41ec667a185ec0b51ca8d9d68e5f0e425d6645c6e4eb64b8a81716a4deaed1", - downloaded_file_path = "junit-platform-launcher-6.0.0-RC2.jar" + name = "org_junit_platform-junit-platform-launcher-6_0_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/6.0.0/junit-platform-launcher-6.0.0.jar", + sha256 = "5f097b00c6714bb71ecfb5dec62b59bb4c2f789763fafd1ece96c4ef0e6c280f", + downloaded_file_path = "junit-platform-launcher-6.0.0.jar" ) http_file( - name = "org_junit_platform-junit-platform-engine-6_0_0-RC2_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/6.0.0-RC2/junit-platform-engine-6.0.0-RC2.jar", - sha256 = "8f5e8cb552c311d4a236334975a5ff9ec4db5f64e84151d01500f31fa19edfba", - downloaded_file_path = "junit-platform-engine-6.0.0-RC2.jar" + name = "org_junit_platform-junit-platform-engine-6_0_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/6.0.0/junit-platform-engine-6.0.0.jar", + sha256 = "6f81842e9c13e997cac66b44614522f3639419e2388ae2d000c4bc0a6b92d93f", + downloaded_file_path = "junit-platform-engine-6.0.0.jar" ) http_file( - name = "org_junit_platform-junit-platform-launcher-6_0_0-RC2-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/6.0.0-RC2/junit-platform-launcher-6.0.0-RC2-sources.jar", - sha256 = "f100a0b9b4249e8f050375b47875b91dba01c41fa226dfb31c94c3bdc9de0f72", - downloaded_file_path = "junit-platform-launcher-6.0.0-RC2-sources.jar" + name = "org_junit_platform-junit-platform-launcher-6_0_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/6.0.0/junit-platform-launcher-6.0.0-sources.jar", + sha256 = "b5d996a313285657990fd532d3f6375489ea2834f19ea9769d74009e9727fe9e", + downloaded_file_path = "junit-platform-launcher-6.0.0-sources.jar" ) http_file( - name = "org_junit_platform-junit-platform-engine-6_0_0-RC2-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/6.0.0-RC2/junit-platform-engine-6.0.0-RC2-sources.jar", - sha256 = "6b725abf25a6688bf413980ab07ecb2423cf093fea08a607eef01afa7f6a457d", - downloaded_file_path = "junit-platform-engine-6.0.0-RC2-sources.jar" + name = "org_junit_platform-junit-platform-engine-6_0_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/6.0.0/junit-platform-engine-6.0.0-sources.jar", + sha256 = "d324087cbe0b41ea9307c709811233f302346349fac17f2ab4c88f05a188eb79", + downloaded_file_path = "junit-platform-engine-6.0.0-sources.jar" ) http_file( diff --git a/plugins/junit/java-tests/test/com/intellij/execution/junit/configuration/JUnitModulePathTest.java b/plugins/junit/java-tests/test/com/intellij/execution/junit/configuration/JUnitModulePathTest.java index 92567cee206c..9cc2126b3a91 100644 --- a/plugins/junit/java-tests/test/com/intellij/execution/junit/configuration/JUnitModulePathTest.java +++ b/plugins/junit/java-tests/test/com/intellij/execution/junit/configuration/JUnitModulePathTest.java @@ -175,7 +175,7 @@ public class JUnitModulePathTest extends BaseConfigurationTestCase { model.addModuleOrderEntry(module1); }); JpsMavenRepositoryLibraryDescriptor nonModularizedJupiterDescription = - new JpsMavenRepositoryLibraryDescriptor("org.junit.jupiter", "junit-jupiter-api", "6.0.0-RC2"); + new JpsMavenRepositoryLibraryDescriptor("org.junit.jupiter", "junit-jupiter-api", "6.0.0"); JUnitConfiguration configuration = setupConfiguration(nonModularizedJupiterDescription, "modulePath/test2", module); JavaParameters params4Tests = configuration.getTestObject().createJavaParameters4Tests(); ParamsGroup moduleOptions = JavaTestFrameworkRunnableState.getJigsawOptions(params4Tests); diff --git a/plugins/junit6_rt_tests/test/com/intellij/junit6/JUnit6Constants.java b/plugins/junit6_rt_tests/test/com/intellij/junit6/JUnit6Constants.java index f846ede40967..1598607bb41f 100644 --- a/plugins/junit6_rt_tests/test/com/intellij/junit6/JUnit6Constants.java +++ b/plugins/junit6_rt_tests/test/com/intellij/junit6/JUnit6Constants.java @@ -2,5 +2,5 @@ package com.intellij.junit6; public interface JUnit6Constants { - String VERSION = "6.0.0-RC2"; + String VERSION = "6.0.0"; }