You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2014/11/17 22:50:13 UTC
[2/2] incubator-flink git commit: [build] Manage version of joda-time
to prevent conflicts between dependencies.
[build] Manage version of joda-time to prevent conflicts between dependencies.
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/ae07abe3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/ae07abe3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/ae07abe3
Branch: refs/heads/master
Commit: ae07abe3781eb583774eab917953f31cf4925cd9
Parents: 06c259f
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Nov 17 22:07:09 2014 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Nov 17 22:07:09 2014 +0100
----------------------------------------------------------------------
pom.xml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/ae07abe3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2547279..35b70f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@ under the License.
<artifactId>jetty-util</artifactId>
<version>8.0.0.M1</version>
</dependency>
-
+
<!-- Make sure we use a consistent avro version throughout the project -->
<dependency>
<groupId>org.apache.avro</groupId>
@@ -208,7 +208,14 @@ under the License.
<artifactId>javassist</artifactId>
<version>3.18.1-GA</version>
</dependency>
-
+
+ <!-- joda time is pulled in different versions by different transitive dependencies-->
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.5</version>
+ </dependency>
+
<!-- stax is pulled in different versions by different transitive dependencies-->
<dependency>
<groupId>stax</groupId>