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 2017/10/14 23:30:56 UTC
[1/8] flink git commit: [FLINK-7810] [build] (follow-up) Exclude
unneeded dependencies from bumped akka
Repository: flink
Updated Branches:
refs/heads/master 76e9b09b0 -> 47fe61893
[FLINK-7810] [build] (follow-up) Exclude unneeded dependencies from bumped akka
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1e03c6c4
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1e03c6c4
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1e03c6c4
Branch: refs/heads/master
Commit: 1e03c6c46ef5706c05183435a3d3de616cc063ee
Parents: 5a5006c
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Oct 14 02:06:37 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 17:16:31 2017 +0200
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1e03c6c4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3415753..2d95a03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -408,6 +408,12 @@ under the License.
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.aeron</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
[7/8] flink git commit: [FLINK-7419] [build] Shade jackson dependency
in flink-avro
Posted by se...@apache.org.
[FLINK-7419] [build] Shade jackson dependency in flink-avro
This closes #5424
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/dbaf262c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/dbaf262c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/dbaf262c
Branch: refs/heads/master
Commit: dbaf262c6e2f8a5db4a40d4ecce42782dc7e2d2e
Parents: 438ee26
Author: zjureel <zj...@gmail.com>
Authored: Fri Aug 11 11:35:02 2017 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 23:18:44 2017 +0200
----------------------------------------------------------------------
flink-connectors/flink-avro/pom.xml | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/dbaf262c/flink-connectors/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-avro/pom.xml b/flink-connectors/flink-avro/pom.xml
index 29d8169..f8d9293 100644
--- a/flink-connectors/flink-avro/pom.xml
+++ b/flink-connectors/flink-avro/pom.xml
@@ -174,6 +174,35 @@ under the License.
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration combine.self="override">
+ <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <artifactSet>
+ <includes>
+ <include>org.codehaus.jackson:*</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.codehaus.jackson</pattern>
+ <shadedPattern>org.apache.flink.avro.shaded.org.codehouse.jackson</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
[5/8] flink git commit: [hotfix] [build] Filter out unnecessary maven
JAR entries from 'force-shading'
Posted by se...@apache.org.
[hotfix] [build] Filter out unnecessary maven JAR entries from 'force-shading'
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e17730cc
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e17730cc
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e17730cc
Branch: refs/heads/master
Commit: e17730cca6ccf12afc61a15ce800c8bb378bf7ad
Parents: 769b40c
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Oct 14 18:46:12 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 21:55:42 2017 +0200
----------------------------------------------------------------------
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e17730cc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d95a03..668557d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1261,6 +1261,13 @@ under the License.
<exclude>log4j-test.properties</exclude>
</excludes>
</filter>
+ <!-- drop entries into META-INF and NOTICE files for the dummy artifact -->
+ <filter>
+ <artifact>org.apache.flink:force-shading</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
</filters>
<artifactSet>
<includes>
[3/8] flink git commit: [FLINK-7809] Remove support for Scala 2.10
Posted by se...@apache.org.
[FLINK-7809] Remove support for Scala 2.10
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a6039cab
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a6039cab
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a6039cab
Branch: refs/heads/master
Commit: a6039cab509b619efe0739d5f7d5e6099f954cb8
Parents: 76e9b09
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Fri Oct 6 11:42:00 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 17:16:31 2017 +0200
----------------------------------------------------------------------
.travis.yml | 10 +++---
docs/start/building.md | 13 -------
.../flink/table/api/TableEnvironment.scala | 2 +-
flink-scala-shell/pom.xml | 25 -------------
.../apache/flink/api/scala/ILoopCompat.scala | 31 ----------------
.../apache/flink/api/scala/ILoopCompat.scala | 37 --------------------
.../org/apache/flink/api/scala/FlinkILoop.scala | 16 ++++-----
flink-scala/pom.xml | 20 -----------
pom.xml | 14 --------
tools/create_release_files.sh | 13 +------
tools/deploy_to_maven.sh | 9 ++---
tools/releasing/create_binary_release.sh | 6 ----
tools/releasing/deploy_staging_jars.sh | 6 ----
13 files changed, 16 insertions(+), 186 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 72dcfac..44028a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,27 +64,27 @@ matrix:
- jdk: "openjdk8"
env:
- TEST="core"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10"
+ - PROFILE="-Dhadoop.version=2.4.1"
- CACHE_NAME=JDK8_H241_CO
- jdk: "openjdk8"
env:
- TEST="libraries"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10"
+ - PROFILE="-Dhadoop.version=2.4.1"
- CACHE_NAME=JDK8_H241_L
- jdk: "openjdk8"
env:
- TEST="connectors"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pinclude-kinesis"
+ - PROFILE="-Dhadoop.version=2.4.1 -Pinclude-kinesis"
- CACHE_NAME=JDK8_H241_CN
- jdk: "openjdk8"
env:
- TEST="tests"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10"
+ - PROFILE="-Dhadoop.version=2.4.1"
- CACHE_NAME=JDK8_H241_T
- jdk: "openjdk8"
env:
- TEST="misc"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10"
+ - PROFILE="-Dhadoop.version=2.4.1"
- CACHE_NAME=JDK8_H241_M
git:
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/docs/start/building.md
----------------------------------------------------------------------
diff --git a/docs/start/building.md b/docs/start/building.md
index 01dc4ed..1478dfd 100644
--- a/docs/start/building.md
+++ b/docs/start/building.md
@@ -115,19 +115,6 @@ The `-Pvendor-repos` activates a Maven [build profile](http://maven.apache.org/g
Flink has APIs, libraries, and runtime modules written in [Scala](http://scala-lang.org). Users of the Scala API and libraries may have to match the Scala version of Flink with the Scala version of their projects (because Scala is not strictly backwards compatible).
-**By default, Flink is built with the Scala 2.11**. To build Flink with Scala *2.10*, you can change the default Scala *binary version* by using *scala-2.10* build profile:
-
-~~~bash
-# Build with Scala version 2.10
-mvn clean install -DskipTests -Pscala-2.10
-~~~
-
-To build against custom Scala versions, you need to define new custom build profile that will override *scala.version* and *scala.binary.version* values.
-
-Flink is developed against Scala *2.11* and tested additionally against Scala *2.10*. These two versions are known to be compatible. Earlier versions (like Scala *2.9*) are *not* compatible.
-
-Newer versions may be compatible, depending on breaking changes in the language features used by Flink, and the availability of Flink's dependencies in those Scala versions. The dependencies written in Scala include for example *Kafka*, *Akka*, *Scalatest*, and *scopt*.
-
{% top %}
## Encrypted File Systems
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala
index 54877ba..7e360f9 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala
@@ -892,7 +892,7 @@ abstract class TableEnvironment(val config: TableConfig) {
throw new TableException("Field name can not be '*'.")
}
- (fieldNames.toArray, fieldIndexes.toArray) // build fails in Scala 2.10 if not converted
+ (fieldNames, fieldIndexes)
}
protected def generateRowConverterFunction[OUT](
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index 0d925ed..15f10c7 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -209,29 +209,4 @@ under the License.
</plugins>
</build>
- <profiles>
- <profile>
- <id>scala-2.10</id>
- <activation>
- <property>
- <name>scala-2.10</name>
- </property>
- </activation>
- <!-- only required for Scala 2.10 -->
- <dependencies>
- <dependency>
- <groupId>org.scalamacros</groupId>
- <artifactId>quasiquotes_2.10</artifactId>
- <version>${scala.macros.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>jline</artifactId>
- <version>2.10.4</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala
----------------------------------------------------------------------
diff --git a/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala b/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala
deleted file mode 100644
index 7751751..0000000
--- a/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.api.scala
-
-import java.io.BufferedReader
-
-import _root_.scala.tools.nsc.interpreter._
-
-class ILoopCompat(
- in0: Option[BufferedReader],
- out0: JPrintWriter)
- extends ILoop(in0, out0) {
-
- override def prompt = "Scala-Flink> "
-}
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala
----------------------------------------------------------------------
diff --git a/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala b/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala
deleted file mode 100644
index 1c395bb..0000000
--- a/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.api.scala
-
-import java.io.BufferedReader
-
-import _root_.scala.tools.nsc.interpreter._
-import _root_.scala.io.AnsiColor.{MAGENTA, RESET}
-
-class ILoopCompat(
- in0: Option[BufferedReader],
- out0: JPrintWriter)
- extends ILoop(in0, out0) {
-
- override def prompt = {
- val promptStr = "Scala-Flink> "
- s"$MAGENTA$promptStr$RESET"
- }
-
- protected def addThunk(f: => Unit): Unit = f
-}
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala
----------------------------------------------------------------------
diff --git a/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala
index e02c2b0..4b6e886 100644
--- a/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala
+++ b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala
@@ -35,7 +35,7 @@ class FlinkILoop(
val externalJars: Option[Array[String]],
in0: Option[BufferedReader],
out0: JPrintWriter)
- extends ILoopCompat(in0, out0) {
+ extends ILoop(in0, out0) {
def this(
host: String,
@@ -145,15 +145,13 @@ class FlinkILoop(
override def createInterpreter(): Unit = {
super.createInterpreter()
- addThunk {
- intp.beQuietDuring {
- // import dependencies
- intp.interpret("import " + packageImports.mkString(", "))
+ intp.beQuietDuring {
+ // import dependencies
+ intp.interpret("import " + packageImports.mkString(", "))
- // set execution environment
- intp.bind("benv", this.scalaBenv)
- intp.bind("senv", this.scalaSenv)
- }
+ // set execution environment
+ intp.bind("benv", this.scalaBenv)
+ intp.bind("senv", this.scalaSenv)
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 93152df..f132145 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -256,24 +256,4 @@ under the License.
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>scala-2.10</id>
- <activation>
- <property>
- <name>scala-2.10</name>
- </property>
- </activation>
- <!-- only required for Scala 2.10 -->
- <dependencies>
- <dependency>
- <groupId>org.scalamacros</groupId>
- <artifactId>quasiquotes_2.10</artifactId>
- <version>${scala.macros.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0e53b7c..b85189f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -528,20 +528,6 @@ under the License.
</dependencyManagement>
<profiles>
-
- <!-- Profile to switch to Scala Version 2.10 -->
- <profile>
- <id>scala-2.10</id>
- <activation>
- <property>
- <name>scala-2.10</name>
- </property>
- </activation>
- <properties>
- <scala.version>2.10.6</scala.version>
- <scala.binary.version>2.10</scala.binary.version>
- </properties>
- </profile>
<profile>
<id>spotbugs</id>
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/tools/create_release_files.sh
----------------------------------------------------------------------
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
index 48641c0..5d134e8 100755
--- a/tools/create_release_files.sh
+++ b/tools/create_release_files.sh
@@ -241,14 +241,9 @@ deploy_to_maven() {
cd flink
cp ../../deploysettings.xml .
-
+
echo "Deploying Scala 2.11 version"
$MVN clean deploy -Prelease,docs-and-source,scala-2.11 --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
-
- # It is important to first deploy scala 2.11 and then scala 2.10 so that the quickstarts (which are independent of the scala version)
- # are depending on scala 2.10.
- echo "Deploying Scala 2.10 version"
- $MVN clean deploy -Prelease,docs-and-source,scala-2.10 --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
}
copy_data() {
@@ -273,18 +268,12 @@ make_source_release
# build dist by input parameter of "--scala-vervion xxx --hadoop-version xxx"
if [ "$SCALA_VERSION" == "none" ] && [ "$HADOOP_VERSION" == "none" ]; then
- make_binary_release "hadoop2" "" "2.10"
- make_binary_release "hadoop26" "-Dhadoop.version=2.6.5" "2.10"
- make_binary_release "hadoop27" "-Dhadoop.version=2.7.3" "2.10"
- make_binary_release "hadoop28" "-Dhadoop.version=2.8.0" "2.10"
-
make_binary_release "hadoop2" "" "2.11"
make_binary_release "hadoop26" "-Dhadoop.version=2.6.5" "2.11"
make_binary_release "hadoop27" "-Dhadoop.version=2.7.3" "2.11"
make_binary_release "hadoop28" "-Dhadoop.version=2.8.0" "2.11"
elif [ "$SCALA_VERSION" == none ] && [ "$HADOOP_VERSION" != "none" ]
then
- make_binary_release "hadoop2" "-Dhadoop.version=$HADOOP_VERSION" "2.10"
make_binary_release "hadoop2" "-Dhadoop.version=$HADOOP_VERSION" "2.11"
elif [ "$SCALA_VERSION" != none ] && [ "$HADOOP_VERSION" == "none" ]
then
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/tools/deploy_to_maven.sh
----------------------------------------------------------------------
diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
index 2397bd3..aef140d 100755
--- a/tools/deploy_to_maven.sh
+++ b/tools/deploy_to_maven.sh
@@ -87,15 +87,10 @@ if [[ $CURRENT_FLINK_VERSION == *SNAPSHOT* ]] ; then
MVN_SNAPSHOT_OPTS="-B -Pdocs-and-source -DskipTests -Drat.skip=true -Drat.ignoreErrors=true \
-DretryFailedDeploymentCount=10 --settings deploysettings.xml clean deploy"
- # hadoop2 scala 2.10
- echo "deploy standard version (hadoop2) for scala 2.10"
- mvn ${MVN_SNAPSHOT_OPTS} -Pscala-2.10
- deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2"
-
# hadoop2 scala 2.11
- echo "deploy hadoop2 version (standard) for scala 2.11"
+ echo "deploy standard version (hadoop2) for scala 2.11"
mvn ${MVN_SNAPSHOT_OPTS} -Pscala-2.11
- deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2_2.11"
+ deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2"
exit 0
else
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/tools/releasing/create_binary_release.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index 0defd1b..42b5a8e 100755
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -78,18 +78,12 @@ cd ..
if [ "$SCALA_VERSION" == "none" ] && [ "$HADOOP_VERSION" == "none" ]; then
- make_binary_release "hadoop2" "" "2.10"
- make_binary_release "hadoop26" "-Dhadoop.version=2.6.5" "2.10"
- make_binary_release "hadoop27" "-Dhadoop.version=2.7.3" "2.10"
- make_binary_release "hadoop28" "-Dhadoop.version=2.8.0" "2.10"
-
make_binary_release "hadoop2" "" "2.11"
make_binary_release "hadoop26" "-Dhadoop.version=2.6.5" "2.11"
make_binary_release "hadoop27" "-Dhadoop.version=2.7.3" "2.11"
make_binary_release "hadoop28" "-Dhadoop.version=2.8.0" "2.11"
elif [ "$SCALA_VERSION" == none ] && [ "$HADOOP_VERSION" != "none" ]
then
- make_binary_release "hadoop2" "-Dhadoop.version=$HADOOP_VERSION" "2.10"
make_binary_release "hadoop2" "-Dhadoop.version=$HADOOP_VERSION" "2.11"
elif [ "$SCALA_VERSION" != none ] && [ "$HADOOP_VERSION" == "none" ]
then
http://git-wip-us.apache.org/repos/asf/flink/blob/a6039cab/tools/releasing/deploy_staging_jars.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/deploy_staging_jars.sh b/tools/releasing/deploy_staging_jars.sh
index a379f8f..9245bdd 100755
--- a/tools/releasing/deploy_staging_jars.sh
+++ b/tools/releasing/deploy_staging_jars.sh
@@ -43,9 +43,3 @@ echo "Deploying to repository.apache.org"
echo "Deploying Scala 2.11 version"
$MVN clean deploy -Prelease,docs-and-source,scala-2.11 -DskipTests -DretryFailedDeploymentCount=10
-# It is important to first deploy scala 2.11 and then scala 2.10 so that the quickstarts (which are independent of the scala version)
-# are depending on scala 2.10.
-
-echo "Deploying Scala 2.10 version"
-$MVN clean deploy -Prelease,docs-and-source,scala-2.10 -DskipTests -DretryFailedDeploymentCount=10
-
[2/8] flink git commit: [FLINK-7810] [build] Switch from custom
Flakka to Akka 2.4.x
Posted by se...@apache.org.
[FLINK-7810] [build] Switch from custom Flakka to Akka 2.4.x
We can do this now that we dropped support for Scala 2.10.
This closes #4807
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5a5006ce
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5a5006ce
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5a5006ce
Branch: refs/heads/master
Commit: 5a5006ceb8d19bc0f3cc490451a18b8fc21197cb
Parents: a6039ca
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Fri Oct 6 14:33:43 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 17:16:31 2017 +0200
----------------------------------------------------------------------
flink-clients/pom.xml | 4 +--
flink-mesos/pom.xml | 16 +++++------
.../flink-queryable-state-java/pom.xml | 6 ----
.../main/resources/archetype-resources/pom.xml | 6 ++--
.../main/resources/archetype-resources/pom.xml | 6 ++--
flink-runtime-web/pom.xml | 4 +--
flink-runtime/pom.xml | 16 +++++------
...askManagerComponentsStartupShutdownTest.java | 2 --
flink-tests/pom.xml | 4 +--
.../test/checkpointing/SavepointITCase.java | 6 +---
.../flink/test/misc/AutoParallelismITCase.java | 8 ------
flink-yarn-tests/pom.xml | 4 +--
.../org/apache/flink/yarn/YarnTestBase.java | 7 +++--
flink-yarn/pom.xml | 22 ++++++++------
pom.xml | 30 ++++++++++----------
15 files changed, 65 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index 5995ea8..ca1c5b6 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -86,8 +86,8 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index ab3499f..2ae59be 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -62,14 +62,14 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-actor_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-actor_${scala.binary.version}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-remote_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-remote_${scala.binary.version}</artifactId>
<scope>provided</scope>
<exclusions>
<!-- exclude the lower/wrong version of Protobuf here -->
@@ -81,8 +81,8 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-slf4j_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
<scope>provided</scope>
</dependency>
@@ -138,8 +138,8 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-queryable-state/flink-queryable-state-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-java/pom.xml b/flink-queryable-state/flink-queryable-state-java/pom.xml
index 533ac75..e60c6f3 100644
--- a/flink-queryable-state/flink-queryable-state-java/pom.xml
+++ b/flink-queryable-state/flink-queryable-state-java/pom.xml
@@ -110,12 +110,6 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
index c973a6a..b8e9970 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -227,9 +227,9 @@ under the License.
<exclude>org.scala-lang:scala-library</exclude>
<exclude>org.scala-lang:scala-compiler</exclude>
<exclude>org.scala-lang:scala-reflect</exclude>
- <exclude>com.data-artisans:flakka-actor_*</exclude>
- <exclude>com.data-artisans:flakka-remote_*</exclude>
- <exclude>com.data-artisans:flakka-slf4j_*</exclude>
+ <exclude>com.typesafe.akka:akka-actor_*</exclude>
+ <exclude>com.typesafe.akka:akka-remote_*</exclude>
+ <exclude>com.typesafe.akka:akka-slf4j_*</exclude>
<exclude>io.netty:netty-all</exclude>
<exclude>io.netty:netty</exclude>
<exclude>commons-fileupload:commons-fileupload</exclude>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
index 9ca72b8..5a8a503 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -229,9 +229,9 @@ under the License.
<exclude>org.scala-lang:scala-library</exclude>
<exclude>org.scala-lang:scala-compiler</exclude>
<exclude>org.scala-lang:scala-reflect</exclude>
- <exclude>com.data-artisans:flakka-actor_*</exclude>
- <exclude>com.data-artisans:flakka-remote_*</exclude>
- <exclude>com.data-artisans:flakka-slf4j_*</exclude>
+ <exclude>com.typesafe.akka:akka-actor_*</exclude>
+ <exclude>com.typesafe.akka:akka-remote_*</exclude>
+ <exclude>com.typesafe.akka:akka-slf4j_*</exclude>
<exclude>io.netty:netty-all</exclude>
<exclude>io.netty:netty</exclude>
<exclude>commons-fileupload:commons-fileupload</exclude>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-runtime-web/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml
index 14c91c5..11d4ddc 100644
--- a/flink-runtime-web/pom.xml
+++ b/flink-runtime-web/pom.xml
@@ -96,8 +96,8 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 71ebfb7..b59a403 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -110,18 +110,18 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-actor_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-actor_${scala.binary.version}</artifactId>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-remote_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-remote_${scala.binary.version}</artifactId>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-slf4j_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
</dependency>
<dependency>
@@ -212,8 +212,8 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
index 6dabcd3..08ebbb3 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
@@ -202,8 +202,6 @@ public class TaskManagerComponentsStartupShutdownTest extends TestLogger {
assertTrue(ioManager.isProperlyShutDown());
assertTrue(memManager.isShutdown());
} finally {
- TestingUtils.stopActorsGracefully(Arrays.asList(jobManager, taskManager));
-
if (actorSystem != null) {
actorSystem.shutdown();
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 75325e5..39363d4 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -212,8 +212,8 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
index 1b7dafa..0cd5184 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
@@ -561,15 +561,11 @@ public class SavepointITCase extends TestLogger {
((ResponseSavepoint) Await.result(savepointFuture, deadline.timeLeft())).savepoint();
LOG.info("Retrieved savepoint: " + savepointPath + ".");
-
+ } finally {
// Shut down the Flink cluster (thereby canceling the job)
LOG.info("Shutting down Flink cluster.");
flink.shutdown();
flink.awaitTermination();
-
- } finally {
- flink.shutdown();
- flink.awaitTermination();
}
try {
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java
index 1fb5e65..9cafee6 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java
@@ -102,14 +102,6 @@ public class AutoParallelismITCase extends TestLogger {
e.printStackTrace();
fail(e.getMessage());
}
- finally {
- try {
- cluster.stop();
- }
- catch (Throwable t) {
- // ignore exceptions on shutdown
- }
- }
}
private static class ParallelismDependentInputFormat extends GenericInputFormat<Integer> {
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-yarn-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index b5e4025..1a50017 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -117,8 +117,8 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
index 62ff955..a701c90 100644
--- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
+++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
@@ -110,8 +110,11 @@ public abstract class YarnTestBase extends TestLogger {
protected static final String[] WHITELISTED_STRINGS = {
"akka.remote.RemoteTransportExceptionNoStackTrace",
// workaround for annoying InterruptedException logging:
- // https://issues.apache.org/jira/browse/YARN-1022
- "java.lang.InterruptedException"
+ // https://issues.apache.org/jira/browse/YARN-1022
+ "java.lang.InterruptedException",
+ // very specific on purpose
+ "Remote connection to [null] failed with java.net.ConnectException: Connection refused",
+ "java.io.IOException: Connection reset by peer"
};
// Temp directory which is deleted after the unit test.
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/flink-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
index aa7603c..eda1cb1 100644
--- a/flink-yarn/pom.xml
+++ b/flink-yarn/pom.xml
@@ -68,23 +68,29 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-actor_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-actor_${scala.binary.version}</artifactId>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-remote_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-remote_${scala.binary.version}</artifactId>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-camel_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-camel_${scala.binary.version}</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/5a5006ce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b85189f..3415753 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@ under the License.
<flink.reuseForks>true</flink.reuseForks>
<log4j.configuration>log4j-test.properties</log4j.configuration>
<guava.version>18.0</guava.version>
- <akka.version>2.3-custom</akka.version>
+ <akka.version>2.4.20</akka.version>
<java.version>1.8</java.version>
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>1.2.17</log4j.version>
@@ -399,32 +399,32 @@ under the License.
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-actor_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-actor_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-remote_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-remote_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-slf4j_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-camel_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-camel_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
<scope>test</scope>
</dependency>
@@ -692,8 +692,8 @@ under the License.
com.sun.tools.javac.code.Symbol$CompletionFailure:
class file for akka.testkit.TestKit not found"
-->
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
<scope>provided</scope>
</dependency>
@@ -838,8 +838,8 @@ under the License.
com.sun.tools.javac.code.Symbol$CompletionFailure:
class file for akka.testkit.TestKit not found"
-->
- <groupId>com.data-artisans</groupId>
- <artifactId>flakka-testkit_${scala.binary.version}</artifactId>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
<scope>provided</scope>
</dependency>
[8/8] flink git commit: [hotfix] [build] Exclude jline from ZooKeeper
dependencies
Posted by se...@apache.org.
[hotfix] [build] Exclude jline from ZooKeeper dependencies
jlnie is a command line shell used optionally for ZK's
command line tool.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/47fe6189
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/47fe6189
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/47fe6189
Branch: refs/heads/master
Commit: 47fe6189386ebfbef8b1edee0c58a41c13a0c0b6
Parents: dbaf262
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Oct 14 22:11:39 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 23:18:44 2017 +0200
----------------------------------------------------------------------
pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/47fe6189/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 668557d..52ead11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,12 +467,16 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- Netty from zookeeper is conflicting with akka's, which can cause occasional deadlock inside
- Netty threads -->
+ <!-- Netty is only needed sor ZK servers, not clients -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <!-- jline is optional for ZK console shell -->
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
[6/8] flink git commit: [FLINK-7842] [build] Shade
org.codehouse.jackson in Hadoop
Posted by se...@apache.org.
[FLINK-7842] [build] Shade org.codehouse.jackson in Hadoop
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/438ee260
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/438ee260
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/438ee260
Branch: refs/heads/master
Commit: 438ee260dea61d28968dd6ea5f02142ea2f7c533
Parents: e17730c
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Oct 14 19:19:32 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 23:18:44 2017 +0200
----------------------------------------------------------------------
flink-shaded-hadoop/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/438ee260/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 26e6077..f4b0816 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -124,6 +124,7 @@ under the License.
<include>net.java.dev.jets3t:jets3t</include>
<include>org.apache.httpcomponents:*</include>
<include>commons-httpclient:commons-httpclient</include>
+ <include>org.codehaus.jackson:*</include>
</includes>
<excludes>
<exclude>org.slf4j:*</exclude>
@@ -162,6 +163,10 @@ under the License.
<pattern>org.htrace</pattern>
<shadedPattern>org.apache.flink.hadoop.shaded.org.htrace</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.codehaus.jackson</pattern>
+ <shadedPattern>org.apache.flink.hadoop.shaded.org.codehaus.jackson</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
[4/8] flink git commit: [hotfix] [docs] Minor improvements to the
'building form source' guide.
Posted by se...@apache.org.
[hotfix] [docs] Minor improvements to the 'building form source' guide.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/769b40cd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/769b40cd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/769b40cd
Branch: refs/heads/master
Commit: 769b40cd7f3875e36a16d2b75f6efc65a3998f1b
Parents: 1e03c6c
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Oct 14 18:45:16 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 18:48:08 2017 +0200
----------------------------------------------------------------------
docs/start/building.md | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/769b40cd/docs/start/building.md
----------------------------------------------------------------------
diff --git a/docs/start/building.md b/docs/start/building.md
index 1478dfd..455ebbfe 100644
--- a/docs/start/building.md
+++ b/docs/start/building.md
@@ -48,13 +48,15 @@ The simplest way of building Flink is by running:
mvn clean install -DskipTests
~~~
-This instructs [Maven](http://maven.apache.org) (`mvn`) to first remove all existing builds (`clean`) and then create a new Flink binary (`install`). The `-DskipTests` command prevents Maven from executing the tests.
+This instructs [Maven](http://maven.apache.org) (`mvn`) to first remove all existing builds (`clean`) and then create a new Flink binary (`install`).
-The default build includes the YARN Client for Hadoop 2.
+To speed up the build you can skip tests, checkstyle, and JavaDocs: `mvn clean install -DskipTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true`.
+
+The default build adds a Flink-specific JAR for Hadoop 2, to allow using Flink with HDFS and YARN.
## Dependency Shading
-Flink [shades away](https://maven.apache.org/plugins/maven-shade-plugin/) some of the libraries it uses, in order to avoid version clashes with user programs that use different versions of these libraries. Among the shaded libraries are *Google Guava*, *Asm*, *Apache Curator*, *Apache HTTP Components*, and others.
+Flink [shades away](https://maven.apache.org/plugins/maven-shade-plugin/) some of the libraries it uses, in order to avoid version clashes with user programs that use different versions of these libraries. Among the shaded libraries are *Google Guava*, *Asm*, *Apache Curator*, *Apache HTTP Components*, *Netty*, and others.
The dependency shading mechanism was recently changed in Maven and requires users to build Flink slightly differently, depending on their Maven version:
@@ -80,23 +82,13 @@ mvn clean install
Flink has dependencies to HDFS and YARN which are both dependencies from [Apache Hadoop](http://hadoop.apache.org). There exist many different versions of Hadoop (from both the upstream project and the different Hadoop distributions). If you are using a wrong combination of versions, exceptions can occur.
-Hadoop is only supported from version 2.3.0 upwards.
+Hadoop is only supported from version 2.4.0 upwards.
You can also specify a specific Hadoop version to build against:
~~~bash
mvn clean install -DskipTests -Dhadoop.version=2.6.1
~~~
-#### Before Hadoop 2.3.0
-
-Hadoop 2.x versions are only supported with YARN features from version 2.3.0 upwards. If you want to use a version lower than 2.3.0, you can exclude the YARN support using the following extra build arguments: `-P!include-yarn`.
-
-For example, if you want to build Flink for Hadoop `2.2.0`, use the following command:
-
-~~~bash
-mvn clean install -Dhadoop.version=2.2.0 -P!include-yarn
-~~~
-
### Vendor-specific Versions
To build Flink against a vendor specific Hadoop version, issue the following command:
@@ -115,6 +107,10 @@ The `-Pvendor-repos` activates a Maven [build profile](http://maven.apache.org/g
Flink has APIs, libraries, and runtime modules written in [Scala](http://scala-lang.org). Users of the Scala API and libraries may have to match the Scala version of Flink with the Scala version of their projects (because Scala is not strictly backwards compatible).
+Flink 1.4 currently builds only with Scala version 2.11.
+
+We are working on supporting Scala 2.12, but certain breaking changes in Scala 2.12 make this a more involved effort. Please check out (this JIRA issue)[https://issues.apache.org/jira/browse/FLINK-7811] for updates.
+
{% top %}
## Encrypted File Systems