From a276f51a073d527222ec700362f9cb57cc48395e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 21 May 2019 13:15:05 +0200
Subject: [PATCH] do not use the whole batik lib - use batik-transcoder (well,
 due not good design it is not possible to use only svg decoder and full in
 non-util modules)

GitOrigin-RevId: 018fe446fca0c441bb99b149dee1aee2a6deb29d
---
 .idea/libraries/batik.xml                     | 10 ----
 .idea/libraries/batik_transcoder.xml          | 48 +++++++++++++++++++
 .../build/CommunityLibraryLicenses.groovy     |  4 +-
 .../intellij.platform.tests.iml               |  2 +-
 platform/util/intellij.platform.util.iml      |  2 +-
 .../apache/batik/script/InterpreterPool.java  |  5 ++
 .../batik/script/rhino/RhinoInterpreter.java  | 17 -------
 .../script/rhino/RhinoInterpreterFactory.java |  6 ---
 8 files changed, 58 insertions(+), 36 deletions(-)
 delete mode 100644 .idea/libraries/batik.xml
 create mode 100644 .idea/libraries/batik_transcoder.xml
 create mode 100644 platform/util/src/org/apache/batik/script/InterpreterPool.java
 delete mode 100644 platform/util/src/org/apache/batik/script/rhino/RhinoInterpreter.java
 delete mode 100644 platform/util/src/org/apache/batik/script/rhino/RhinoInterpreterFactory.java

diff --git a/.idea/libraries/batik.xml b/.idea/libraries/batik.xml
deleted file mode 100644
index 97e7b31c4be6..000000000000
--- a/.idea/libraries/batik.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="batik" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.apache.xmlgraphics:batik-all:1.11" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-all/1.11/batik-all-1.11.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/batik_transcoder.xml b/.idea/libraries/batik_transcoder.xml
new file mode 100644
index 000000000000..b53a66849b2c
--- /dev/null
+++ b/.idea/libraries/batik_transcoder.xml
@@ -0,0 +1,48 @@
+<component name="libraryTable">
+  <library name="batik-transcoder" type="repository">
+    <properties maven-id="org.apache.xmlgraphics:batik-transcoder:1.11">
+      <exclude>
+        <dependency maven-id="org.apache.xmlgraphics:xmlgraphics-commons" />
+        <dependency maven-id="org.apache.xmlgraphics:batik-script" />
+        <dependency maven-id="xalan:xalan" />
+        <dependency maven-id="xml-apis:xml-apis" />
+        <dependency maven-id="xml-apis:xml-apis-ext" />
+      </exclude>
+    </properties>
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-transcoder/1.11/batik-transcoder-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-anim/1.11/batik-anim-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-css/1.11/batik-css-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-ext/1.11/batik-ext-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-parser/1.11/batik-parser-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svg-dom/1.11/batik-svg-dom-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-awt-util/1.11/batik-awt-util-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-bridge/1.11/batik-bridge-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-dom/1.11/batik-dom-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-gvt/1.11/batik-gvt-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svggen/1.11/batik-svggen-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-util/1.11/batik-util-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-constants/1.11/batik-constants-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-i18n/1.11/batik-i18n-1.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-xml/1.11/batik-xml-1.11.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-transcoder/1.11/batik-transcoder-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-anim/1.11/batik-anim-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-css/1.11/batik-css-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-ext/1.11/batik-ext-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-parser/1.11/batik-parser-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svg-dom/1.11/batik-svg-dom-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-awt-util/1.11/batik-awt-util-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-bridge/1.11/batik-bridge-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-dom/1.11/batik-dom-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-gvt/1.11/batik-gvt-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svggen/1.11/batik-svggen-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-util/1.11/batik-util-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-constants/1.11/batik-constants-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-i18n/1.11/batik-i18n-1.11-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-xml/1.11/batik-xml-1.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index 2355ee134cc1..cae7a0d1bccd 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -131,8 +131,10 @@ class CommunityLibraryLicenses {
                        url: "http://joel-costigliola.github.io/assertj/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt"),
     new LibraryLicense(name: "Automaton", libraryName: "automaton", version: "1.12-1", license: "BSD",
                        url: "http://www.brics.dk/automaton/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php"),
