From cfaecc65958a64faa761adcf439716e494b3aed5 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 9 Jun 2026 08:12:42 +0200
Subject: [PATCH] IJPL-246712 Pack embedded module to separate jar by default -
 fix verifier

IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 IJ-MR-196957 IJ-MR-199124 IJ-MR-197441 IJ-MR-204135 IJ-MR-204674 IJ-MR-205883

GitOrigin-RevId: d18ffb8888af43e67c74a87b5e7b19681fb786e0
---
 .../distributionContent/PackagingContentChecker.kt |  2 +-
 .../distributionContent/contentChecker.kt          | 14 --------------
 plugins/javaFX/community/plugin-content.yaml       |  6 ++++--
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/PackagingContentChecker.kt b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/PackagingContentChecker.kt
index f3cb2a965691..2633d032dc5a 100644
--- a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/PackagingContentChecker.kt
+++ b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/PackagingContentChecker.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-@file:Suppress("ReplaceGetOrSet")
+@file:Suppress("ReplaceGetOrSet", "DestructuringDeclaration")
 
 package com.intellij.platform.buildScripts.testFramework.distributionContent
 
diff --git a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/contentChecker.kt b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/contentChecker.kt
index e4e5f9e1fd51..577dedc07234 100644
--- a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/contentChecker.kt
+++ b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/contentChecker.kt
@@ -16,7 +16,6 @@ import org.assertj.core.util.diff.DiffUtils
 import org.jetbrains.annotations.ApiStatus.Internal
 import org.jetbrains.jps.model.JpsProject
 import org.jetbrains.jps.util.JpsPathUtil
-import org.opentest4j.MultipleFailuresError
 import java.nio.file.Files
 import java.nio.file.NoSuchFileException
 import java.nio.file.Path
@@ -136,15 +135,6 @@ fun collectPluginContentFailures(
   }
 }
 
-@Internal
-fun assertNoPackagingCheckFailures(problemMessage: String, failures: List<PackagingCheckFailure>) {
-  when (failures.size) {
-    0 -> return
-    1 -> throw failures.single().error
-    else -> throw MultipleFailuresError(problemMessage, failures.map { wrapFailureWithName(it) })
-  }
-}
-
 private fun collectPluginContentCategoryFailures(
   fileEntries: Sequence<PluginContentReport>,
   project: JpsProject,
@@ -203,10 +193,6 @@ private fun collectPluginContentCategoryFailures(
   return failures
 }
 
-private fun wrapFailureWithName(failure: PackagingCheckFailure): Throwable {
-  return AssertionError(failure.name, failure.error)
-}
-
 private fun toPluginContentMap(contentList: List<PluginContentReport>): Map<String, PluginContentReport> {
   val result = LinkedHashMap<String, PluginContentReport>(contentList.size)
   for (item in contentList) {
diff --git a/plugins/javaFX/community/plugin-content.yaml b/plugins/javaFX/community/plugin-content.yaml
index 62463b28d520..1e07b8370c34 100644
--- a/plugins/javaFX/community/plugin-content.yaml
+++ b/plugins/javaFX/community/plugin-content.yaml
@@ -9,13 +9,15 @@
   - name: intellij.javaFX.community
   contentModules:
   - name: intellij.javaFX.properties
-  - name: intellij.platform.commercial.verifier
 - name: lib/modules/intellij.javaFX.css.jar
   contentModules:
   - name: intellij.javaFX.css
 - name: lib/modules/intellij.javaFX.jar
   contentModules:
   - name: intellij.javaFX
+- name: lib/modules/intellij.platform.commercial.verifier.jar
+  contentModules:
+  - name: intellij.platform.commercial.verifier
 - name: lib/rt/sceneBuilderBridge.jar
   modules:
-  - name: intellij.javaFX.sceneBuilder
\ No newline at end of file
+  - name: intellij.javaFX.sceneBuilder