From b6f94aec5d7afefa025052ca26d054cfccd2725b Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 3 Oct 2019 14:21:19 +0300 Subject: [PATCH] build scripts: remove unnecessary 'attachedTo' property for LibraryLicense descriptions There is no need to specify it for libraries which are added as regular dependencies, libraryName should be used instead. Added test which checks that 'attachedTo' isn't specified if 'libraryName' is present. GitOrigin-RevId: ab8c21151b2f900047eafaccc9d0ef339d626118 --- .../intellij/build/CommunityLibraryLicenses.groovy | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 eea1f8befc8a..1c3f29af07d1 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -164,8 +164,7 @@ class CommunityLibraryLicenses { url: "http://bouncycastle.org", licenseUrl: "http://bouncycastle.org/licence.html"), new LibraryLicense(name: "CGLib", libraryName: "CGLIB", version: "2.2.2", license: "Apache", url: "http://cglib.sourceforge.net/", licenseUrl: "http://www.apache.org/foundation/licence-FAQ.html"), - new LibraryLicense(libraryName: "change-reminder-prediction-model", attachedTo: "intellij.vcs.changeReminder", version: "0.0.11", - license: "Apache 2.0"), + new LibraryLicense(libraryName: "change-reminder-prediction-model", version: "0.0.11", license: "Apache 2.0"), new LibraryLicense(name: "classworlds", libraryName: "Maven", version: "1.1", license: "codehaus", url: "https://github.com/codehaus/classworlds", licenseUrl: "https://github.com/codehaus/classworlds/blob/master/classworlds/LICENSE.txt"), @@ -227,7 +226,7 @@ class CommunityLibraryLicenses { new LibraryLicense(name: "Gant", version: "1.9.8", libraryName: "gant-groovy", license: "Apache 2.0", url: "https://github.com/codehaus/gant", licenseUrl: "https://github.com/codehaus/gant/blob/master/LICENCE.txt"), - new LibraryLicense(name: "Gherkin", libraryName: "gherkin", attachedTo: "intellij.cucumber.java", version: "2.12.2", license: "MIT", + new LibraryLicense(name: "Gherkin", libraryName: "gherkin", version: "2.12.2", license: "MIT", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/cucumber/gherkin"), new LibraryLicense(name: "Gherkin keywords", attachedTo: "intellij.gherkin", version: "2.12.2", license: "MIT", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/cucumber/gherkin"), @@ -397,7 +396,7 @@ class CommunityLibraryLicenses { url: "https://github.com/lz4/lz4-java", licenseUrl: "https://github.com/lz4/lz4-java/blob/master/LICENSE.txt"), 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", libraryName: "markdownj", attachedTo: "intellij.tasks.core", version: "", license: "BSD", + new LibraryLicense(name: "MarkdownJ", libraryName: "markdownj", version: "", license: "BSD", url: "https://github.com/myabc/markdownj", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php"), new LibraryLicense(name: "markdownj", libraryName: "markdownj", version: "0.4.2", license: "New BSD", url: "https://github.com/myabc/markdownj", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"), @@ -497,7 +496,7 @@ class CommunityLibraryLicenses { url: "https://github.com/kohsuke/rngom", licenseUrl: "http://www.opensource.org/licenses/mit-license.php"), new LibraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino", version: "1.7.10", license: "MPL 1.1", url: "http://www.mozilla.org/rhino/", licenseUrl: "http://www.mozilla.org/MPL/MPL-1.1.html"), - new LibraryLicense(libraryName: "RMI Stubs", attachedTo: "intellij.xslt.debugger.engine", license: "Apache 2.0", + new LibraryLicense(libraryName: "RMI Stubs", license: "Apache 2.0", url: "https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"), new LibraryLicense(name: "Roboto", attachedTo: "intellij.platform.resources", version: "1.100141", license: "Apache 2.0",