diff --git a/build.gradle.kts b/build.gradle.kts index 50ac4136f7..d34c1aa458 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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) { diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts index 454bfaf887..6925157838 100644 --- a/src/bom/build.gradle.kts +++ b/src/bom/build.gradle.kts @@ -23,10 +23,10 @@ description = "A platform that aligns versions of all JMeter components" dependencies { constraints { - val publishedProjects: Set by rootProject.extra - val platformProjects: Set by rootProject.extra + val publishedProjects: Set by rootProject.extra + val platformProjects: Set by rootProject.extra (publishedProjects - platformProjects).forEach { - api(it) + api(project(it)) } } } diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts index 8ac383a052..40cf7b67b9 100644 --- a/src/dist/build.gradle.kts +++ b/src/dist/build.gradle.kts @@ -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--")