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 9e8470dbb8 chore: bump Dokka to v2, and reduce Gradle daemon memory
consumption
9e8470dbb8 is described below
commit 9e8470dbb8cb21f3764097a94bb93c83071e8918
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Wed Oct 8 12:25:42 2025 +0300
chore: bump Dokka to v2, and reduce Gradle daemon memory consumption
Previously, Dokka (kotlin doc + javadoc) was running within Gradle Daemon
process,
so it required every Gradle Daemon to allocate lots of heap.
The change allows reducing heap consumption
---
build-logic/jvm/build.gradle.kts | 2 +-
.../kotlin/build-logic.dokka-javadoc.gradle.kts | 14 +++++--
gradle.properties | 6 ++-
gradle/verification-keyring.keys | 44 ++++++++++++++++++++++
gradle/verification-metadata.xml | 12 ++++--
5 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
index 899c13c156..d4edfc896d 100644
--- a/build-logic/jvm/build.gradle.kts
+++ b/build-logic/jvm/build.gradle.kts
@@ -27,5 +27,5 @@ dependencies {
api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.22")
- api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.10")
+
api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.0.0")
}
diff --git
a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
index 1be932a573..096cdc37f8 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
@@ -17,7 +17,7 @@
plugins {
id("java-base")
- id("org.jetbrains.dokka")
+ id("org.jetbrains.dokka-javadoc")
}
java {
@@ -30,15 +30,21 @@ tasks.named<Jar>("javadocJar") {
archiveClassifier.set("javadoc_java")
}
-tasks.dokkaJavadoc {
- moduleName.set("Apache JMeter ${project.name}")
+dokka {
+ moduleName = "Apache JMeter ${project.name}"
+ dokkaGeneratorIsolation = ProcessIsolation {
+ maxHeapSize = "2g"
+ }
+}
+
+tasks.dokkaGeneratePublicationJavadoc {
mustRunAfter("kaptKotlin")
}
val dokkaJar by tasks.registering(Jar::class) {
group = LifecycleBasePlugin.BUILD_GROUP
description = "Assembles a jar archive containing javadoc"
- from(tasks.dokkaJavadoc)
+ from(tasks.dokkaGeneratePublicationJavadoc)
archiveClassifier.set("javadoc")
}
diff --git a/gradle.properties b/gradle.properties
index c5f97deb25..22f90ee6b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.gradle.jvmargs=-Xmx1500m -XX:MaxMetaspaceSize=768m
+org.gradle.jvmargs=-Xms128m -Xmx768m -XX:MaxMetaspaceSize=768m
org.gradle.parallel=true
# Build cache can be disabled with --no-build-cache option
org.gradle.caching=true
@@ -24,6 +24,10 @@ org.gradle.dependency.verification.console=verbose
kapt.include.compile.classpath=false
+# Kotlin Dokka is experemental, and we want silence the build warning
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
# See https://github.com/gradle/gradle/pull/11358 ,
https://issues.apache.org/jira/browse/INFRA-14923
# repository.apache.org does not yet support .sha256 and .sha512 checksums
systemProp.org.gradle.internal.publish.checksums.insecure=true
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index e64b12bae3..e38624dc12 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -3946,6 +3946,50 @@ f2vHkgXOGMk=
=2bDb
-----END PGP PUBLIC KEY BLOCK-----
+pub 0C0A9468268C79AE
+uid JetBrains Markdown <[email protected]>
+
+sub FA258103C03E2F42
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=M/EH
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 0D3B328562A119A7
uid Aleksey Shipilev <[email protected]>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 80f4620181..a97892498b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -207,6 +207,7 @@
<trusting group="org.apache.commons"/>
<trusting group="org.xmlunit"/>
</trusted-key>
+ <trusted-key id="CFBE6E7934FB211224EE1C2B0C0A9468268C79AE"
group="org.jetbrains"/>
<trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161"
group="org.testcontainers"/>
<trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E">
<trusting group="com.github.autostyle"/>
@@ -503,9 +504,14 @@
<sha256
value="fffe835e7088d5be855fc722770388d403b416e4d145696b1d56fdd1395e0617"
origin="Generated by Gradle" reason="PGP signature verification failed!"/>
</artifact>
</component>
- <component group="org.jetbrains.dokka"
name="org.jetbrains.dokka.gradle.plugin" version="1.9.10">
- <artifact name="org.jetbrains.dokka.gradle.plugin-1.9.10.pom">
- <sha256
value="27bb52753f97b2cbedd5ad72e111e05e53e0b08a4d22a2aaa80069df5d527ae1"
origin="Generated by Gradle" reason="Artifact is not signed"/>
+ <component group="org.jetbrains.dokka"
name="org.jetbrains.dokka.gradle.plugin" version="2.0.0">
+ <artifact name="org.jetbrains.dokka.gradle.plugin-2.0.0.pom">
+ <sha256
value="e1fc686a01837e7e86291185901507ffeaf794b8a9ec947b5d04368fa70e00ca"
origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
+ <component group="org.jetbrains.dokka-javadoc"
name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.0.0">
+ <artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.0.0.pom">
+ <sha256
value="9f7c10804ddd447174153f009f8b1b1b65b712a6bec0dd57e5faf8a20c9ac807"
origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.jetbrains.gradle.plugin.idea-ext"
name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.7">
