Repository: bahir-flink Updated Branches: refs/heads/master 86c84d279 -> b580566f0
[BAHIR-129] Upgrade Flink version to 1.3.0 Upgrade Flink version from 1.2.0 to 1.3.0. Closes #18 Project: http://git-wip-us.apache.org/repos/asf/bahir-flink/repo Commit: http://git-wip-us.apache.org/repos/asf/bahir-flink/commit/b580566f Tree: http://git-wip-us.apache.org/repos/asf/bahir-flink/tree/b580566f Diff: http://git-wip-us.apache.org/repos/asf/bahir-flink/diff/b580566f Branch: refs/heads/master Commit: b580566f0b9a3efba1e26c292e666616eb42aeae Parents: 86c84d2 Author: zhouhai02 <[email protected]> Authored: Wed Aug 23 23:33:51 2017 +0800 Committer: Luciano Resende <[email protected]> Committed: Thu Aug 24 14:16:46 2017 -0400 ---------------------------------------------------------------------- .travis.yml | 48 ++++++++++++++------ .../connectors/activemq/AMQSinkTest.java | 2 + .../connectors/activemq/AMQSourceTest.java | 1 + .../activemq/ActiveMQConnectorITCase.java | 5 ++ .../connectors/akka/AkkaSourceTest.java | 5 ++ pom.xml | 2 +- 6 files changed, 47 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/b580566f/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 6f633e0..894ee36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,31 +15,49 @@ # limitations under the License. # +sudo: required +dist: trusty + +cache: + directories: + - $HOME/.m2 + +# do not cache our own artifacts +before_cache: + - rm -rf $HOME/.m2/repository/org/apache/flink/ + language: java matrix: include: - jdk: oraclejdk8 - env: FLINK_VERSION="1.2.0" SCALA_VER="2.11" - + env: + - FLINK_VERSION="1.3.0" SCALA_VERSION="2.11" + - CACHE_NAME=JDK8_F130_A - jdk: oraclejdk8 - env: FLINK_VERSION="1.2.0" SCALA_VER="2.10" - - - jdk: oraclejdk7 - env: FLINK_VERSION="1.2.0" SCALA_VER="2.11" - - - jdk: oraclejdk7 - env: FLINK_VERSION="1.2.0" SCALA_VER="2.10" - + env: + - FLINK_VERSION="1.3.0" SCALA_VERSION="2.10" + - CACHE_NAME=JDK8_F130_B + - jdk: openjdk8 + env: + - FLINK_VERSION="1.3.0" SCALA_VERSION="2.11" + - CACHE_NAME=JDK8_F130_C + - jdk: openjdk8 + env: + - FLINK_VERSION="1.3.0" SCALA_VERSION="2.10" + - CACHE_NAME=JDK8_F130_D - jdk: openjdk7 - env: FLINK_VERSION="1.2.0" SCALA_VER="2.11" - + env: + - FLINK_VERSION="1.3.0" SCALA_VERSION="2.11" + - CACHE_NAME=JDK7_F130_A - jdk: openjdk7 - env: FLINK_VERSION="1.2.0" SCALA_VER="2.10" + env: + - FLINK_VERSION="1.3.0" SCALA_VERSION="2.10" + - CACHE_NAME=JDK7_F130_B before_install: - - ./dev/change-scala-version.sh $SCALA_VER + - ./dev/change-scala-version.sh $SCALA_VERSION install: true -script: mvn clean verify -Pscala-$SCALA_VER -Dflink.version=$FLINK_VERSION +script: mvn clean verify -Pscala-$SCALA_VERSION -Dflink.version=$FLINK_VERSION http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/b580566f/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSinkTest.java ---------------------------------------------------------------------- diff --git a/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSinkTest.java b/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSinkTest.java index b9ecfd8..e4d67c3 100644 --- a/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSinkTest.java +++ b/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSinkTest.java @@ -115,6 +115,7 @@ public class AMQSinkTest { verify(session).createTopic(DESTINATION_NAME); } + @SuppressWarnings("unchecked") @Test public void exceptionOnSendAreNotThrown() throws Exception { when(session.createBytesMessage()).thenThrow(JMSException.class); @@ -123,6 +124,7 @@ public class AMQSinkTest { amqSink.invoke("msg"); } + @SuppressWarnings("unchecked") @Test(expected = RuntimeException.class) public void exceptionOnSendAreThrownByDefault() throws Exception { when(session.createBytesMessage()).thenThrow(JMSException.class); http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/b580566f/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSourceTest.java ---------------------------------------------------------------------- diff --git a/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSourceTest.java b/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSourceTest.java index 2e6efa6..0e6dd31 100644 --- a/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSourceTest.java +++ b/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/AMQSourceTest.java @@ -72,6 +72,7 @@ public class AMQSourceTest { private SimpleStringSchema deserializationSchema; SourceFunction.SourceContext<String> context; + @SuppressWarnings("unchecked") @Before public void before() throws Exception { connectionFactory = mock(ActiveMQConnectionFactory.class); http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/b580566f/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/ActiveMQConnectorITCase.java ---------------------------------------------------------------------- diff --git a/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/ActiveMQConnectorITCase.java b/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/ActiveMQConnectorITCase.java index 24a257f..9af6dd5 100644 --- a/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/ActiveMQConnectorITCase.java +++ b/flink-connector-activemq/src/test/java/org/apache/flink/streaming/connectors/activemq/ActiveMQConnectorITCase.java @@ -254,6 +254,11 @@ public class ActiveMQConnectorITCase { public void emitWatermark(Watermark mark) { } @Override + public void markAsTemporarilyIdle() { + throw new UnsupportedOperationException(); + } + + @Override public Object getCheckpointLock() { return contextLock; } http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/b580566f/flink-connector-akka/src/test/java/org/apache/flink/streaming/connectors/akka/AkkaSourceTest.java ---------------------------------------------------------------------- diff --git a/flink-connector-akka/src/test/java/org/apache/flink/streaming/connectors/akka/AkkaSourceTest.java b/flink-connector-akka/src/test/java/org/apache/flink/streaming/connectors/akka/AkkaSourceTest.java index e7114d7..99a1893 100644 --- a/flink-connector-akka/src/test/java/org/apache/flink/streaming/connectors/akka/AkkaSourceTest.java +++ b/flink-connector-akka/src/test/java/org/apache/flink/streaming/connectors/akka/AkkaSourceTest.java @@ -237,6 +237,11 @@ public class AkkaSourceTest { } @Override + public void markAsTemporarilyIdle() { + throw new UnsupportedOperationException(); + } + + @Override public Object getCheckpointLock() { return lock; } http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/b580566f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b6d8dd1..2e39a83 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ <log4j.version>1.2.17</log4j.version> <!-- Flink version --> - <flink.version>1.2.0</flink.version> + <flink.version>1.3.0</flink.version> <PermGen>64m</PermGen> <MaxPermGen>512m</MaxPermGen>
