diff --git a/gradle.properties b/gradle.properties index f5c262fbae2..316e3cb8338 100644 --- a/gradle.properties +++ b/gradle.properties @@ -113,8 +113,8 @@ jsoup.version=1.14.1 jtidy.version=r938 junit4.version=4.13.2 junit5.version=5.8.1 -lets-plot-batik.version=2.2.0 -lets-plot-kotlin-jvm.version=3.1.0 +lets-plot-batik.version=2.2.1 +lets-plot-kotlin-jvm.version=3.1.1 log4j.version=2.16.0 mail.version=1.5.0-b01 miglayout.version=5.3 diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index ee47255c6bf..45536e62a52 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -2,7 +2,7 @@ 29371,annotations-23.0.0.jar 2387,apiguardian-api-1.1.0.jar 122004,asm-9.2.jar -517353,base-portable-jvm-2.2.0.jar +518460,base-portable-jvm-2.2.1.jar 485809,batik-anim-1.14.jar 424624,batik-awt-util-1.14.jar 703757,batik-bridge-1.14.jar @@ -92,8 +92,8 @@ 22357,kotlin-stdlib-jdk7-1.6.0.jar 16201,kotlin-stdlib-jdk8-1.6.0.jar 792176,kotlinx-html-jvm-0.7.3.jar -191102,lets-plot-batik-2.2.0.jar -3995999,lets-plot-common-2.2.0.jar +181223,lets-plot-batik-2.2.1.jar +4025480,lets-plot-common-2.2.1.jar 207909,log4j-1.2-api-2.16.0.jar 301892,log4j-api-2.16.0.jar 1789565,log4j-core-2.16.0.jar @@ -107,11 +107,11 @@ 65261,oro-2.0.8.jar 1307434,ph-commons-10.1.2.jar 506616,ph-css-6.3.4.jar -640740,plot-api-jvm-3.1.0.jar -882161,plot-base-portable-jvm-2.2.0.jar -847234,plot-builder-portable-jvm-2.2.0.jar -115295,plot-common-portable-jvm-2.2.0.jar -744679,plot-config-portable-jvm-2.2.0.jar +642167,plot-api-jvm-3.1.1.jar +891618,plot-base-portable-jvm-2.2.1.jar +845777,plot-builder-portable-jvm-2.2.1.jar +116030,plot-common-portable-jvm-2.2.1.jar +749095,plot-config-portable-jvm-2.2.1.jar 11369,reactive-streams-1.0.3.jar 1315838,rhino-1.7.13.jar 1242230,rsyntaxtextarea-3.1.3.jar @@ -123,7 +123,7 @@ 2539,swing-extensions-visual-padding-0.1.3.jar 734528,tika-core-1.27.jar 1397879,tika-parsers-1.27.jar -173926,vis-svg-portable-jvm-2.2.0.jar +174661,vis-svg-portable-jvm-2.2.1.jar 3154938,xalan-2.7.2.jar 1386502,xercesImpl-2.12.1.jar 220536,xml-apis-1.4.01.jar diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts index 67115faa3fe..05d5a27a889 100644 --- a/src/licenses/build.gradle.kts +++ b/src/licenses/build.gradle.kts @@ -135,24 +135,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) { expectedLicense = SpdxLicense.MIT } - for ( - a in listOf( - "lets-plot-kotlin-jvm", - "lets-plot-common", - "plot-config-portable-jvm", - "plot-builder-portable-jvm", - "plot-base-portable-jvm", - "plot-common-portable-jvm", - "vis-svg-portable-jvm", - "base-portable-jvm" - ) - ) { - overrideLicense("org.jetbrains.lets-plot:$a") { - expectedLicense = SpdxLicense.MIT - licenseFiles = "lets-plot" - } - } - overrideLicense("com.sun.mail:all:1.5.0-b01") { // Multiple licenses, specify explicitly expectedLicense = SimpleLicense("CDDL", uri("http://www.sun.com/cddl")) and SimpleLicense("GPLv2+CE", uri("https://glassfish.java.net/public/CDDL+GPL_1_1.html")) diff --git a/src/licenses/licenses/lets-plot/LICENSE b/src/licenses/licenses/lets-plot/LICENSE deleted file mode 100644 index 1bcc8b5941d..00000000000 --- a/src/licenses/licenses/lets-plot/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 JetBrains - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.