kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ewe...@apache.org
Subject kafka git commit: KAFKA-5081: Force jackson-annotations to a single version matching expected Jackson version
Date Wed, 24 May 2017 05:07:22 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 516d8457d -> 90dc2d16f


KAFKA-5081: Force jackson-annotations to a single version matching expected Jackson version

**JIRA ticket:** [KAFKA-5081 two versions of jackson-annotations-xxx.jar in distribution tgz](https://issues.apache.org/jira/browse/KAFKA-5081)

**Solutions:**
1. accept this merge request **_OR_**
2. upgrade jackson libraries to version **_2.9.x_** (currently available as a pre-release
only)

**Related jackson issue:** [Add explicit \`jackson-annotations\` dependency version for \`jackson-databind\`](https://github.com/FasterXML/jackson-databind/issues/1545)

**Note:** previous (equivalent) merge request #2900 ended up deep in the sand with swarm of
messages due to flaky test, so I opted to close it and to open this one.

ijuma: FYI

Author: dejan2609 <dejan2609@gmail.com>

Reviewers: Ewen Cheslack-Postava <ewen@confluent.io>

Closes #3116 from dejan2609/KAFKA-5081


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/90dc2d16
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/90dc2d16
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/90dc2d16

Branch: refs/heads/trunk
Commit: 90dc2d16fbed59fc65e6e190380c8b9c43b6d95a
Parents: 516d845
Author: dejan2609 <dejan2609@gmail.com>
Authored: Tue May 23 22:07:17 2017 -0700
Committer: Ewen Cheslack-Postava <me@ewencp.org>
Committed: Tue May 23 22:07:17 2017 -0700

----------------------------------------------------------------------
 build.gradle | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/90dc2d16/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 1693723..56c643e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,6 +31,8 @@ buildscript {
   }
 }
 
+apply from: "$rootDir/gradle/dependencies.gradle"
+
 allprojects {
   apply plugin: 'idea'
   apply plugin: "jacoco"
@@ -55,6 +57,13 @@ allprojects {
         }
       }
     }
+    configurations {
+      runtime {
+        resolutionStrategy {
+          force "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson"
+        }
+      }
+    }
   }
 
   if (JavaVersion.current().isJava8Compatible()) {
@@ -91,7 +100,6 @@ ext {
   generatedDocsDir = new File("${project.rootDir}/docs/generated")
 }
 
-apply from: "$rootDir/gradle/dependencies.gradle"
 apply from: file('wrapper.gradle')
 
 if (new File('.git').exists()) {


Mime
View raw message