mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[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
This commit is contained in:
committed by
intellij-monorepo-bot
parent
2f7eb559d0
commit
49c587cb33
@@ -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 ->
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user