-    new LibraryLicense(name: "batik", libraryName: "batik", version: "1.9.1", license: "Apache 2.0",
+
+    new LibraryLicense(name: "batik", libraryName: "batik-transcoder", version: "1.11", license: "Apache 2.0",
                        licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://xmlgraphics.apache.org/batik/"),
+
     new LibraryLicense(name: "bouncy-castle", version: "1.59", license: "MIT License", url: "http://bouncycastle.org",
                        licenseUrl: "http://bouncycastle.org/licence.html"),
     new LibraryLicense(name: "bouncy-castle-provider", version: "1.59", license: "MIT License", url: "http://bouncycastle.org",
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index f259b344fc3b..19539c7fba55 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -36,9 +36,9 @@
     <orderEntry type="library" scope="TEST" name="snakeyaml" level="project" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" scope="TEST" name="miglayout-swing" level="project" />
-    <orderEntry type="library" scope="TEST" name="batik" level="project" />
     <orderEntry type="library" scope="TEST" name="xmlgraphics-commons" level="project" />
     <orderEntry type="module" module-name="intellij.configurationScript" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.tests" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="batik-transcoder" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/util/intellij.platform.util.iml b/platform/util/intellij.platform.util.iml
index 1ac9feaa4ffc..aca87ac7ce51 100644
--- a/platform/util/intellij.platform.util.iml
+++ b/platform/util/intellij.platform.util.iml
@@ -22,11 +22,11 @@
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" name="imgscalr" level="project" />
     <orderEntry type="library" name="xmlgraphics-commons" level="project" />
-    <orderEntry type="library" name="batik" level="project" />
     <orderEntry type="library" name="lz4-java" level="project" />
     <orderEntry type="library" name="xml-apis-ext" level="project" />
     <orderEntry type="library" name="commons-compress" level="project" />
     <orderEntry type="library" name="Java Compatibility" level="project" />
+    <orderEntry type="library" name="batik-transcoder" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/platform/util/src/org/apache/batik/script/InterpreterPool.java b/platform/util/src/org/apache/batik/script/InterpreterPool.java
new file mode 100644
index 000000000000..cbc280ef2155
--- /dev/null
+++ b/platform/util/src/org/apache/batik/script/InterpreterPool.java
@@ -0,0 +1,5 @@
+// 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.
+package org.apache.batik.script;
+
+public final class InterpreterPool {
+}
diff --git a/platform/util/src/org/apache/batik/script/rhino/RhinoInterpreter.java b/platform/util/src/org/apache/batik/script/rhino/RhinoInterpreter.java
deleted file mode 100644
index 030170dee7e7..000000000000
--- a/platform/util/src/org/apache/batik/script/rhino/RhinoInterpreter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.
-package org.apache.batik.script.rhino;
-
-import org.apache.batik.script.ImportInfo;
-
-import java.net.URL;
-
-// A workaround for the class rename in Batik 1.10
-public class RhinoInterpreter extends org.apache.batik.bridge.RhinoInterpreter {
-  public RhinoInterpreter(URL documentURL) {
-    super(documentURL);
-  }
-
-  public RhinoInterpreter(URL documentURL, ImportInfo imports) {
-    super(documentURL, imports);
-  }
-}
diff --git a/platform/util/src/org/apache/batik/script/rhino/RhinoInterpreterFactory.java b/platform/util/src/org/apache/batik/script/rhino/RhinoInterpreterFactory.java
deleted file mode 100644
index fcf6d4f816eb..000000000000
--- a/platform/util/src/org/apache/batik/script/rhino/RhinoInterpreterFactory.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// 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.
-package org.apache.batik.script.rhino;
-
-// A workaround for the class rename in Batik 1.10
-public class RhinoInterpreterFactory extends org.apache.batik.bridge.RhinoInterpreterFactory {
-}