This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new a5a4bcee19 fix(deps): update com.github.weisj to 3.1.1
a5a4bcee19 is described below
commit a5a4bcee19d0f49248be3b36b47f2eb28bf5a28c
Author: Mend Renovate <[email protected]>
AuthorDate: Mon Oct 27 17:23:59 2025 +0000
fix(deps): update com.github.weisj to 3.1.1
---
gradle/verification-keyring.keys | 20 ++++++++++++++++
gradle/verification-metadata.xml | 2 +-
src/bom-thirdparty/build.gradle.kts | 9 ++++---
src/core/build.gradle.kts | 1 -
.../main/java/org/apache/jmeter/SplashScreen.java | 2 +-
.../jmeter/gui/action/LookAndFeelCommand.java | 2 +-
.../org/apache/jmeter/gui/util/JMeterToolBar.java | 2 +-
src/dist/src/dist/expected_release_jars.csv | 26 +++++++++++---------
src/licenses/build.gradle.kts | 5 ----
src/licenses/licenses/svgSalamander/LICENSE | 28 ----------------------
10 files changed, 43 insertions(+), 54 deletions(-)
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 506b434908..1d206cb0bf 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -5591,6 +5591,26 @@ Dhufgi7JAJ9s7DMysnT2e4S6/VitgWdoI9iCfA==
=P/a4
-----END PGP PUBLIC KEY BLOCK-----
+pub 2E2A3AECF13B25AC
+uid Jannis Weis (OSS Signing) <[email protected]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGhj2dEBEADI1JT9QJwJ3GyDF361DPVEfO7+A3IVHAgY73aVNvaA++5+puCq
+rGaAnrVYl3hxG0CLg9AiiIFubHNdXXUj4uYvDcL4JxNsEq7l/u2ut6LJho8CBcKq
+yKgJYZNUm6BjlW7nV6fcE2XYVcIPHoKB23q+CLhERk1chtMTYlg6LcoHWcOA4a6A
+nY8Wc2fbwGTpVB5yKqSU8Xg88nTaANdTH+qy0FiWvvVmRxtXm+oFgEMY8r8VZvlM
+9oOB3m21i2a9yFPB4emqcJsDrguwmkzDYtHmjhfieGxv/eJOCMUMuKW+0/qWoEv4
+Myg0wd1gzDbv2qY9bOn2A8TIHwYFmvQMi1xC0J3dx1M474+tk/CiZzwzHJ80cMUF
+cq7eWeBJGg+urKBYG1NniWrSli/WvwlcWElwlyXslvZrjiO9ntNUF0vHxjmQxXtw
+y99n6U2CTnMa20vVB7V0EiKGT7BM+NOYUzbR7S+mvsF6KiYYA2gIBWlMPKFVleRf
+r8tn+dcgr+FOYMaj5kbHhzmwO0ujRGnZqUGVKqdXow/i580PHYhUXO9HKe+JzgPw
+NGeI6DQvAjPvXHoiwArTVOaLvxat3/jHYl0vaTqxkpWXpoblvULcxuQKn4ABg8EH
+UOydkq+ingfuZlrboais4CnnxX1p8isnFQz7QzeFRltNhmgIubgb/Yub4wARAQAB
+tC1KYW5uaXMgV2VpcyAoT1NTIFNpZ25pbmcpIDxvc3NAamFubmlzd2Vpcy5kZT4=
+=MLt7
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 2F45F85CDF082E68
uid Gregory Brail (Rhino Automated Builds) <[email protected]>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 58067a5faa..f1df8d9a56 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -7,7 +7,6 @@
<key-servers>
<key-server uri="https://keyserver.ubuntu.com"/>
<key-server uri="https://keys.openpgp.org"/>
- <key-server uri="https://pgp.mit.edu"/>
</key-servers>
<trusted-artifacts>
<trust group="gradle" name="gradle"/>
@@ -26,6 +25,7 @@
<trusting group="com.thoughtworks.xstream"/>
<trusting group="io.github.x-stream"/>
</trusted-key>
+ <trusted-key id="066C167DC7BA919F2E168DFA2E2A3AECF13B25AC"
group="com.github.weisj"/>
<trusted-key id="06D34ED6FF73DE368A772A781063FE98BCECB758"
group="com.puppycrawl.tools"/>
<trusted-key id="077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0"
group="^org[.]apache[.]logging($|([.].*))" regex="true"/>
<trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5"
group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
diff --git a/src/bom-thirdparty/build.gradle.kts
b/src/bom-thirdparty/build.gradle.kts
index 8314c72417..c6ce5d3aa4 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -46,12 +46,11 @@ dependencies {
api("com.fasterxml.jackson.core:jackson-core:2.16.1")
api("com.fasterxml.jackson.core:jackson-databind:2.16.1")
api("com.fifesoft:rsyntaxtextarea:3.3.4")
- api("com.formdev:svgSalamander:1.1.4")
api("com.github.ben-manes.caffeine:caffeine:2.9.3")
- api("com.github.weisj:darklaf-core:2.7.3")
- api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4")
- api("com.github.weisj:darklaf-property-loader:2.7.3")
- api("com.github.weisj:darklaf-theme:2.7.3")
+ api("com.github.weisj:darklaf-core:3.1.1")
+ api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.4.1")
+ api("com.github.weisj:darklaf-property-loader:3.1.1")
+ api("com.github.weisj:darklaf-theme:3.1.1")
api("com.google.auto.service:auto-service-annotations:1.1.1")
api("com.google.auto.service:auto-service:1.1.1")
api("com.google.errorprone:error_prone_annotations:2.24.0")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 4f0b2239ce..d8bef3e9fc 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -85,7 +85,6 @@ dependencies {
implementation("com.fasterxml.jackson.core:jackson-annotations")
implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-databind")
- implementation("com.formdev:svgSalamander")
implementation("com.github.ben-manes.caffeine:caffeine")
implementation("com.github.weisj:darklaf-core")
implementation("com.github.weisj:darklaf-theme")
diff --git a/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
b/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
index b3326bb221..d7cfa8005e 100644
--- a/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
+++ b/src/core/src/main/java/org/apache/jmeter/SplashScreen.java
@@ -34,7 +34,7 @@ import org.apache.jmeter.util.JMeterUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.github.weisj.darklaf.icons.ThemedSVGIcon;
+import com.github.weisj.darklaf.properties.icons.ThemedSVGIcon;
/**
* Splash Screen
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
index 0821b8a05d..be7f62c379 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
@@ -202,7 +202,7 @@ public class LookAndFeelCommand extends AbstractAction {
}
public static boolean isDarklafTheme() {
- return "Darklaf".equalsIgnoreCase(UIManager.getLookAndFeel().getID());
// $NON-NLS-1$
+ return LafManager.isInstalled();
}
public static boolean isDark() {
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
index d30bc318a7..801f626ab1 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
@@ -41,7 +41,7 @@ import org.apache.jmeter.util.LocaleChangeListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.github.weisj.darklaf.icons.ThemedSVGIcon;
+import com.github.weisj.darklaf.properties.icons.ThemedSVGIcon;
import com.github.weisj.darklaf.ui.button.DarkButtonUI;
import kotlin.text.StringsKt;
diff --git a/src/dist/src/dist/expected_release_jars.csv
b/src/dist/src/dist/expected_release_jars.csv
index afaf841ffb..283887ad23 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -38,15 +38,20 @@
330333,commons-net-3.12.0.jar
152289,commons-pool2-2.12.1.jar
259876,commons-text-1.14.0.jar
-1547509,darklaf-core-2.7.3.jar
-20650,darklaf-extensions-rsyntaxarea-0.3.4.jar
-93477,darklaf-macos-2.7.3.jar
-8492,darklaf-native-utils-2.7.3.jar
-4049,darklaf-platform-base-2.7.3.jar
-98109,darklaf-property-loader-2.7.3.jar
-89456,darklaf-theme-2.7.3.jar
-69133,darklaf-utils-2.7.3.jar
-217795,darklaf-windows-2.7.3.jar
+36593,darklaf-compatibility-3.1.1.jar
+1497802,darklaf-core-3.1.1.jar
+20753,darklaf-extensions-rsyntaxarea-0.4.1.jar
+178278,darklaf-iconset-3.1.1.jar
+50670,darklaf-macos-3.1.1.jar
+10818,darklaf-native-utils-3.1.1.jar
+8900,darklaf-platform-base-3.1.1.jar
+23913,darklaf-platform-decorations-3.1.1.jar
+5741,darklaf-platform-preferences-3.1.1.jar
+116522,darklaf-property-loader-3.1.1.jar
+80886,darklaf-theme-3.1.1.jar
+14750,darklaf-theme-spec-3.1.1.jar
+62869,darklaf-utils-3.1.1.jar
+232074,darklaf-windows-3.1.1.jar
362793,datamodel-jvm-4.7.3.jar
98115,dec-0.1.2.jar
588267,dnsjava-3.6.3.jar
@@ -87,7 +92,7 @@
277582,json-path-2.8.0.jar
122808,json-smart-2.6.0.jar
473788,jsoup-1.17.1.jar
-511129,jsvg-1.3.0.jar
+723652,jsvg-2.0.0.jar
249924,jtidy-r938.jar
384581,junit-4.13.2.jar
43729,kotlin-logging-jvm-2.1.23.jar
@@ -134,7 +139,6 @@
5783933,Saxon-HE-12.9.jar
283536,serializer-2.7.3.jar
69908,slf4j-api-2.0.17.jar
-320794,svgSalamander-1.1.4.jar
10192,swing-extensions-laf-support-0.1.3.jar
2539,swing-extensions-visual-padding-0.1.3.jar
778543,tika-core-3.2.3.jar
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 6a0ef80a10..cad6668c4d 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -108,11 +108,6 @@ val gatherBinaryLicenses by
tasks.registering(GatherLicenseTask::class) {
expectedLicense = SpdxLicense.BSD_2_Clause
}
- overrideLicense("com.formdev:svgSalamander") {
- // See
https://github.com/blackears/svgSalamander/blob/d6b6fe9a8ece7d0e0e7aeb3de82f027a38a6fe25/www/license/license-bsd.txt
- effectiveLicense = SpdxLicense.BSD_3_Clause
- }
-
for (mig in listOf("com.miglayout:miglayout-core",
"com.miglayout:miglayout-swing")) {
overrideLicense(mig) {
expectedLicense = SimpleLicense("BSD",
uri("http://www.debian.org/misc/bsd.license";))
diff --git a/src/licenses/licenses/svgSalamander/LICENSE
b/src/licenses/licenses/svgSalamander/LICENSE
deleted file mode 100644
index eefe5f619c..0000000000
--- a/src/licenses/licenses/svgSalamander/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2010, Mark McKay
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of the JXLayer project nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
