You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/04/02 15:13:21 UTC
[4/5] flink git commit: [hotfix] Invert activation of new and legacy
code by introducing -DlegacyCode flag
[hotfix] Invert activation of new and legacy code by introducing -DlegacyCode flag
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/71913cd9
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/71913cd9
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/71913cd9
Branch: refs/heads/master
Commit: 71913cd944a4bb155d8844cae05b24df9086066a
Parents: af5279e
Author: Till Rohrmann <tr...@apache.org>
Authored: Mon Apr 2 15:02:41 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Mon Apr 2 16:59:50 2018 +0200
----------------------------------------------------------------------
.travis.yml | 20 ++++++++++----------
pom.xml | 14 ++++----------
2 files changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/71913cd9/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 08aab30..4acdeb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,52 +39,52 @@ matrix:
- jdk: "oraclejdk8"
env:
- TEST="core"
- - PROFILE="-Dhadoop.version=2.8.3 -Dnew"
+ - PROFILE="-Dhadoop.version=2.8.3"
- CACHE_NAME=JDK8_H280_CO
- jdk: "oraclejdk8"
env:
- TEST="libraries"
- - PROFILE="-Dhadoop.version=2.8.3 -Dnew"
+ - PROFILE="-Dhadoop.version=2.8.3"
- CACHE_NAME=JDK8_H280_L
- jdk: "oraclejdk8"
env:
- TEST="connectors"
- - PROFILE="-Dhadoop.version=2.8.3 -Dnew -Pinclude-kinesis"
+ - PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis"
- CACHE_NAME=JDK8_H280_CN
- jdk: "oraclejdk8"
env:
- TEST="tests"
- - PROFILE="-Dhadoop.version=2.8.3 -Dnew"
+ - PROFILE="-Dhadoop.version=2.8.3"
- CACHE_NAME=JDK8_H280_T
- jdk: "oraclejdk8"
env:
- TEST="misc"
- - PROFILE="-Dhadoop.version=2.8.3 -Dnew -Dinclude_hadoop_aws"
+ - PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws"
- CACHE_NAME=JDK8_H280_M
- jdk: "openjdk8"
env:
- TEST="core"
- - PROFILE="-Dhadoop.version=2.4.1"
+ - PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode"
- CACHE_NAME=JDK8_H241_CO
- jdk: "openjdk8"
env:
- TEST="libraries"
- - PROFILE="-Dhadoop.version=2.4.1"
+ - PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode"
- CACHE_NAME=JDK8_H241_L
- jdk: "openjdk8"
env:
- TEST="connectors"
- - PROFILE="-Dhadoop.version=2.4.1 -Pinclude-kinesis"
+ - PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode -Pinclude-kinesis"
- CACHE_NAME=JDK8_H241_CN
- jdk: "openjdk8"
env:
- TEST="tests"
- - PROFILE="-Dhadoop.version=2.4.1"
+ - PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode"
- CACHE_NAME=JDK8_H241_T
- jdk: "openjdk8"
env:
- TEST="misc"
- - PROFILE="-Dhadoop.version=2.4.1"
+ - PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode"
- CACHE_NAME=JDK8_H241_M
git:
http://git-wip-us.apache.org/repos/asf/flink/blob/71913cd9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 189c033..a9d190e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,9 +127,7 @@ under the License.
<powermock.version>1.6.5</powermock.version>
<hamcrest.version>1.3</hamcrest.version>
<japicmp.skip>false</japicmp.skip>
- <!-- run all groups except new by default -->
- <test.excludedGroups>org.apache.flink.testutils.category.New</test.excludedGroups>
- <codebase>legacy</codebase>
+ <codebase>new</codebase>
<!--
Keeping the MiniKDC version fixed instead of taking hadoop version dependency
to support testing Kafka, ZK etc., modules that does not have Hadoop dependency
@@ -593,16 +591,14 @@ under the License.
<profiles>
<profile>
- <id>new</id>
+ <id>legacyCode</id>
<activation>
<property>
- <name>new</name>
+ <name>legacyCode</name>
</property>
</activation>
<properties>
- <!-- clear the excluded groups list -->
- <test.excludedGroups></test.excludedGroups>
- <codebase>new</codebase>
+ <codebase>legacy</codebase>
</properties>
</profile>
@@ -1118,8 +1114,6 @@ under the License.
<!-- Do NOT use a version >=2.19.X, as test cases may get stuck before execution. See SUREFIRE-1255 -->
<version>2.18.1</version>
<configuration>
- <groups>${test.groups}</groups>
- <excludedGroups>${test.excludedGroups}</excludedGroups>
<forkCount>${flink.forkCount}</forkCount>
<reuseForks>${flink.reuseForks}</reuseForks>
<systemPropertyVariables>