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 2015/10/01 09:16:56 UTC

[3/3] flink git commit: [hotfix] [build] Add joda-convert as a non-optional dependency, to fix Scala interoperability

[hotfix] [build] Add joda-convert as a non-optional dependency, to fix Scala interoperability


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

Branch: refs/heads/master
Commit: c04a770421c6e13273307d6aaf9de462c4398360
Parents: bfde1b7
Author: Stephan Ewen <se...@apache.org>
Authored: Wed Sep 30 14:51:07 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Oct 1 08:59:56 2015 +0200

----------------------------------------------------------------------
 flink-java/pom.xml | 5 +++++
 pom.xml            | 6 ++++++
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/c04a7704/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index 49e6099..c8f88f4 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -87,6 +87,11 @@ under the License.
 		</dependency>
 
 		<dependency>
+			<groupId>org.joda</groupId>
+			<artifactId>joda-convert</artifactId>
+		</dependency>
+
+		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>${guava.version}</version>

http://git-wip-us.apache.org/repos/asf/flink/blob/c04a7704/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 573e49c..6cdf7fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,6 +251,12 @@ under the License.
 				<version>2.5</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.joda</groupId>
+				<artifactId>joda-convert</artifactId>
+				<version>1.7</version>
+			</dependency>
+			
 			<!-- stax is pulled in different versions by different transitive dependencies-->
 			<dependency>
 				<groupId>stax</groupId>