From 447c9796629bb152d80f1e09503cfc53fd467655 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 24 Oct 2019 20:31:04 +0300
Subject: [PATCH] IDEA-CR-53917 use common `jsoup` lib and advance its version

GitOrigin-RevId: 657ca6ec26e16c3246e3b9358eb15334700a54b4
---
 .../intellij/build/CommunityLibraryLicenses.groovy    |  3 +--
 .../intellij/build/impl/BuiltInHelpPlugin.groovy      |  1 +
 .../built-in-help/intellij.platform.builtInHelp.iml   | 11 +----------
 3 files changed, 3 insertions(+), 12 deletions(-)

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 605981b8c479..3d7da65a3127 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -377,8 +377,7 @@ class CommunityLibraryLicenses {
                        license: "Simplified BSD License", licenseUrl: "https://opensource.org/licenses/BSD-2-Clause",
                        url: "http://json-schema.org/draft-07/schema#"),
     new LibraryLicense(name: "jsoup", libraryName: "jsoup", license: "MIT", url: "http://jsoup.org",
-                       licenseUrl: "http://jsoup.org/license",
-                       additionalLibraryNames: ["org.jsoup:jsoup:1.7.2"]),
+                       licenseUrl: "http://jsoup.org/license"),
     new LibraryLicense(name: "jsr305", libraryName: "jsr305", version: "snapshot", license: "BSD", url: "http://code.google.com/p/jsr-305/",
                        licenseUrl: "http://code.google.com/p/jsr-305/source/browse/trunk/ri/LICENSE"),
     new LibraryLicense(name: "JUnit", libraryName: "JUnit3", license: "CPL 1.0", url: "http://junit.org/"),
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.groovy
index 708102dd03e5..331558abc5ca 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.groovy
@@ -20,6 +20,7 @@ final class BuiltInHelpPlugin {
       mainJarName = "$productLowerCase-help.jar"
       directoryName = "${productName.replace(" ", "")}Help"
       excludeFromModule(moduleName, "com/jetbrains/builtInHelp/indexer/**")
+      doNotCopyModuleLibrariesAutomatically(["jsoup"])
       withGeneratedResources({ BuildContext context ->
         def helpModule = context.findRequiredModule(moduleName)
         def ant = context.ant
diff --git a/plugins/built-in-help/intellij.platform.builtInHelp.iml b/plugins/built-in-help/intellij.platform.builtInHelp.iml
index 1232089776d9..77c9f4a15396 100644
--- a/plugins/built-in-help/intellij.platform.builtInHelp.iml
+++ b/plugins/built-in-help/intellij.platform.builtInHelp.iml
@@ -104,18 +104,9 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="org.jsoup:jsoup:1.7.2" type="repository">
-        <properties maven-id="org.jsoup:jsoup:1.7.2" />
-        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.7.2/jsoup-1.7.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" name="commons-compress" level="project" />
+    <orderEntry type="library" name="jsoup" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
     <orderEntry type="module" module-name="intellij.xml.impl" />