You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2016/05/09 22:38:16 UTC
kafka git commit: MINOR: Remove copyDependantTestLibs from jar
dependencies
Repository: kafka
Updated Branches:
refs/heads/trunk ff8580da6 -> 22c098b71
MINOR: Remove copyDependantTestLibs from jar dependencies
_copyDependantTestLibs_ was added temporarily as a dependency of _jar_ task to enable SASL system tests to be run with MiniKdc without changing the automated system test runs which run _gradlew clean jar_. Since the build target _systemTestLibs_ is already in Kafka build.gradle, the Confluent automated test runs can now run _gradlew clean systemTestLibs_ instead. This PR provides the final change to remove _copyDependantTestLibs_ from the _jar_ task. This should be committed only after the Confluent automated sytem test build script is updated, to avoid breaking any builds.
Author: Rajini Sivaram <ra...@googlemail.com>
Reviewers: Ismael Juma <is...@juma.me.uk>
Closes #430 from rajinisivaram/minor-systemtestlibs
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/22c098b7
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/22c098b7
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/22c098b7
Branch: refs/heads/trunk
Commit: 22c098b71b38d22a01e142716d5ac8ee3d07b9c6
Parents: ff8580d
Author: Rajini Sivaram <ra...@googlemail.com>
Authored: Mon May 9 23:36:22 2016 +0100
Committer: Ismael Juma <is...@juma.me.uk>
Committed: Mon May 9 23:36:22 2016 +0100
----------------------------------------------------------------------
build.gradle | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/22c098b7/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 06c41d5..ab47bce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -437,10 +437,6 @@ project(':core') {
duplicatesStrategy 'exclude'
}
- systemTestLibs {
- dependsOn testJar
- }
-
task genProtocolErrorDocs(type: JavaExec) {
classpath = sourceSets.main.runtimeClasspath
main = 'org.apache.kafka.common.protocol.Errors'
@@ -521,7 +517,7 @@ project(':core') {
}
jar {
- dependsOn('copyDependantLibs', 'copyDependantTestLibs')
+ dependsOn('copyDependantLibs')
}
jar.manifest {
@@ -538,6 +534,8 @@ project(':core') {
duplicatesStrategy 'exclude'
}
+ systemTestLibs.dependsOn('jar', 'testJar', 'copyDependantTestLibs')
+
checkstyle {
configProperties = [importControlFile: "$rootDir/checkstyle/import-control-core.xml"]
}