From 49c587cb33f5631247d617db8012cd4d83a15844 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Wed, 16 Dec 2020 11:54:54 +0300 Subject: [PATCH] [build scripts] don't put same modules related to javac2 tasks to both Java plugin and platform (IDEA-257865) When the same class is added to platform and a plugin, it may be loaded by different classloaders and it may lead to exceptions at runtime. There is no need to have intellij.java.guiForms.rt module in Java plugin since it's included to the platform anyway. And javac2.jar was kept in IDEA_HOME/lib for compatibility with Ant scripts produced by "Generate Ant Build" action. The new version (203.3) of "Ant Build Generation" plugin takes javac2.jar from plugins/java/lib so the JAR can be removed from the old location. GitOrigin-RevId: e3c874c53becee1f8c5858f2eebcb206eab8aaca --- .../org/jetbrains/intellij/build/BaseIdeaProperties.groovy | 6 ------ .../org/jetbrains/intellij/build/JavaPluginLayout.groovy | 1 - 2 files changed, 7 deletions(-) diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy index 0f65d0ee429e..48481793a190 100644 --- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy @@ -126,12 +126,6 @@ abstract class BaseIdeaProperties extends JetBrainsProductProperties { BaseIdeaProperties() { productLayout.mainJarName = "idea.jar" - //for compatibility with generated Ant build.xml files which refer to this file - productLayout.additionalPlatformJars. - putAll("javac2.jar", - ["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt", - "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8"]) - productLayout.additionalPlatformJars.put("resources.jar", "intellij.java.ide.resources") productLayout.platformLayoutCustomizer = { PlatformLayout layout -> diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy index a8b2d0c88ab4..43490bb6c54c 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy @@ -25,7 +25,6 @@ class JavaPluginLayout { ["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", - "intellij.java.guiForms.rt", "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8" ].each {