jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vladimirsitni...@apache.org
Subject [jmeter] 01/01: Update to never darklaf
Date Sun, 16 Feb 2020 21:37:43 GMT
This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch darklaf
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 7beabb6f0f1ebf4a2bdde9aa3552eed4f68794e7
Author: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
AuthorDate: Mon Feb 17 00:37:21 2020 +0300

    Update to never darklaf
---
 checksum.xml              | 1 +
 gradle.properties         | 2 +-
 settings.gradle.kts       | 7 ++++++-
 src/bom/build.gradle.kts  | 2 +-
 src/core/build.gradle.kts | 2 +-
 src/dist/build.gradle.kts | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 7e4d5d1..ef62171 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -8,6 +8,7 @@
     <trusted-key id='c9fbaa83a8753994' group='com.fasterxml.jackson.core' />
     <trusted-key id='4c00043bec5cb7cb' group='com.fifesoft' />
     <trusted-key id='af10873874630863' group='com.flipkart.zjsonpatch' />
+    <trusted-key id='379ce192d401ab61' group='com.formdev' />
     <trusted-key id='105cb91cac2aee0e' group='com.github.autostyle' />
     <trusted-key id='3c0a8f4744f37328' group='com.github.ben-manes.caffeine' />
     <trusted-key id='8ea48d105232855d' group='com.github.jknack' />
diff --git a/gradle.properties b/gradle.properties
index 110aa79..a8ef79e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -67,7 +67,7 @@ commons-net.version=3.6
 commons-pool2.version=2.7.0
 commons-text.version=1.8
 darcula.version=e208efb96f70e4be9dc362fbb46f6e181ef501dd
-darklaf.version=1.3.3.4
+darklaf-core.version=1.3.3.4
 dec.version=0.1.2
 dnsjava.version=2.1.9
 equalsverifier.version=3.1.9
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1132fdf..4d12faa 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -145,5 +145,10 @@ apply(plugin = "com.github.vlsi.checksum-dependency")
 // This enables to try local Autostyle
 property("localAutostyle")?.ifBlank { "../autostyle" }?.let {
     println("Importing project '$it'")
-    includeBuild("../autostyle")
+    includeBuild(it)
+}
+
+property("localAutostyle")?.ifBlank { "../darklaf" }?.let {
+    println("Importing project '$it'")
+    includeBuild(it)
 }
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 0102210..11580e8 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
         runtimev("org.apache.tika:tika-parsers", "tika")
         runtimev("org.ow2.asm:asm")
         runtimev("com.github.bulenkov.darcula:darcula")
-        apiv("com.github.weisj:darklaf")
+        apiv("com.github.weisj:darklaf-core")
 
         // activemq-all should not be used as it provides secondary slf4j binding
         runtimev("org.apache.activemq:activemq-broker", "activemq")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index d37d8bb..d156709 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     api(project(":src:jorphan"))
     testCompile(project(":src:jorphan", "testClasses"))
 
-    implementation("com.github.weisj:darklaf")
+    implementation("com.github.weisj:darklaf-core")
     api("bsf:bsf") {
         because("protected BSFManager BSFTestElement#getManager()")
     }
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 797792e..b7398b5 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -76,7 +76,7 @@ dependencies {
             It just looks good, however Darcula is not used explicitly,
              so the dependency is added for distribution only""".trimIndent())
     }
-    runtimeOnly("com.github.weisj:darklaf")
+    runtimeOnly("com.github.weisj:darklaf-core")
 
     binLicense(project(":src:licenses", "binLicense"))
     srcLicense(project(":src:licenses", "srcLicense"))


Mime
View raw message