mirror of https://github.com/apache/jmeter.git
Compare commits
3 Commits
cd5552abdd
...
d85250695b
| Author | SHA1 | Date |
|---|---|---|
|
|
d85250695b | |
|
|
4166b4b106 | |
|
|
d980ddf4c1 |
|
|
@ -44,7 +44,7 @@ val platformProjects by extra {
|
||||||
setOf(
|
setOf(
|
||||||
projects.src.bom,
|
projects.src.bom,
|
||||||
projects.src.bomThirdparty,
|
projects.src.bomThirdparty,
|
||||||
).mapTo(mutableSetOf()) { it.dependencyProject }
|
).mapTo(mutableSetOf()) { it.path }
|
||||||
}
|
}
|
||||||
|
|
||||||
val notPublishedProjects by extra {
|
val notPublishedProjects by extra {
|
||||||
|
|
@ -62,35 +62,11 @@ val notPublishedProjects by extra {
|
||||||
projects.src.testkit,
|
projects.src.testkit,
|
||||||
projects.src.testkitWiremock,
|
projects.src.testkitWiremock,
|
||||||
projects.src.testServices,
|
projects.src.testServices,
|
||||||
).mapTo(mutableSetOf()) { it.dependencyProject }
|
).mapTo(mutableSetOf()) { it.path }
|
||||||
}
|
}
|
||||||
|
|
||||||
val publishedProjects by extra {
|
val publishedProjects by extra {
|
||||||
allprojects - notPublishedProjects
|
allprojects.mapTo(mutableSetOf()) { it.path } - 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"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val displayVersion by extra {
|
val displayVersion by extra {
|
||||||
|
|
@ -116,7 +92,7 @@ tasks.validateBeforeBuildingReleaseArtifacts {
|
||||||
}
|
}
|
||||||
|
|
||||||
releaseArtifacts {
|
releaseArtifacts {
|
||||||
fromProject(projects.src.dist.dependencyProject.path)
|
fromProject(projects.src.dist.path)
|
||||||
previewSite {
|
previewSite {
|
||||||
into("rat")
|
into("rat")
|
||||||
from(tasks.rat) {
|
from(tasks.rat) {
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,11 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<verify-metadata>true</verify-metadata>
|
<verify-metadata>true</verify-metadata>
|
||||||
<verify-signatures>true</verify-signatures>
|
<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-keys>
|
||||||
<ignored-key id="995EFBF4A3D20BEB" reason="Key couldn't be downloaded from any key server"/>
|
<ignored-key id="995EFBF4A3D20BEB" reason="Key couldn't be downloaded from any key server"/>
|
||||||
</ignored-keys>
|
</ignored-keys>
|
||||||
|
|
|
||||||
|
|
@ -127,10 +127,10 @@ dependencies {
|
||||||
api("org.jetbrains.lets-plot:lets-plot-batik:4.1.0")
|
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.lets-plot:lets-plot-kotlin-jvm:4.5.0")
|
||||||
api("org.jetbrains:annotations:24.1.0")
|
api("org.jetbrains:annotations:24.1.0")
|
||||||
api("org.jodd:jodd-core:5.0.13")
|
api("org.jodd:jodd-core:5.3.0")
|
||||||
api("org.jodd:jodd-lagarto:5.0.13")
|
api("org.jodd:jodd-lagarto:5.1.5")
|
||||||
api("org.jodd:jodd-log:5.0.13")
|
api("org.jodd:jodd-log:5.1.6")
|
||||||
api("org.jodd:jodd-props:5.0.13")
|
api("org.jodd:jodd-props:5.2.0")
|
||||||
api("org.jsoup:jsoup:1.17.1")
|
api("org.jsoup:jsoup:1.17.1")
|
||||||
api("org.mongodb:mongo-java-driver:2.14.3")
|
api("org.mongodb:mongo-java-driver:2.14.3")
|
||||||
api("org.mozilla:rhino:1.7.14")
|
api("org.mozilla:rhino:1.7.14")
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,10 @@ description = "A platform that aligns versions of all JMeter components"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
constraints {
|
constraints {
|
||||||
val publishedProjects: Set<Project> by rootProject.extra
|
val publishedProjects: Set<String> by rootProject.extra
|
||||||
val platformProjects: Set<Project> by rootProject.extra
|
val platformProjects: Set<String> by rootProject.extra
|
||||||
(publishedProjects - platformProjects).forEach {
|
(publishedProjects - platformProjects).forEach {
|
||||||
api(it)
|
api(project(it))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -128,9 +128,9 @@ val populateLibs by tasks.registering {
|
||||||
doLast {
|
doLast {
|
||||||
val deps = configurations.runtimeClasspath.get().resolvedConfiguration.resolvedArtifacts
|
val deps = configurations.runtimeClasspath.get().resolvedConfiguration.resolvedArtifacts
|
||||||
// This ensures project exists, if project is renamed, names should be corrected here as wells
|
// This ensures project exists, if project is renamed, names should be corrected here as wells
|
||||||
val launcherProject = projects.src.launcher.dependencyProject.path
|
val launcherProject = projects.src.launcher.path
|
||||||
val bshclientProject = projects.src.bshclient.dependencyProject.path
|
val bshclientProject = projects.src.bshclient.path
|
||||||
val jorphanProject = projects.src.jorphan.dependencyProject.path
|
val jorphanProject = projects.src.jorphan.path
|
||||||
listOf(libs, libsExt, binLibs).forEach {
|
listOf(libs, libsExt, binLibs).forEach {
|
||||||
it.filePermissions {
|
it.filePermissions {
|
||||||
unix("rw-r--r--")
|
unix("rw-r--r--")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue