diff --git a/.idea/libraries/markdown4j.xml b/.idea/libraries/markdown4j.xml new file mode 100644 index 000000000000..9148f44df00d --- /dev/null +++ b/.idea/libraries/markdown4j.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/markdown4j_2_2.xml b/.idea/libraries/markdown4j_2_2.xml deleted file mode 100644 index 2cbc253861b2..000000000000 --- a/.idea/libraries/markdown4j_2_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/lib/markdown4j-2.2.jar b/lib/markdown4j-2.2.jar deleted file mode 100644 index 65030fa08205..000000000000 Binary files a/lib/markdown4j-2.2.jar and /dev/null differ 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 262a804590ca..64ac13560104 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -226,7 +226,7 @@ class CommunityLibraryLicenses { licenseUrl: "http://opensource.org/licenses/mit-license.php"), new LibraryLicense(name: "lz4-java", libraryName: "lz4-java", version: "1.3", license: "Apache 2.0", url: "https://github.com/lz4/lz4-java", licenseUrl: "https://github.com/lz4/lz4-java/blob/master/LICENSE.txt"), - new LibraryLicense(name: "markdown4j", libraryName: "markdown4j-2.2", version: "2.2", license: "New BSD", + new LibraryLicense(name: "markdown4j", libraryName: "markdown4j", version: "2.2", license: "New BSD", url: "https://code.google.com/p/markdown4j/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"), new LibraryLicense(name: "markdownj", attachedTo: "intellij.tasks.core", version: "", license: "BSD", url: "https://github.com/myabc/markdownj", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php"), diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy index 9cd610bfbf28..c6e004f49c94 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy @@ -1,6 +1,4 @@ -/* - * Copyright 2000-2017 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-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.jetbrains.intellij.build.python import org.jetbrains.intellij.build.BuildContext @@ -31,7 +29,7 @@ class PythonCommunityPluginModules { static PluginLayout pythonCommunityPluginLayout(@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) { pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", "intellij.python.community.plugin.buildPatches", COMMUNITY_MODULES) { - withProjectLibrary("markdown4j-2.2") // Required for ipnb + withProjectLibrary("markdown4j") // Required for ipnb PYCHARM_ONLY_PLUGIN_MODULES.each { module -> excludeFromModule(module, "META-INF/plugin.xml") } diff --git a/python/ipnb/intellij.python.ipnb.iml b/python/ipnb/intellij.python.ipnb.iml index 35433963f680..e01f481006ce 100644 --- a/python/ipnb/intellij.python.ipnb.iml +++ b/python/ipnb/intellij.python.ipnb.iml @@ -24,7 +24,6 @@ - @@ -36,5 +35,6 @@ + \ No newline at end of file