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/15 17:10:25 UTC
[1/4] flink git commit: [hotfix] [build] Small improvements to the
flink-mesos build
Repository: flink
Updated Branches:
refs/heads/master a76de2860 -> b2b94632d
[hotfix] [build] Small improvements to the flink-mesos build
- The newer akka versions have no protobuf dependency and need no exclusion any more
- The transitive dependency promotion is ineffective here, disabling it makes
it more robust against accidentally pulling in more dependencies in the future
- Properly specifying the shaded dependencies is safer
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/9498f4fc
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9498f4fc
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9498f4fc
Branch: refs/heads/master
Commit: 9498f4fcb99e13128549b5b4674e41f2cea40057
Parents: 5ff7a0b
Author: Stephan Ewen <se...@apache.org>
Authored: Sun Oct 15 02:48:37 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Oct 15 19:08:11 2017 +0200
----------------------------------------------------------------------
flink-mesos/pom.xml | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/9498f4fc/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index 2ae59be..7ad7ffd 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -71,13 +71,6 @@ under the License.
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_${scala.binary.version}</artifactId>
<scope>provided</scope>
- <exclusions>
- <!-- exclude the lower/wrong version of Protobuf here -->
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -269,9 +262,7 @@ under the License.
</configuration>
</plugin>
- <!-- Relocate Mesos Protobuf dependency. Mesos 1.0.1 requires Protobuf 2.6.1 whereas
- Flakka pulls in Protobuf 2.5.0. It might be feasible to set Protobuf to version 2.6.1,
- but we shade to be on the safe side. -->
+ <!-- Relocate Mesos Protobuf dependency. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -283,11 +274,10 @@ under the License.
<goal>shade</goal>
</goals>
<configuration>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes combine.children="append">
- <include>com.google.protobuf:*</include>
- <include>org.apache.mesos:*</include>
+ <include>com.google.protobuf:protobuf-java</include>
+ <include>org.apache.mesos:mesos</include>
</includes>
</artifactSet>
<relocations combine.children="append">
[3/4] flink git commit: [build] Move licenses for shaded dependencies
into the NOTICE file
Posted by se...@apache.org.
[build] Move licenses for shaded dependencies into the NOTICE file
In accordance with the Apache Software License 2.0, the NOTICE
file is the dedicated/prefered place for any additional license
information that affects redistribution, because the NOTICE
file is required to be included in any redistribution.
The only project still having shaded dependencies that require
extra license statements is flink-table. Changing the licenses
to be in the NOTICE file also allows removing the maven-resource
plugin from the root pom.xml
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/558a0b44
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/558a0b44
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/558a0b44
Branch: refs/heads/master
Commit: 558a0b44266994cb07890c2c8f09644d519a1282
Parents: a76de28
Author: Stephan Ewen <se...@apache.org>
Authored: Sun Oct 15 01:07:48 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Oct 15 19:08:11 2017 +0200
----------------------------------------------------------------------
.../packaged_licenses/LICENSE.janino.txt | 31 ----------
.../packaged_licenses/LICENSE.reflections.txt | 14 -----
.../src/main/resources/META-INF/NOTICE | 64 ++++++++++++++++++++
pom.xml | 28 ---------
4 files changed, 64 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/558a0b44/flink-libraries/flink-table/packaged_licenses/LICENSE.janino.txt
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/packaged_licenses/LICENSE.janino.txt b/flink-libraries/flink-table/packaged_licenses/LICENSE.janino.txt
deleted file mode 100644
index ef871e2..0000000
--- a/flink-libraries/flink-table/packaged_licenses/LICENSE.janino.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Janino - An embedded Java[TM] compiler
-
-Copyright (c) 2001-2016, Arno Unkrig
-Copyright (c) 2015-2016 TIBCO Software Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials
- provided with the distribution.
- 3. Neither the name of JANINO nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
http://git-wip-us.apache.org/repos/asf/flink/blob/558a0b44/flink-libraries/flink-table/packaged_licenses/LICENSE.reflections.txt
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/packaged_licenses/LICENSE.reflections.txt b/flink-libraries/flink-table/packaged_licenses/LICENSE.reflections.txt
deleted file mode 100644
index 236d111..0000000
--- a/flink-libraries/flink-table/packaged_licenses/LICENSE.reflections.txt
+++ /dev/null
@@ -1,14 +0,0 @@
- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sa...@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. You just DO WHAT THE FUCK YOU WANT TO.
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flink/blob/558a0b44/flink-libraries/flink-table/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/main/resources/META-INF/NOTICE b/flink-libraries/flink-table/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..bfe2737
--- /dev/null
+++ b/flink-libraries/flink-table/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,64 @@
+===========================================================
+ NOTICE corresponding to the section 4d of
+ The Apache License, Version 2.0, for
+ flink-table
+===========================================================
+
+The 'flink-table' module bundles certain dependencies into
+the binary release artifacts.
+Below are the license statements where required by the license.
+
+Janino version (org.codehaus.janino : janino) v. 3.0.7
+under the following license:
+
+ Janino - An embedded Java[TM] compiler
+
+ Copyright (c) 2001-2016, Arno Unkrig
+ Copyright (c) 2015-2016 TIBCO Software Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ 3. Neither the name of JANINO nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Reflections (org.reflections : reflections) v. 0.9.10
+under the following license:
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sa...@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flink/blob/558a0b44/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 52ead11..86cdf72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1207,34 +1207,6 @@ under the License.
</executions>
</plugin>
- <!-- make sure all licenses that need to be repackaged are in the target folder -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <id>copy-packaged-licenses</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes/META-INF/licenses/</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/packaged_licenses</directory>
- <includes>
- <include>LICENSE.*.txt</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!-- We use shading in all packages for relocating some classes, such as
Guava and ASM.
By doing so, users adding Flink as a dependency won't run into conflicts.
[4/4] flink git commit: [hotfix] [build] Remove outdated and obsolete
plugin config in flink-runtime
Posted by se...@apache.org.
[hotfix] [build] Remove outdated and obsolete plugin config in flink-runtime
This removes an outdates plugin configuration for surefire, excluding
certain test data files which were way back conflicting with the test
naming pattern.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b2b94632
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b2b94632
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b2b94632
Branch: refs/heads/master
Commit: b2b94632d88b20a0bfaf00901a485ea705ccec31
Parents: 9498f4f
Author: Stephan Ewen <se...@apache.org>
Authored: Sun Oct 15 16:15:18 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Oct 15 19:08:12 2017 +0200
----------------------------------------------------------------------
flink-runtime/pom.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b2b94632/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index b59a403..a5372ed 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -360,19 +360,12 @@ under the License.
</configuration>
</plugin>
+ <!-- to increase build stability here, do not reuse unit test JVM forks -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
- <!-- <workingDirectory>${project.build.testOutputDirectory}</workingDirectory> -->
- <excludes>
- <exclude>**/TestData.java</exclude>
- <exclude>**/TestInstanceListener.java</exclude>
- </excludes>
- <systemPropertyVariables>
- <log.level>WARN</log.level>
- </systemPropertyVariables>
</configuration>
</plugin>
<plugin>
[2/4] flink git commit: [hotfix] [build] Change akka-remote exclusion
pattern to fix maven warnings
Posted by se...@apache.org.
[hotfix] [build] Change akka-remote exclusion pattern to fix maven warnings
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5ff7a0b6
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5ff7a0b6
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5ff7a0b6
Branch: refs/heads/master
Commit: 5ff7a0b6ffc716175039e02c26b22828c3478f15
Parents: 558a0b4
Author: Stephan Ewen <se...@apache.org>
Authored: Sun Oct 15 02:28:15 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Oct 15 19:08:11 2017 +0200
----------------------------------------------------------------------
pom.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5ff7a0b6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 86cdf72..e92b5ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -411,7 +411,11 @@ under the License.
<exclusions>
<exclusion>
<groupId>io.aeron</groupId>
- <artifactId>*</artifactId>
+ <artifactId>aeron-driver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.aeron</groupId>
+ <artifactId>aeron-client</artifactId>
</exclusion>
</exclusions>
</dependency>