You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bahir.apache.org by lr...@apache.org on 2018/09/14 02:45:49 UTC
bahir-flink git commit: BAHIR-176: update flink to 1.6.0 and some
cleaning
Repository: bahir-flink
Updated Branches:
refs/heads/master c760e3cfb -> 8b1011803
BAHIR-176: update flink to 1.6.0 and some cleaning
Closes #31
Closes #32
Project: http://git-wip-us.apache.org/repos/asf/bahir-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/bahir-flink/commit/8b101180
Tree: http://git-wip-us.apache.org/repos/asf/bahir-flink/tree/8b101180
Diff: http://git-wip-us.apache.org/repos/asf/bahir-flink/diff/8b101180
Branch: refs/heads/master
Commit: 8b101180378da07e7a0944e26c624fc578ca799f
Parents: c760e3c
Author: Joao Boto <bo...@boto.pro>
Authored: Wed Aug 22 12:14:21 2018 +0200
Committer: Luciano Resende <lr...@apache.org>
Committed: Thu Sep 13 19:44:50 2018 -0700
----------------------------------------------------------------------
flink-connector-akka/pom.xml | 2 ++
pom.xml | 48 +++++++--------------------------------
2 files changed, 10 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/8b101180/flink-connector-akka/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connector-akka/pom.xml b/flink-connector-akka/pom.xml
index 3dab6b8..bd8bdc8 100644
--- a/flink-connector-akka/pom.xml
+++ b/flink-connector-akka/pom.xml
@@ -36,12 +36,14 @@ under the License.
<properties>
<mockito.version>1.10.19</mockito.version>
<akka.version>2.4.20</akka.version>
+ <junit.version>4.12</junit.version>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/8b101180/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f052045..80766be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,14 +87,17 @@
<!-- General project dependencies version -->
<java.version>1.8</java.version>
- <scala.version>2.11.8</scala.version>
+ <scala.version>2.11.12</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<slf4j.version>1.7.16</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<!-- Flink version -->
- <flink.version>1.5.1</flink.version>
+ <flink.version>1.6.0</flink.version>
+
+ <scalatest.version>2.2.6</scalatest.version>
+ <scalacheck.version>1.12.6</scalacheck.version> <!-- 1.13.0 appears incompatible with scalatest 2.2.6 -->
<PermGen>64m</PermGen>
<MaxPermGen>512m</MaxPermGen>
@@ -139,7 +142,6 @@
<dependencyManagement>
<dependencies>
-
<!-- Scala Related Dependencies -->
<dependency>
<groupId>org.scala-lang</groupId>
@@ -169,45 +171,13 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
- <version>2.2.6</version>
+ <version>${scalatest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.binary.version}</artifactId>
- <version>1.12.5</version> <!-- 1.13.0 appears incompatible with scalatest 2.2.6 -->
- <scope>test</scope>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
+ <version>${scalacheck.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -697,10 +667,8 @@
</build>
<profiles>
-
<profile>
<id>distribution</id>
-
<modules>
<module>distribution</module>
</modules>
@@ -711,7 +679,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <scala.version>2.11.8</scala.version>
+ <scala.version>2.11.12</scala.version>
<scala.binary.version>2.11</scala.binary.version>
</properties>
<build>