diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts index 46dae4c3fb3..e90b07747c2 100644 --- a/src/bom-thirdparty/build.gradle.kts +++ b/src/bom-thirdparty/build.gradle.kts @@ -82,8 +82,8 @@ dependencies { api("jcharts:jcharts:0.7.5") api("junit:junit:4.13.2") api("org.jetbrains:annotations:23.0.0") - api("org.jetbrains.lets-plot:lets-plot-batik:2.2.1") - api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:3.1.1") + api("org.jetbrains.lets-plot:lets-plot-batik:3.1.0") + api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.3.0") api("org.junit.jupiter:junit-jupiter:5.8.2") api("org.junit.jupiter:junit-jupiter-api:5.8.2") api("org.junit.jupiter:junit-jupiter-params:5.8.2") diff --git a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt index facfb6182f0..63ca5b42021 100644 --- a/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt +++ b/src/core/src/main/kotlin/org/apache/jmeter/threads/openmodel/gui/TargetRateChart.kt @@ -20,17 +20,17 @@ package org.apache.jmeter.threads.openmodel.gui import jetbrains.datalore.base.registration.Disposable import jetbrains.datalore.plot.MonolithicCommon import jetbrains.datalore.vis.swing.batik.DefaultPlotPanelBatik -import jetbrains.letsPlot.geom.geomLine -import jetbrains.letsPlot.intern.toSpec -import jetbrains.letsPlot.label.ggtitle -import jetbrains.letsPlot.letsPlot -import jetbrains.letsPlot.scale.scaleXTime -import jetbrains.letsPlot.theme import org.apache.jmeter.threads.openmodel.ThreadSchedule import org.apache.jmeter.threads.openmodel.ThreadScheduleStep import org.apache.jmeter.threads.openmodel.asSeconds import org.apache.jmeter.threads.openmodel.rateUnitFor import org.apiguardian.api.API +import org.jetbrains.letsPlot.geom.geomLine +import org.jetbrains.letsPlot.intern.toSpec +import org.jetbrains.letsPlot.label.ggtitle +import org.jetbrains.letsPlot.letsPlot +import org.jetbrains.letsPlot.scale.scaleXTime +import org.jetbrains.letsPlot.themes.theme import org.slf4j.LoggerFactory import java.awt.BorderLayout import java.util.concurrent.TimeUnit diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index e0e31144252..2b9c6c63f0d 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -2,25 +2,25 @@ 29371,annotations-23.0.0.jar 6806,apiguardian-api-1.1.2.jar 122176,asm-9.3.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 -112373,batik-codec-1.14.jar -8433,batik-constants-1.14.jar -330318,batik-css-1.14.jar -184487,batik-dom-1.14.jar -10238,batik-ext-1.14.jar -192087,batik-gvt-1.14.jar -11466,batik-i18n-1.14.jar -76875,batik-parser-1.14.jar -25876,batik-script-1.14.jar -6663,batik-shared-resources-1.14.jar -232734,batik-svg-dom-1.14.jar -227514,batik-svggen-1.14.jar -129300,batik-transcoder-1.14.jar -127477,batik-util-1.14.jar -33866,batik-xml-1.14.jar +582079,base-portable-jvm-3.1.0.jar +485898,batik-anim-1.16.jar +424607,batik-awt-util-1.16.jar +704905,batik-bridge-1.16.jar +112371,batik-codec-1.16.jar +8431,batik-constants-1.16.jar +330361,batik-css-1.16.jar +184060,batik-dom-1.16.jar +10239,batik-ext-1.16.jar +192085,batik-gvt-1.16.jar +11464,batik-i18n-1.16.jar +76872,batik-parser-1.16.jar +25198,batik-script-1.16.jar +6665,batik-shared-resources-1.16.jar +232734,batik-svg-dom-1.16.jar +227487,batik-svggen-1.16.jar +129300,batik-transcoder-1.16.jar +127485,batik-util-1.16.jar +33870,batik-xml-1.16.jar 113369,bsf-2.4.0.jar 389033,bsh-2.0b6.jar 912143,caffeine-2.9.3.jar @@ -94,8 +94,8 @@ 1492143,kotlinx-coroutines-core-jvm-1.6.1.jar 10026,kotlinx-coroutines-swing-1.6.1.jar 792176,kotlinx-html-jvm-0.7.3.jar -181223,lets-plot-batik-2.2.1.jar -4025480,lets-plot-common-2.2.1.jar +185204,lets-plot-batik-3.1.0.jar +4819710,lets-plot-common-3.1.0.jar 303443,log4j-1.2-api-2.17.2.jar 302511,log4j-api-2.17.2.jar 1811089,log4j-core-2.17.2.jar @@ -109,11 +109,11 @@ 65261,oro-2.0.8.jar 1308773,ph-commons-10.1.6.jar 530791,ph-css-6.5.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 +1235840,plot-api-jvm-4.3.0.jar +1138257,plot-base-portable-jvm-3.1.0.jar +1065661,plot-builder-portable-jvm-3.1.0.jar +206691,plot-common-portable-jvm-3.1.0.jar +893288,plot-config-portable-jvm-3.1.0.jar 11369,reactive-streams-1.0.3.jar 1383644,rhino-1.7.14.jar 1248250,rsyntaxtextarea-3.2.0.jar @@ -125,7 +125,7 @@ 2539,swing-extensions-visual-padding-0.1.3.jar 736051,tika-core-1.28.5.jar 1588025,tika-parsers-1.28.5.jar -174661,vis-svg-portable-jvm-2.2.1.jar +182638,vis-svg-portable-jvm-3.1.0.jar 3154938,xalan-2.7.2.jar 1446149,xercesImpl-2.12.2.jar 220536,xml-apis-1.4.01.jar diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 8fc357778a5..c2769d1058d 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -116,6 +116,9 @@ Summary