do not export deps blindly

GitOrigin-RevId: 3f884c638f8e047b4c6933e023f19f0b79fb8752
2026-04-19 13:02:30 +07:00 · 2024-12-18 17:29:37 +01:00
parent 2184dd5b76
commit aaa5c93bfb
45 changed files with 103 additions and 108 deletions
--- a/java/compiler/charts/jps-plugin/intellij.java.compiler.charts.jps.iml
+++ b/java/compiler/charts/jps-plugin/intellij.java.compiler.charts.jps.iml
@@ -25,6 +25,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
  </component>
--- a/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompileStatisticBuilderMessage.java
+++ b/java/compiler/charts/jps-plugin/src/com/intellij/java/compiler/charts/jps/CompileStatisticBuilderMessage.java
@@ -19,7 +19,7 @@ import java.util.function.Supplier;

 import static com.intellij.java.compiler.charts.jps.ChartsBuilderService.COMPILATION_STATISTIC_BUILDER_ID;

-public class CompileStatisticBuilderMessage extends CustomBuilderMessage {
+public final class CompileStatisticBuilderMessage extends CustomBuilderMessage {
  private static final Gson JSON = new Gson();

  private CompileStatisticBuilderMessage(@NotNull String messageType, @NotNull String data) {
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -18,6 +18,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.jsp" />
    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.jps.build.launcher" />
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompiler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompiler.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.compiler.impl.javaCompiler.eclipse;

 import com.intellij.compiler.impl.javaCompiler.BackendCompiler;
@@ -29,7 +15,7 @@ import org.jetbrains.jps.model.java.compiler.JavaCompilers;
 import java.util.Collections;
 import java.util.Set;

-public class EclipseCompiler implements BackendCompiler {
+public final class EclipseCompiler implements BackendCompiler {
  private final Project myProject;

  public EclipseCompiler(Project project) {
@@ -41,32 +27,27 @@ public class EclipseCompiler implements BackendCompiler {
  }

  @Override
-  @NotNull
-  public String getId() { // used for externalization
+  public @NotNull String getId() { // used for externalization
    return JavaCompilers.ECLIPSE_ID;
  }

  @Override
-  @NotNull
-  public String getPresentableName() {
+  public @NotNull String getPresentableName() {
    return JavaCompilerBundle.message("compiler.eclipse.name");
  }

  @Override
-  @NotNull
-  public Configurable createConfigurable() {
+  public @NotNull Configurable createConfigurable() {
    return new EclipseCompilerConfigurable(myProject, EclipseCompilerConfiguration.getOptions(myProject, EclipseCompilerConfiguration.class));
  }

-  @NotNull
  @Override
-  public Set<FileType> getCompilableFileTypes() {
+  public @NotNull Set<FileType> getCompilableFileTypes() {
    return Collections.singleton(JavaFileType.INSTANCE);
  }

-  @NotNull
  @Override
-  public CompilerOptions getOptions() {
+  public @NotNull CompilerOptions getOptions() {
    return EclipseCompilerConfiguration.getOptions(myProject, EclipseCompilerConfiguration.class);
  }
 }
--- a/jps/jps-builders/api-dump.txt
+++ b/jps/jps-builders/api-dump.txt
@@ -2127,6 +2127,7 @@ org.jetbrains.jps.incremental.CompileContext
 - a:getLoggingManager():org.jetbrains.jps.builders.logging.BuildLoggingManager
 - a:getProjectDescriptor():org.jetbrains.jps.cmdline.ProjectDescriptor
 - a:getScope():org.jetbrains.jps.incremental.CompileScope
+- isCanceled():Z
 - a:isProjectRebuild():Z
 - a:markNonIncremental(org.jetbrains.jps.incremental.ModuleBuildTarget):V
 - a:removeBuildListener(org.jetbrains.jps.incremental.BuildListener):V
--- a/jps/jps-builders/intellij.platform.jps.build.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.iml
@@ -25,7 +25,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
    <orderEntry type="module" module-name="intellij.java.guiForms.compiler" />
    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
@@ -62,8 +62,8 @@
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="library" name="jps-javac-extension" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.tracing.rt" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
+    <orderEntry type="module" module-name="intellij.platform.tracing.rt" />
    <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
    <orderEntry type="module" module-name="intellij.platform.util.zip" />
    <orderEntry type="library" name="caffeine" level="project" />
--- a/jps/jps-builders/intellij.platform.jps.build.tests.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.tests.iml
@@ -9,6 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" exported="" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="Eclipse" level="project" />
@@ -17,6 +18,7 @@
    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="library" scope="TEST" name="hash4j" level="project" />
--- a/jps/jps-builders/src/org/jetbrains/jps/api/JpsDynamicBundle.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/JpsDynamicBundle.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.api;

 import com.intellij.AbstractBundle;
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.incremental;

 import com.intellij.openapi.util.UserDataHolder;
@@ -55,6 +41,10 @@ public interface CompileContext extends UserDataHolder, MessageHandler {

  @NotNull CanceledStatus getCancelStatus();

+  default boolean isCanceled() {
+    return getCancelStatus().isCanceled();
+  }
+
  void checkCanceled() throws ProjectBuildException;

  @NotNull BuildLoggingManager getLoggingManager();
--- a/jps/jps-builders/testSrc/org/jetbrains/jps/dependency/java/MockAnnotationsChangeTracker.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/jps/dependency/java/MockAnnotationsChangeTracker.java
@@ -11,7 +11,7 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;

-public class MockAnnotationsChangeTracker implements AnnotationChangesTracker {
+public final class MockAnnotationsChangeTracker implements AnnotationChangesTracker {
  private static final String ANOTATION_NAME = MockAnnotation.class.getName().replace('.', '/');
  private static final String HIERARCHY_ANOTATION_NAME = MockHierarchyAnnotation.class.getName().replace('.', '/');
  private static final Set<String> KOTLIN_TESTS_ANOTATION_NAMES = Set.of("foo/Ann", "Ann");
--- a/jps/model-api/intellij.platform.jps.model.iml
+++ b/jps/model-api/intellij.platform.jps.model.iml
@@ -24,6 +24,6 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="library" exported="" name="jetbrains-annotations" level="project" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
  </component>
 </module>
--- a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
+++ b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
@@ -7,9 +7,9 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model.tests" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
--- a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
+++ b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
@@ -24,10 +24,12 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.jps.build" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" name="cli-parser" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
    <orderEntry type="library" name="protobuf" level="project" />
  </component>
 </module>
--- a/platform/bootstrap/intellij.platform.bootstrap.iml
+++ b/platform/bootstrap/intellij.platform.bootstrap.iml
@@ -20,6 +20,7 @@
    <orderEntry type="library" name="jbr-api" level="project" />
    <orderEntry type="module" module-name="intellij.platform.runtime.product" />
    <orderEntry type="module" module-name="intellij.platform.diagnostic" />
+    <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.impl" />
  </component>
  <component name="copyright">
--- a/platform/build-scripts/intellij.platform.buildScripts.iml
+++ b/platform/build-scripts/intellij.platform.buildScripts.iml
@@ -43,6 +43,10 @@
    <orderEntry type="library" name="jackson" level="project" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.xmlDom" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
+    <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
    <orderEntry type="module" module-name="intellij.platform.testFramework.core" />
    <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
    <orderEntry type="library" name="jackson-jr-objects" level="project" />
--- a/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml
+++ b/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml
@@ -18,6 +18,7 @@
    <orderEntry type="library" name="jackson-jr-objects" level="project" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
    <orderEntry type="module" module-name="intellij.platform.testFramework.core" />
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.idea.community.build.tasks" />
--- a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/RuntimeModuleRepositoryChecker.kt
+++ b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/RuntimeModuleRepositoryChecker.kt
@@ -23,7 +23,7 @@ import kotlin.io.path.*
 * Checks that runtime module descriptors in the product distribution are valid.
 */
@OptIn(ExperimentalPathApi::class)
-class RuntimeModuleRepositoryChecker private constructor(
+internal class RuntimeModuleRepositoryChecker private constructor(
  private val commonDistPath: Path,
  private val osSpecificDistPath: Path?,
  private val currentMode: ProductMode,
--- a/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml
+++ b/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml
@@ -36,8 +36,8 @@
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="library" name="jetbrains-annotations" level="project" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.jewel.ui" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.jewel.foundation" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jewel.ui" />
+    <orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
    <orderEntry type="module-library" exported="">
      <library name="org.commonmark.commonmark" type="repository">
        <properties include-transitive-deps="false" maven-id="org.commonmark:commonmark:0.24.0">
--- a/platform/remoteDev-util/intellij.remoteDev.util.iml
+++ b/platform/remoteDev-util/intellij.remoteDev.util.iml
@@ -67,6 +67,7 @@
    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
    <orderEntry type="module" module-name="intellij.platform.ide.ui" />
    <orderEntry type="module" module-name="intellij.platform.lang.core" />
+    <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
    <orderEntry type="module" module-name="intellij.platform.runtime.product" />
    <orderEntry type="module" module-name="intellij.platform.execution" />
    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
--- a/platform/runtime/product/intellij.platform.runtime.product.iml
+++ b/platform/runtime/product/intellij.platform.runtime.product.iml
@@ -24,7 +24,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="jetbrains-annotations" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.runtime.repository" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.base" />
  </component>
--- a/platform/runtime/product/tests/intellij.platform.runtime.product.tests.iml
+++ b/platform/runtime/product/tests/intellij.platform.runtime.product.tests.iml
@@ -9,6 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.runtime.product" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.runtime.repository" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.runtime.repository.tests" scope="TEST" />
  </component>
 </module>
--- a/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
+++ b/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
@@ -25,9 +25,12 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
    <orderEntry type="library" name="ASM" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
  </component>
 </module>
--- a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternInstrumenter.java
+++ b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternInstrumenter.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.intellilang.instrumentation;

 import com.intellij.compiler.instrumentation.InstrumentationClassFinder;
@@ -17,7 +17,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.regex.Pattern;

-class PatternInstrumenter extends ClassVisitor implements Opcodes {
+final class PatternInstrumenter extends ClassVisitor implements Opcodes {
  static final String PATTERN_CACHE_NAME = "$_PATTERN_CACHE_$";
  static final String ASSERTIONS_DISABLED_NAME = "$assertionsDisabled";
  static final String JAVA_LANG_STRING = "Ljava/lang/String;";
--- a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternValidatorBuilder.java
+++ b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternValidatorBuilder.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.intellilang.instrumentation;

 import com.intellij.compiler.instrumentation.InstrumentationClassFinder;
@@ -21,12 +21,11 @@ import org.jetbrains.org.objectweb.asm.ClassWriter;
 /**
 * @author Eugene Zhuravlev
 */
-public class PatternValidatorBuilder extends BaseInstrumentingBuilder {
+public final class PatternValidatorBuilder extends BaseInstrumentingBuilder {
  public PatternValidatorBuilder() { }

-  @NotNull
  @Override
-  public String getPresentableName() {
+  public @NotNull String getPresentableName() {
    return JpsBuildBundle.message("intellilang.pattern.validator.presentable.name");
  }

@@ -42,13 +41,12 @@ public class PatternValidatorBuilder extends BaseInstrumentingBuilder {
    return !"module-info".equals(compiledClass.getClassName());
  }

-  @Nullable
  @Override
-  protected BinaryContent instrument(CompileContext context,
-                                     CompiledClass compiled,
-                                     ClassReader reader,
-                                     ClassWriter writer,
-                                     InstrumentationClassFinder finder) {
+  protected @Nullable BinaryContent instrument(CompileContext context,
+                                               CompiledClass compiled,
+                                               ClassReader reader,
+                                               ClassWriter writer,
+                                               InstrumentationClassFinder finder) {
    JpsGlobal project = context.getProjectDescriptor().getModel().getGlobal();
    JpsIntelliLangConfiguration config = JpsIntelliLangExtensionService.getInstance().getConfiguration(project);
    try {
--- a/plugins/ant/jps-plugin/intellij.ant.jps.tests.iml
+++ b/plugins/ant/jps-plugin/intellij.ant.jps.tests.iml
@@ -11,5 +11,7 @@
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.build.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
  </component>
 </module>
--- a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml
+++ b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml
@@ -30,5 +30,8 @@
    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
    <orderEntry type="library" name="ASM" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
  </component>
 </module>
--- a/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/threadingModelHelper/TMHInstrumentingBuilder.java
+++ b/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/threadingModelHelper/TMHInstrumentingBuilder.java
@@ -23,7 +23,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;

-public class TMHInstrumentingBuilder extends BaseInstrumentingBuilder {
+public final class TMHInstrumentingBuilder extends BaseInstrumentingBuilder {
  private static final Logger LOG = Logger.getInstance(TMHInstrumentingBuilder.class);
  static final String INSTRUMENT_ANNOTATIONS_PROPERTY = "tmh.instrument.annotations";
  static final String GENERATE_LINE_NUMBERS_PROPERTY = "tmh.generate.line.numbers";
@@ -31,9 +31,8 @@ public class TMHInstrumentingBuilder extends BaseInstrumentingBuilder {
  public TMHInstrumentingBuilder() {
  }

-  @NotNull
  @Override
-  public String getPresentableName() {
+  public @NotNull String getPresentableName() {
    return DevKitJpsBundle.message("tmh.instrumenting.builder.name");
  }

@@ -54,12 +53,11 @@ public class TMHInstrumentingBuilder extends BaseInstrumentingBuilder {
  }

  @Override
-  @Nullable
-  protected BinaryContent instrument(CompileContext context,
-                                     CompiledClass compiledClass,
-                                     ClassReader reader,
-                                     ClassWriter writer,
-                                     InstrumentationClassFinder finder) {
+  protected @Nullable BinaryContent instrument(CompileContext context,
+                                               CompiledClass compiledClass,
+                                               ClassReader reader,
+                                               ClassWriter writer,
+                                               InstrumentationClassFinder finder) {
    try {
      boolean generateLineNumbers = SystemProperties.getBooleanProperty(GENERATE_LINE_NUMBERS_PROPERTY, false);
      var generators = hasThreadingAssertions(finder) ? TMHAssertionGenerator2.generators()
--- a/plugins/devkit/runtimeModuleRepository/jps/intellij.devkit.runtimeModuleRepository.jps.iml
+++ b/plugins/devkit/runtimeModuleRepository/jps/intellij.devkit.runtimeModuleRepository.jps.iml
@@ -26,6 +26,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
--- a/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/compiler/GradleResourcesBuilder.java
+++ b/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/compiler/GradleResourcesBuilder.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.gradle.compiler;

 import com.intellij.openapi.diagnostic.Logger;
@@ -27,7 +27,7 @@ import java.util.*;
 /**
 * @author Vladislav.Soroka
 */
-public class GradleResourcesBuilder extends TargetBuilder<GradleResourceRootDescriptor, GradleResourcesTarget> {
+public final class GradleResourcesBuilder extends TargetBuilder<GradleResourceRootDescriptor, GradleResourcesTarget> {
  private static final Logger LOG = Logger.getInstance(GradleResourcesBuilder.class);

  public GradleResourcesBuilder() {
@@ -35,10 +35,10 @@ public class GradleResourcesBuilder extends TargetBuilder<GradleResourceRootDesc
  }

  @Override
-  public void build(@NotNull final GradleResourcesTarget target,
-                    @NotNull final DirtyFilesHolder<GradleResourceRootDescriptor, GradleResourcesTarget> holder,
-                    @NotNull final BuildOutputConsumer outputConsumer,
-                    @NotNull final CompileContext context) throws ProjectBuildException, IOException {
+  public void build(final @NotNull GradleResourcesTarget target,
+                    final @NotNull DirtyFilesHolder<GradleResourceRootDescriptor, GradleResourcesTarget> holder,
+                    final @NotNull BuildOutputConsumer outputConsumer,
+                    final @NotNull CompileContext context) throws ProjectBuildException, IOException {
    final BuildDataPaths dataPaths = context.getProjectDescriptor().dataManager.getDataPaths();
    final GradleProjectConfiguration projectConfig = JpsGradleExtensionService.getInstance().getGradleProjectConfiguration(dataPaths);
    final GradleModuleResourceConfiguration config = target.getModuleResourcesConfiguration(dataPaths);
@@ -115,7 +115,7 @@ public class GradleResourcesBuilder extends TargetBuilder<GradleResourceRootDesc
        fileProcessor.copyFile(file, fileRef, rd.getConfiguration(), context, FileFilters.EVERYTHING);
        outputConsumer.registerOutputFile(fileRef.get(), Collections.singleton(file.getPath()));

-        if (context.getCancelStatus().isCanceled()) return;
+        if (context.isCanceled()) return;
      }
    }

@@ -124,8 +124,7 @@ public class GradleResourcesBuilder extends TargetBuilder<GradleResourceRootDesc
  }

  @Override
-  @NotNull
-  public String getPresentableName() {
+  public @NotNull String getPresentableName() {
    return GradleJpsBundle.message("gradle.resources.compiler");
  }
 }
--- a/plugins/groovy/intellij.groovy.iml
+++ b/plugins/groovy/intellij.groovy.iml
@@ -19,6 +19,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.properties" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" />
--- a/plugins/groovy/jps-plugin/intellij.groovy.jps.iml
+++ b/plugins/groovy/jps-plugin/intellij.groovy.jps.iml
@@ -25,6 +25,8 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.groovy.constants.rt" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
--- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
@@ -34,7 +34,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

-public class GroovyBuilder extends ModuleLevelBuilder {
+public final class GroovyBuilder extends ModuleLevelBuilder {
  private static final Logger LOG = Logger.getInstance(GroovyBuilder.class);
  static final Key<Map<String, String>> STUB_TO_SRC = Key.create("STUB_TO_SRC");
  private static final Key<Boolean> FILES_MARKED_DIRTY_FOR_NEXT_ROUND = Key.create("SRC_MARKED_DIRTY");
@@ -161,8 +161,7 @@ public class GroovyBuilder extends ModuleLevelBuilder {
    return 100;
  }

-  private static class RecompileStubSources implements ClassPostProcessor {
-
+  private static final class RecompileStubSources implements ClassPostProcessor {
    @Override
    public void process(CompileContext context, OutputFileObject out) {
      final Map<String, String> stubToSrc = STUB_TO_SRC.get(context);
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GrBuildProcessParametersProvider.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GrBuildProcessParametersProvider.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.groovy.compiler;

 import com.intellij.compiler.CompilerConfiguration;
@@ -26,9 +26,8 @@ final class GrBuildProcessParametersProvider extends BuildProcessParametersProvi
    myProject = project;
  }

-  @NotNull
  @Override
-  public List<String> getClassPath() {
+  public @NotNull List<String> getClassPath() {
    CompilerConfiguration config = myProject.isDefault() ? null : CompilerConfiguration.getInstance(myProject);
    if (config instanceof CompilerConfigurationImpl) {
      BackendCompiler backend = ((CompilerConfigurationImpl)config).getDefaultCompiler();
--- a/plugins/javaFX/jps/intellij.javaFX.jps.iml
+++ b/plugins/javaFX/jps/intellij.javaFX.jps.iml
@@ -26,9 +26,11 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
    <orderEntry type="module" module-name="intellij.javaFX.common" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
  </component>
 </module>
--- a/plugins/javaFX/jps/src/org/jetbrains/plugins/javaFX/JpsJavaFxArtifactPropertiesSerializer.java
+++ b/plugins/javaFX/jps/src/org/jetbrains/plugins/javaFX/JpsJavaFxArtifactPropertiesSerializer.java
@@ -8,7 +8,7 @@ import org.jetbrains.jps.model.serialization.artifact.JpsArtifactPropertiesSeria

 import java.util.List;

-public class JpsJavaFxArtifactPropertiesSerializer extends JpsArtifactPropertiesSerializer<JpsJavaFxArtifactProperties> {
+public final class JpsJavaFxArtifactPropertiesSerializer extends JpsArtifactPropertiesSerializer<JpsJavaFxArtifactProperties> {
  public JpsJavaFxArtifactPropertiesSerializer() {
    super("javafx", JpsJavaFxApplicationArtifactType.INSTANCE);
  }
--- a/plugins/javaFX/jps/src/org/jetbrains/plugins/javaFX/JpsJavaFxModelSerializerExtension.java
+++ b/plugins/javaFX/jps/src/org/jetbrains/plugins/javaFX/JpsJavaFxModelSerializerExtension.java
@@ -8,10 +8,9 @@ import org.jetbrains.jps.model.serialization.artifact.JpsArtifactPropertiesSeria
 import java.util.Collections;
 import java.util.List;

-public class JpsJavaFxModelSerializerExtension extends JpsModelSerializerExtension {
-  @NotNull
+public final class JpsJavaFxModelSerializerExtension extends JpsModelSerializerExtension {
  @Override
-  public List<? extends JpsArtifactPropertiesSerializer<?>> getArtifactTypePropertiesSerializers() {
+  public @NotNull List<? extends JpsArtifactPropertiesSerializer<?>> getArtifactTypePropertiesSerializers() {
    return Collections.singletonList(new JpsJavaFxArtifactPropertiesSerializer());
  }
 }
--- a/plugins/javaFX/jps/src/org/jetbrains/plugins/javaFX/preloader/JpsJavaFxPreloaderArtifactPropertiesSerializer.java
+++ b/plugins/javaFX/jps/src/org/jetbrains/plugins/javaFX/preloader/JpsJavaFxPreloaderArtifactPropertiesSerializer.java
@@ -8,7 +8,7 @@ import org.jetbrains.jps.model.serialization.artifact.JpsArtifactPropertiesSeria

 import java.util.List;

-public class JpsJavaFxPreloaderArtifactPropertiesSerializer extends JpsArtifactPropertiesSerializer<JpsJavaFxPreloaderArtifactProperties> {
+public final class JpsJavaFxPreloaderArtifactPropertiesSerializer extends JpsArtifactPropertiesSerializer<JpsJavaFxPreloaderArtifactProperties> {
  public JpsJavaFxPreloaderArtifactPropertiesSerializer() {
    super("javafx-preloader", JpsJavaFxPreloaderArtifactType.INSTANCE);
  }
--- a/plugins/javaFX/jps/src/org/jetbrains/plugins/javaFX/preloader/JpsJavaFxPreloaderModelSerializerExtension.java
+++ b/plugins/javaFX/jps/src/org/jetbrains/plugins/javaFX/preloader/JpsJavaFxPreloaderModelSerializerExtension.java
@@ -8,10 +8,9 @@ import org.jetbrains.jps.model.serialization.artifact.JpsArtifactPropertiesSeria
 import java.util.Collections;
 import java.util.List;

-public class JpsJavaFxPreloaderModelSerializerExtension extends JpsModelSerializerExtension {
-  @NotNull
+public final class JpsJavaFxPreloaderModelSerializerExtension extends JpsModelSerializerExtension {
  @Override
-  public List<? extends JpsArtifactPropertiesSerializer<?>> getArtifactTypePropertiesSerializers() {
+  public @NotNull List<? extends JpsArtifactPropertiesSerializer<?>> getArtifactTypePropertiesSerializers() {
    return Collections.singletonList(new JpsJavaFxPreloaderArtifactPropertiesSerializer());
  }
 }
--- a/plugins/markdown/compose/intellij.markdown.compose.preview.iml
+++ b/plugins/markdown/compose/intellij.markdown.compose.preview.iml
@@ -30,6 +30,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
    <orderEntry type="module" module-name="intellij.markdown" />
    <orderEntry type="module" module-name="intellij.platform.compose" />
    <orderEntry type="module" module-name="intellij.platform.core" />
--- a/plugins/markdown/compose/src/main/kotlin/com/intellij/markdown/compose/preview/JcefLikeMarkdownStyling.kt
+++ b/plugins/markdown/compose/src/main/kotlin/com/intellij/markdown/compose/preview/JcefLikeMarkdownStyling.kt
@@ -32,7 +32,7 @@ import org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Ordered
 import org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Unordered

@Suppress("FunctionName")
-fun JcefLikeMarkdownStyling(scheme: PreviewStyleScheme, fontSize: TextUnit): MarkdownStyling {
+internal fun JcefLikeMarkdownStyling(scheme: PreviewStyleScheme, fontSize: TextUnit): MarkdownStyling {
  val fontSizeDp = fontSize.value.dp
  val defaultTextStyle = TextStyle(
    fontSize = fontSize,
--- a/plugins/maven/jps-plugin/intellij.maven.jps.iml
+++ b/plugins/maven/jps-plugin/intellij.maven.jps.iml
@@ -28,6 +28,7 @@
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
    <orderEntry type="library" name="plexus-utils" level="project" />
@@ -35,5 +36,6 @@
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.jps.build.tests" scope="TEST" />
    <orderEntry type="library" name="hash4j" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
  </component>
 </module>
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.maven.compiler;

 import com.intellij.openapi.diagnostic.Logger;
@@ -28,7 +28,7 @@ import java.util.*;
 /**
 * @author Eugene Zhuravlev
 */
-public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescriptor, MavenResourcesTarget> {
+public final class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescriptor, MavenResourcesTarget> {
  private static final Logger LOG = Logger.getInstance(MavenResourcesBuilder.class);

  public MavenResourcesBuilder() {
@@ -36,7 +36,7 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
  }

  @Override
-  public void build(@NotNull final MavenResourcesTarget target, @NotNull final DirtyFilesHolder<MavenResourceRootDescriptor, MavenResourcesTarget> holder, @NotNull final BuildOutputConsumer outputConsumer, @NotNull final CompileContext context) throws ProjectBuildException, IOException {
+  public void build(final @NotNull MavenResourcesTarget target, final @NotNull DirtyFilesHolder<MavenResourceRootDescriptor, MavenResourcesTarget> holder, final @NotNull BuildOutputConsumer outputConsumer, final @NotNull CompileContext context) throws ProjectBuildException, IOException {
    final BuildDataPaths dataPaths = context.getProjectDescriptor().dataManager.getDataPaths();
    final MavenProjectConfiguration projectConfig = JpsMavenExtensionService.getInstance().getMavenProjectConfiguration(dataPaths);
    if (projectConfig == null) {
@@ -121,7 +121,7 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
          LOG.info(e);
        }

-        if (context.getCancelStatus().isCanceled()) {
+        if (context.isCanceled()) {
          return;
        }
      }
@@ -133,8 +133,7 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
  }

  @Override
-  @NotNull
-  public String getPresentableName() {
+  public @NotNull String getPresentableName() {
    return MavenJpsBundle.message("maven.resources.compiler");
  }
 }
--- a/plugins/space/jps-plugin/intellij.space.java.jps.iml
+++ b/plugins/space/jps-plugin/intellij.space.java.jps.iml
@@ -23,6 +23,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
  </component>
 </module>
--- a/plugins/space/jps-plugin/src/com/intellij/space/java/jps/SpaceDependencyAuthenticationDataProvider.java
+++ b/plugins/space/jps-plugin/src/com/intellij/space/java/jps/SpaceDependencyAuthenticationDataProvider.java
@@ -7,7 +7,7 @@ import org.jetbrains.jps.incremental.dependencies.DependencyAuthenticationDataPr
 import java.util.Arrays;
 import java.util.List;

-public class SpaceDependencyAuthenticationDataProvider extends DependencyAuthenticationDataProvider {
+public final class SpaceDependencyAuthenticationDataProvider extends DependencyAuthenticationDataProvider {
  private static final List<String> PROVIDED_HOSTS = Arrays.asList("jetbrains.team", "jetbrains.space");

  @Override
--- a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml
+++ b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml
@@ -28,6 +28,7 @@
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
    <orderEntry type="module" module-name="intellij.java.guiForms.compiler" />
    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />