[kafka] branch trunk updated: MINOR: Extract Gradle and its plugins versions into dependencies.gradle (#6648)

[ij...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ijuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 093a225  MINOR: Extract Gradle and its plugins versions into dependencies.gradle (#6648)
093a225 is described below

commit 093a22536fb9e970e12d8b186ea8ae18ad8bcca1
Author: Dejan Stojadinović <de...@users.noreply.github.com>
AuthorDate: Thu May 2 04:20:12 2019 +0200

    MINOR: Extract Gradle and its plugins versions into dependencies.gradle (#6648)
    
    Reviewers: Ismael Juma <is...@juma.me.uk>
---
 build.gradle               | 26 +++++++++++++-------------
 gradle/dependencies.gradle | 12 ++++++++++++
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9f449be..1b11786 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,16 +26,17 @@ buildscript {
     }
   }
   apply from: file('gradle/buildscript.gradle'), to: buildscript
+  apply from: "$rootDir/gradle/dependencies.gradle"
 
   dependencies {
     // For Apache Rat plugin to ignore non-Git files
-    classpath "org.ajoberstar.grgit:grgit-core:3.1.1"
-    classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
-    classpath 'org.scoverage:gradle-scoverage:2.5.0'
-    classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
-    classpath 'org.owasp:dependency-check-gradle:4.0.2'
-    classpath "com.diffplug.spotless:spotless-plugin-gradle:3.23.0"
-    classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.9"
+    classpath "org.ajoberstar.grgit:grgit-core:$versions.grgit"
+    classpath "com.github.ben-manes:gradle-versions-plugin:$versions.gradleVersionsPlugin"
+    classpath "org.scoverage:gradle-scoverage:$versions.scoveragePlugin"
+    classpath "com.github.jengelman.gradle.plugins:shadow:$versions.shadowPlugin"
+    classpath "org.owasp:dependency-check-gradle:$versions.owaspDepCheckPlugin"
+    classpath "com.diffplug.spotless:spotless-plugin-gradle:$versions.spotlessPlugin"
+    classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:$versions.spotbugsPlugin"
   }
 }
 
@@ -43,11 +44,10 @@ apply plugin: "com.diffplug.gradle.spotless"
 spotless {
   scala {
     target 'streams/**/*.scala'
-    scalafmt('1.5.1').configFile('checkstyle/.scalafmt.conf')
+    scalafmt("$versions.scalafmt").configFile('checkstyle/.scalafmt.conf')
   }
 }
 
-apply from: "$rootDir/gradle/dependencies.gradle"
 
 allprojects {
 
@@ -91,7 +91,7 @@ allprojects {
 }
 
 ext {
-  gradleVersion = "5.4.1"
+  gradleVersion = "$versions.gradle"
   minJavaVersion = "8"
   buildVersionFileName = "kafka-version.properties"
 
@@ -432,7 +432,7 @@ subprojects {
   checkstyle {
     configFile = new File(rootDir, "checkstyle/checkstyle.xml")
     configProperties = checkstyleConfigProperties("import-control.xml")
-    toolVersion = '8.20'
+    toolVersion = "$versions.checkstyle"
   }
 
   configure(checkstyleMain) {
@@ -448,7 +448,7 @@ subprojects {
   test.dependsOn('checkstyleMain', 'checkstyleTest')
 
   spotbugs {
-    toolVersion = '3.1.12'
+    toolVersion = "$versions.spotbugs"
     excludeFilter = file("$rootDir/gradle/spotbugs-exclude.xml")
     ignoreFailures = false
   }
@@ -467,7 +467,7 @@ subprojects {
     apply plugin: "jacoco"
 
     jacoco {
-      toolVersion = "0.8.3"
+      toolVersion = "$versions.jacoco"
     }
 
     // NOTE: Jacoco Gradle plugin does not support "offline instrumentation" this means that classes mocked by PowerMock
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index e9d1f69..28e35f2 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -52,9 +52,14 @@ versions += [
   apacheds: "2.0.0-M24",
   argparse4j: "0.7.0",
   bcpkix: "1.60",
+  checkstyle: "8.20",
+  gradle: "5.4.1",
+  gradleVersionsPlugin: "0.21.0",
+  grgit: "3.1.1",
   httpclient: "4.5.7",
   easymock: "4.0.2",
   jackson: "2.9.8",
+  jacoco: "0.8.3",
   jetty: "9.4.14.v20181114",
   jersey: "2.27",
   jmh: "1.21",
@@ -78,13 +83,20 @@ versions += [
   mavenArtifact: "3.6.0",
   metrics: "2.2.0",
   mockito: "2.23.4",
+  owaspDepCheckPlugin: "4.0.2",
   powermock: "2.0.0",
   reflections: "0.9.11",
   rocksDB: "5.15.10",
+  scalafmt: "1.5.1",
   scalatest: "3.0.5",
   scoverage: "1.3.1",
+  scoveragePlugin: "2.5.0",
+  shadowPlugin: "4.0.4",
   slf4j: "1.7.25",
   snappy: "1.1.7.2",
+  spotbugs: "3.1.12",
+  spotbugsPlugin: "1.6.9",
+  spotlessPlugin: "3.23.0",
   zkclient: "0.11",
   zookeeper: "3.4.13",
   zstd: "1.3.8-1"