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
commit 4f4b22cb74af31c32bb1e610f8e0eed5f5fa2c5b Author: Vladimir Sitnikov <[email protected]> AuthorDate: Wed Oct 16 18:17:56 2019 +0300 Move Gradle plugin versions to gradle.properties, upgrade release plugins --- build.gradle.kts | 16 ++++++++-------- buildSrc/build.gradle.kts | 2 +- buildSrc/gradle.properties | 5 +++++ buildSrc/settings.gradle.kts | 16 +++++++++++++--- checksum.xml | 12 ++++++++++++ gradle.properties | 12 ++++++++++++ settings.gradle.kts | 23 ++++++++++++++++++++--- 7 files changed, 71 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 45d4a78..8fe2a75 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,14 +32,14 @@ plugins { java jacoco checkstyle - id("org.jetbrains.gradle.plugin.idea-ext") version "0.5" apply false - id("org.nosphere.apache.rat") version "0.5.2" - id("com.diffplug.gradle.spotless") version "3.24.3" - id("com.github.spotbugs") version "2.0.0" - id("org.sonarqube") version "2.7.1" - id("com.github.vlsi.crlf") version "1.33.0" - id("com.github.vlsi.ide") version "1.33.0" - id("com.github.vlsi.stage-vote-release") version "1.33.0" + id("org.jetbrains.gradle.plugin.idea-ext") apply false + id("org.nosphere.apache.rat") + id("com.diffplug.gradle.spotless") + id("com.github.spotbugs") + id("org.sonarqube") + id("com.github.vlsi.crlf") + id("com.github.vlsi.ide") + id("com.github.vlsi.stage-vote-release") signing publishing } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index f550654..8ef5291 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { java `kotlin-dsl` apply false - id("com.diffplug.gradle.spotless") version "3.24.3" + id("com.diffplug.gradle.spotless") } repositories { diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index 9ef49f2..4fdada6 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -15,3 +15,8 @@ org.gradle.parallel=true kotlin.code.style=official kotlin.parallel.tasks.in.project=true + +# Plugins +com.diffplug.gradle.spotless.version=3.24.3 +com.github.vlsi.checksum-dependency.sha512=A9064CB324A9F8936B897ADAEAABC759F8F61C27D1985D5DA87B5DB6B995D02D1F395ACD5D3BC1056CB652ABC5B99B7B110BFAD825D0C0A4819039A04F4D2CE +com.github.vlsi.checksum-dependency.version=1.34.0 diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index e704fea..fa8ccb4 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -16,6 +16,16 @@ * */ +val String.v: String get() = extra["$this.version"] as String + +fun PluginDependenciesSpec.idv(id: String) = id(id) version id.v + +pluginManagement { + plugins { + idv("com.diffplug.gradle.spotless") + } +} + include("batchtest") val upperCaseLetters = "\\p{Upper}".toRegex() @@ -36,7 +46,7 @@ for (project in rootProject.children) { buildscript { dependencies { - classpath("com.github.vlsi.gradle:checksum-dependency-plugin:1.29.0") { + classpath("com.github.vlsi.gradle:checksum-dependency-plugin:${settings.extra["com.github.vlsi.checksum-dependency.version"]}") { // Gradle ships kotlin-stdlib which is good enough exclude("org.jetbrains.kotlin", "kotlin-stdlib") } @@ -56,8 +66,8 @@ val expectedSha512 = mapOf( to "okhttp-4.1.0.jar", "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7" to "okio-2.2.2.jar", - "5C48E584427240305A72D7DCE8D3706FF9E4F421046CEA9521762D3BDC160E1E16BD6439EBA6E3428F10D95E8E2F9EDD727AE636ABBAC4DFD63B7E1E6E469B7" - to "checksum-dependency-plugin-1.29.0.jar" + settings.extra["com.github.vlsi.checksum-dependency.sha512"].toString() + to "checksum-dependency-plugin.jar" ) fun File.sha512(): String { diff --git a/checksum.xml b/checksum.xml index 139f5d4..27b7894 100644 --- a/checksum.xml +++ b/checksum.xml @@ -153,6 +153,9 @@ <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.33.0'> <sha512>8895959EBFEF1D14960AB48E393D64F86647C79D8FBAA938DF8020C0CC7F4CF8E895265F090D333C0F8D57C7E151F7F5CC23CCA9FB4E40EB7BD9433D0A6D4EA8</sha512> </dependency> + <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.34.0'> + <sha512>8B8C9E1324D5AE0D8655906DC1F0B30887FBB653AAEB795FCCEB1D204CDBD67B803D2B01D973DE3FC67316A38F2B13BA356B8A60BF401C41196B76D2420AD5F2</sha512> + </dependency> <dependency group='com.github.vlsi.gradle' module='ide-plugin' version='1.17.0'> <sha512>4321949B8201BA4F0E1F0D977397349C34DF84E4632DAFEE6F221F9AFA176FDD9497C9AFBE7F734E3423BE25351DCA7551F93181CC99A99A24EAAEB43BCBD544</sha512> </dependency> @@ -162,6 +165,9 @@ <dependency group='com.github.vlsi.gradle' module='ide-plugin' version='1.33.0'> <sha512>E8E0DF90F38DFADF3CB9D84D97FEA7189B1585FBCFACFC8B24E25A25C5B926D98C33064B3B38E4D4AD8CF837E0359EFD03F5CBB6B3EB29AE38B57AF705BF0268</sha512> </dependency> + <dependency group='com.github.vlsi.gradle' module='ide-plugin' version='1.34.0'> + <sha512>E8E0DF90F38DFADF3CB9D84D97FEA7189B1585FBCFACFC8B24E25A25C5B926D98C33064B3B38E4D4AD8CF837E0359EFD03F5CBB6B3EB29AE38B57AF705BF0268</sha512> + </dependency> <dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.17.0'> <sha512>E1EE1396B2838E03FB7C84667BD473BAB558569EB5F1C4CB9B7C6806FDC5C7DABC41AAB1705A0FE73FBDB11624F11A15D7394232F59AC1039EFA197FCB495E67</sha512> </dependency> @@ -171,6 +177,9 @@ <dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.33.0'> <sha512>819CC5E1C210254E7EC24B5FBF5D4F63901C50512A2252A333C6D815F8AB2C42A6A3FD942AE21CEAC769F9DA22660F4E7C6BD9F30AFF11E8377DFB932F1DAAB4</sha512> </dependency> + <dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.34.0'> + <sha512>819CC5E1C210254E7EC24B5FBF5D4F63901C50512A2252A333C6D815F8AB2C42A6A3FD942AE21CEAC769F9DA22660F4E7C6BD9F30AFF11E8377DFB932F1DAAB4</sha512> + </dependency> <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.17.0'> <sha512>575A87846F61717B2F220A485B67D253644980A0DD57C8EBD3F07C9D66E9B463115897BFE3364216445CAB4AA09EA4B27070ABA5BE7620A632A95BE3F414D464</sha512> </dependency> @@ -180,6 +189,9 @@ <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.33.0'> <sha512>F3F14D35990C5E05098692392DA61A1E77FD3859AA80CEDF8624A474CCBBBDA82AA37963773E118E17A51C3380F3571E27EEA013338457B062AE849494B3D30A</sha512> </dependency> + <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.34.0'> + <sha512>F3F14D35990C5E05098692392DA61A1E77FD3859AA80CEDF8624A474CCBBBDA82AA37963773E118E17A51C3380F3571E27EEA013338457B062AE849494B3D30A</sha512> + </dependency> <dependency group='commons-logging' module='commons-logging' version='1.0.4'> <sha512>C8D2D39A60ADCC49091D393DAF30473D1776E4B6B09BB86639171F660833A17AFBDC9F3E85843093535DA16FA664CD7CD4CA38F54E141018DD1B78DE681AD668</sha512> </dependency> diff --git a/gradle.properties b/gradle.properties index ae876f1..0433ca2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,6 +28,18 @@ jacoco.version=0.8.2 spotbugs.version=3.1.12 velocity.version=1.7 +# Plugins +com.diffplug.gradle.spotless.version=3.24.3 +com.github.spotbugs.version=2.0.0 +com.github.vlsi.checksum-dependency.sha512=A9064CB324A9F8936B897ADAEAABC759F8F61C27D1985D5DA87B5DB6B995D02D1F395ACD5D3BC1056CB652ABC5B99B7B110BFAD825D0C0A4819039A04F4D2CE +com.github.vlsi.checksum-dependency.version=1.34.0 +com.github.vlsi.crlf.version=1.34.0 +com.github.vlsi.ide.version=1.34.0 +com.github.vlsi.stage-vote-release.version=1.34.0 +org.jetbrains.gradle.plugin.idea-ext.version=0.5 +org.nosphere.apache.rat.version=0.5.2 +org.sonarqube.version=2.7.1 + # Dependencies accessors-smart.version=1.2 activemq.version=5.15.8 diff --git a/settings.gradle.kts b/settings.gradle.kts index c84961d..bc8cdf5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,23 @@ * */ +val String.v: String get() = extra["$this.version"] as String + +fun PluginDependenciesSpec.idv(id: String) = id(id) version id.v + +pluginManagement { + plugins { + idv("com.diffplug.gradle.spotless") + idv("com.github.spotbugs") + idv("com.github.vlsi.crlf") + idv("com.github.vlsi.ide") + idv("com.github.vlsi.stage-vote-release") + idv("org.jetbrains.gradle.plugin.idea-ext") + idv("org.nosphere.apache.rat") + idv("org.sonarqube") + } +} + // This is the name of a current project // Note: it cannot be inferred from the directory name as developer might clone JMeter to jmeter_tmp folder rootProject.name = "jmeter" @@ -79,7 +96,7 @@ if (property("localReleasePlugins").toBool(nullAs = false, blankAs = true, defau // Checksum plugin sources can be validated at https://github.com/vlsi/vlsi-release-plugins buildscript { dependencies { - classpath("com.github.vlsi.gradle:checksum-dependency-plugin:1.33.0") { + classpath("com.github.vlsi.gradle:checksum-dependency-plugin:${settings.extra["com.github.vlsi.checksum-dependency.version"]}") { // Gradle ships kotlin-stdlib which is good enough exclude("org.jetbrains.kotlin", "kotlin-stdlib") } @@ -99,8 +116,8 @@ val expectedSha512 = mapOf( to "okhttp-4.1.0.jar", "93E7A41BE44CC17FB500EA5CD84D515204C180AEC934491D11FC6A71DAEA761FB0EECEF865D6FD5C3D88AAF55DCE3C2C424BE5BA5D43BEBF48D05F1FA63FA8A7" to "okio-2.2.2.jar", - "A9064CB324A9F8936B897ADAEAABC759F8F61C27D1985D5DA87B5DB6B995D02D1F395ACD5D3BC1056CB652ABC5B99B7B110BFAD825D0C0A4819039A04F4D2CE" - to "checksum-dependency-plugin-1.33.0.jar" + settings.extra["com.github.vlsi.checksum-dependency.sha512"].toString() + to "checksum-dependency-plugin.jar" ) fun File.sha512(): String {
