You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2017/11/09 16:10:57 UTC
[1/2] flink git commit: [hotfix][build] Deduplicate maven-enforcer
version
Repository: flink
Updated Branches:
refs/heads/release-1.4 d302c652f -> 005a87177
[hotfix][build] Deduplicate maven-enforcer version
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7df7fc45
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7df7fc45
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7df7fc45
Branch: refs/heads/release-1.4
Commit: 7df7fc457618d371b4c1f9623ac7fc2cab37cb1f
Parents: d302c65
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Thu Oct 5 15:17:13 2017 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Thu Nov 9 15:44:57 2017 +0100
----------------------------------------------------------------------
pom.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7df7fc45/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d9d0a68..7b9309c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -885,7 +885,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -1194,7 +1193,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
<id>enforce-maven</id>
@@ -1324,6 +1322,11 @@ under the License.
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ </plugin>
<!-- Pin the version of the maven shade plugin -->
<plugin>
[2/2] flink git commit: [FLINK-7765][build] Enable dependency
convergence by default
Posted by al...@apache.org.
[FLINK-7765][build] Enable dependency convergence by default
Disable it in most modules.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/005a8717
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/005a8717
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/005a8717
Branch: refs/heads/release-1.4
Commit: 005a871771ce73bef9c78ee04a61817fa9a31e99
Parents: 7df7fc4
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Tue Nov 7 12:13:59 2017 +0100
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Thu Nov 9 15:45:09 2017 +0100
----------------------------------------------------------------------
flink-connectors/pom.xml | 20 ++++++++++++
flink-examples/pom.xml | 19 +++++++++++
flink-filesystems/pom.xml | 20 ++++++++++++
flink-fs-tests/pom.xml | 16 ++++++++++
flink-java/pom.xml | 1 -
flink-libraries/pom.xml | 19 +++++++++++
flink-runtime/pom.xml | 15 +++++++++
flink-scala/pom.xml | 15 +++++++++
flink-shaded-hadoop/pom.xml | 15 +++++++++
flink-streaming-scala/pom.xml | 16 ++++++++++
flink-tests/pom.xml | 18 ++++++++++-
flink-yarn-tests/pom.xml | 16 ++++++++++
flink-yarn/pom.xml | 16 ++++++++++
pom.xml | 65 ++++++++++++++++++++++++++++++++++++--
14 files changed, 266 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/pom.xml b/flink-connectors/pom.xml
index 7468b67..1f9f05f 100644
--- a/flink-connectors/pom.xml
+++ b/flink-connectors/pom.xml
@@ -100,4 +100,24 @@ under the License.
</profile>
</profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/pom.xml b/flink-examples/pom.xml
index 21db590..a4e530f 100644
--- a/flink-examples/pom.xml
+++ b/flink-examples/pom.xml
@@ -71,4 +71,23 @@ under the License.
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-filesystems/pom.xml
----------------------------------------------------------------------
diff --git a/flink-filesystems/pom.xml b/flink-filesystems/pom.xml
index e31ecef..075c0f7 100644
--- a/flink-filesystems/pom.xml
+++ b/flink-filesystems/pom.xml
@@ -42,4 +42,24 @@ under the License.
<module>flink-s3-fs-presto</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-fs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index 3ac62df..b56cca5 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -101,6 +101,22 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<environmentVariables>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index 6e2087d..6b635bd 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -71,7 +71,6 @@ under the License.
<build>
<plugins>
-
<!-- activate API compatibility checks -->
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-libraries/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/pom.xml b/flink-libraries/pom.xml
index 5b4cf79..ed6591b 100644
--- a/flink-libraries/pom.xml
+++ b/flink-libraries/pom.xml
@@ -61,4 +61,23 @@ under the License.
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index a7d0284..92a6f2f 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -243,6 +243,21 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<dependencies>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index f132145..95bc6b7 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -111,6 +111,21 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- activate API compatibility checks -->
<plugin>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 3e7cb41..c954993 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -56,6 +56,21 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- Relocate the Hadoop's Guava dependency into a different namespace and
put Hadoop into a fat-jar.
-->
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-streaming-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml
index 316731a..5253732 100644
--- a/flink-streaming-scala/pom.xml
+++ b/flink-streaming-scala/pom.xml
@@ -106,6 +106,22 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Scala Compiler -->
<plugin>
<groupId>net.alchim31.maven</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 2217199..c21bdb4 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -235,7 +235,23 @@ under the License.
</dependencies>
<build>
- <plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Scala Compiler -->
<plugin>
<groupId>net.alchim31.maven</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-yarn-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index 1232d15..f01e8be 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -138,6 +138,22 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Set the root directory for all tests to the project root.
We need this to be able to locate the final build (in flink-dist)
-->
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/flink-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
index feaace0..db6ee88 100644
--- a/flink-yarn/pom.xml
+++ b/flink-yarn/pom.xml
@@ -157,6 +157,22 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Scala Compiler -->
<plugin>
<groupId>net.alchim31.maven</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/005a8717/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7b9309c..21ad7aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,7 @@ under the License.
<junit.version>4.12</junit.version>
<mockito.version>1.10.19</mockito.version>
<powermock.version>1.6.5</powermock.version>
+ <hamcrest.version>1.3</hamcrest.version>
<japicmp.skip>false</japicmp.skip>
<!--
Keeping the MiniKDC version fixed instead of taking hadoop version dependency
@@ -161,7 +162,6 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -193,7 +193,7 @@ under the License.
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
+ <version>${hamcrest.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -305,6 +305,48 @@ under the License.
<version>${avro.version}</version>
</dependency>
+ <!-- For dependency convergence -->
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>${hamcrest.version}</version>
+ </dependency>
+
+ <!-- For dependency convergence -->
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <!-- For dependency convergence -->
+ <dependency>
+ <groupId>com.typesafe</groupId>
+ <artifactId>config</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+
+ <!-- For dependency convergence -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+
+ <!-- For dependency convergence -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+
+ <!-- For dependency convergence -->
+ <dependency>
+ <groupId>org.tukaani</groupId>
+ <artifactId>xz</artifactId>
+ <version>1.5</version>
+ </dependency>
+
<!-- Make sure we use a consistent commons-cli version throughout the project -->
<dependency>
<groupId>commons-cli</groupId>
@@ -901,7 +943,6 @@ under the License.
<version>1.8.0</version>
</requireJavaVersion>
</rules>
-
</configuration>
</execution>
</executions>
@@ -1190,6 +1231,7 @@ under the License.
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -1213,6 +1255,23 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <dependencyConvergence/>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- We use shading in all packages for relocating some classes, such as
Guava and ASM.