Compare commits

...

3 Commits

Author SHA1 Message Date
Mend Renovate d85250695b
fix(deps): update org.jodd 2025-07-20 07:03:02 +00:00
Vladimir Sitnikov 4166b4b106 fix: replace deprecated dependencyProject.path with .path
Validate Gradle Wrapper / Validation (push) Has been cancelled Details
CI / Matrix Preparation (push) Has been cancelled Details
CI / Error Prone (JDK 17) (push) Has been cancelled Details
Release Drafter / Update Release Draft (push) Has been cancelled Details
CI / ${{ matrix.name }} (push) Has been cancelled Details
2025-07-20 09:57:32 +03:00
Vladimir Sitnikov d980ddf4c1 chore: trust -javadoc, -sources, and gradle:gradle artifacts
Validate Gradle Wrapper / Validation (push) Waiting to run Details
CI / Matrix Preparation (push) Waiting to run Details
CI / ${{ matrix.name }} (push) Blocked by required conditions Details
CI / Error Prone (JDK 17) (push) Waiting to run Details
Release Drafter / Update Release Draft (push) Waiting to run Details
Those artifacts are used by IDEs when downloading dependency sources.
2025-07-19 19:35:22 +03:00
5 changed files with 19 additions and 38 deletions

View File

@ -44,7 +44,7 @@ val platformProjects by extra {
setOf(
projects.src.bom,
projects.src.bomThirdparty,
).mapTo(mutableSetOf()) { it.dependencyProject }
).mapTo(mutableSetOf()) { it.path }
}
val notPublishedProjects by extra {
@ -62,35 +62,11 @@ val notPublishedProjects by extra {
projects.src.testkit,
projects.src.testkitWiremock,
projects.src.testServices,
).mapTo(mutableSetOf()) { it.dependencyProject }
).mapTo(mutableSetOf()) { it.path }
}
val publishedProjects by extra {
allprojects - notPublishedProjects
}
notPublishedProjects.forEach { project ->
if (project != rootProject) {
project.plugins.withId("maven-publish") {
throw IllegalStateException(
"Project ${project.path} is listed in notPublishedProjects, however it has maven-publish plugin applied. " +
"Please remove maven-publish plugin (e.g. replace build-logic.jvm-published-library with build-logic.jvm-library) or " +
"move the project to the list of published ones"
)
}
}
}
publishedProjects.forEach {project ->
project.afterEvaluate {
if (!pluginManager.hasPlugin("maven-publish")) {
throw IllegalStateException(
"Project ${project.path} is listed in publishedProjects, however it misses maven-publish plugin. " +
"Please add maven-publish plugin (e.g. replace build-logic.jvm-library with build-logic.jvm-published-library) or " +
"move the project to the list of notPublishedProjects"
)
}
}
allprojects.mapTo(mutableSetOf()) { it.path } - notPublishedProjects
}
val displayVersion by extra {
@ -116,7 +92,7 @@ tasks.validateBeforeBuildingReleaseArtifacts {
}
releaseArtifacts {
fromProject(projects.src.dist.dependencyProject.path)
fromProject(projects.src.dist.path)
previewSite {
into("rat")
from(tasks.rat) {

View File

@ -3,6 +3,11 @@
<configuration>
<verify-metadata>true</verify-metadata>
<verify-signatures>true</verify-signatures>
<trusted-artifacts>
<trust group="gradle" name="gradle"/>
<trust file=".*-javadoc[.]jar" regex="true"/>
<trust file=".*-sources[.]jar" regex="true"/>
</trusted-artifacts>
<ignored-keys>
<ignored-key id="995EFBF4A3D20BEB" reason="Key couldn't be downloaded from any key server"/>
</ignored-keys>

View File

@ -127,10 +127,10 @@ dependencies {
api("org.jetbrains.lets-plot:lets-plot-batik:4.1.0")
api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.5.0")
api("org.jetbrains:annotations:24.1.0")
api("org.jodd:jodd-core:5.0.13")
api("org.jodd:jodd-lagarto:5.0.13")
api("org.jodd:jodd-log:5.0.13")
api("org.jodd:jodd-props:5.0.13")
api("org.jodd:jodd-core:5.3.0")
api("org.jodd:jodd-lagarto:5.1.5")
api("org.jodd:jodd-log:5.1.6")
api("org.jodd:jodd-props:5.2.0")
api("org.jsoup:jsoup:1.17.1")
api("org.mongodb:mongo-java-driver:2.14.3")
api("org.mozilla:rhino:1.7.14")

View File

@ -23,10 +23,10 @@ description = "A platform that aligns versions of all JMeter components"
dependencies {
constraints {
val publishedProjects: Set<Project> by rootProject.extra
val platformProjects: Set<Project> by rootProject.extra
val publishedProjects: Set<String> by rootProject.extra
val platformProjects: Set<String> by rootProject.extra
(publishedProjects - platformProjects).forEach {
api(it)
api(project(it))
}
}
}

View File

@ -128,9 +128,9 @@ val populateLibs by tasks.registering {
doLast {
val deps = configurations.runtimeClasspath.get().resolvedConfiguration.resolvedArtifacts
// This ensures project exists, if project is renamed, names should be corrected here as wells
val launcherProject = projects.src.launcher.dependencyProject.path
val bshclientProject = projects.src.bshclient.dependencyProject.path
val jorphanProject = projects.src.jorphan.dependencyProject.path
val launcherProject = projects.src.launcher.path
val bshclientProject = projects.src.bshclient.path
val jorphanProject = projects.src.jorphan.path
listOf(libs, libsExt, binLibs).forEach {
it.filePermissions {
unix("rw-r--r--")