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 2019/08/26 14:51:01 UTC
[bahir-flink] branch master updated: [BAHIR-215] Bump flink version
to 1.9.0 (#65)
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
The following commit(s) were added to refs/heads/master by this push:
new cd18714 [BAHIR-215] Bump flink version to 1.9.0 (#65)
cd18714 is described below
commit cd18714d3b3fd115310d07f0696e4d9b196d5f5f
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Mon Aug 26 16:50:56 2019 +0200
[BAHIR-215] Bump flink version to 1.9.0 (#65)
---
.travis.yml | 8 ++++----
flink-connector-activemq/pom.xml | 2 +-
flink-connector-akka/pom.xml | 2 +-
.../org/apache/flink/streaming/connectors/akka/AkkaSource.java | 10 +---------
flink-connector-flume/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 081403a..bc016ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,10 +38,10 @@ jdk:
- openjdk8
env:
- - FLINK_VERSION="1.8.1" SCALA_VERSION="2.11"
- - FLINK_VERSION="1.8.1" SCALA_VERSION="2.11" PROJECT="flink-connector-flume" DOCKER="true"
- - FLINK_VERSION="1.8.1" SCALA_VERSION="2.12"
- - FLINK_VERSION="1.8.1" SCALA_VERSION="2.12" PROJECT="flink-connector-flume" DOCKER="true"
+ - FLINK_VERSION="1.9.0" SCALA_VERSION="2.11"
+ - FLINK_VERSION="1.9.0" SCALA_VERSION="2.11" PROJECT="flink-connector-flume" DOCKER="true"
+ - FLINK_VERSION="1.9.0" SCALA_VERSION="2.12"
+ - FLINK_VERSION="1.9.0" SCALA_VERSION="2.12" PROJECT="flink-connector-flume" DOCKER="true"
before_install:
- ./dev/change-scala-version.sh $SCALA_VERSION
diff --git a/flink-connector-activemq/pom.xml b/flink-connector-activemq/pom.xml
index 8efbedb..58302aa 100644
--- a/flink-connector-activemq/pom.xml
+++ b/flink-connector-activemq/pom.xml
@@ -70,7 +70,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${flink.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connector-akka/pom.xml b/flink-connector-akka/pom.xml
index b0010ec..766236a 100644
--- a/flink-connector-akka/pom.xml
+++ b/flink-connector-akka/pom.xml
@@ -35,7 +35,7 @@ under the License.
<properties>
<mockito.version>1.10.19</mockito.version>
- <akka.version>2.4.20</akka.version>
+ <akka.version>2.5.21</akka.version>
</properties>
<dependencies>
diff --git a/flink-connector-akka/src/main/java/org/apache/flink/streaming/connectors/akka/AkkaSource.java b/flink-connector-akka/src/main/java/org/apache/flink/streaming/connectors/akka/AkkaSource.java
index d8a6919..b7dff29 100644
--- a/flink-connector-akka/src/main/java/org/apache/flink/streaming/connectors/akka/AkkaSource.java
+++ b/flink-connector-akka/src/main/java/org/apache/flink/streaming/connectors/akka/AkkaSource.java
@@ -23,7 +23,6 @@ import akka.actor.PoisonPill;
import akka.actor.Props;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigValueFactory;
-import org.apache.flink.api.common.functions.StoppableFunction;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.source.RichSourceFunction;
import org.apache.flink.streaming.api.functions.source.SourceFunction;
@@ -39,8 +38,7 @@ import java.util.Collections;
* Implementation of {@link SourceFunction} specialized to read messages
* from Akka actors.
*/
-public class AkkaSource extends RichSourceFunction<Object>
- implements StoppableFunction {
+public class AkkaSource extends RichSourceFunction<Object> {
private static final Logger LOG = LoggerFactory.getLogger(AkkaSource.class);
@@ -115,12 +113,6 @@ public class AkkaSource extends RichSourceFunction<Object>
close();
}
- @Override
- public void stop() {
- LOG.info("Stopping akka source");
- close();
- }
-
/**
* Creates an actor system with default configurations for Receiver actor.
*
diff --git a/flink-connector-flume/pom.xml b/flink-connector-flume/pom.xml
index 74e2e0c..1f6040a 100644
--- a/flink-connector-flume/pom.xml
+++ b/flink-connector-flume/pom.xml
@@ -55,7 +55,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${flink.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index acd8e54..a94a516 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
<log4j.version>1.2.17</log4j.version>
<!-- Flink version -->
- <flink.version>1.8.1</flink.version>
+ <flink.version>1.9.0</flink.version>
<junit.jupiter.version>5.4.1</junit.jupiter.version>
<junit.groups></junit.groups>