root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Vladimir Sitnikov 2025-07-19 19:19:35 +03:00
parent d980ddf4c1
commit 4166b4b106
3 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build.gradle.kts
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) {

6
src/bom/build.gradle.kts
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))
}
}
}

6
src/dist/build.gradle.kts vendored
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--")