You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/04/18 08:29:17 UTC
flink git commit: [FLINK-9186][build] Enable dependenvy convergence
for flink-libraries
Repository: flink
Updated Branches:
refs/heads/master d38695b8e -> 064db5367
[FLINK-9186][build] Enable dependenvy convergence for flink-libraries
This closes #5859.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/064db536
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/064db536
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/064db536
Branch: refs/heads/master
Commit: 064db536740955ec8718454dc5a8614dc8033f3d
Parents: d38695b
Author: zentol <ch...@apache.org>
Authored: Mon Apr 16 19:21:14 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Apr 18 10:28:57 2018 +0200
----------------------------------------------------------------------
flink-libraries/flink-ml/pom.xml | 10 ++++++++++
flink-libraries/flink-sql-client/pom.xml | 17 -----------------
flink-libraries/flink-table/pom.xml | 17 -----------------
flink-libraries/pom.xml | 20 --------------------
4 files changed, 10 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/064db536/flink-libraries/flink-ml/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-ml/pom.xml b/flink-libraries/flink-ml/pom.xml
index f05c7e7..aca2561 100644
--- a/flink-libraries/flink-ml/pom.xml
+++ b/flink-libraries/flink-ml/pom.xml
@@ -99,6 +99,16 @@
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_${scala.binary.version}</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<profiles>
<profile>
<id>windows</id>
http://git-wip-us.apache.org/repos/asf/flink/blob/064db536/flink-libraries/flink-sql-client/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-sql-client/pom.xml b/flink-libraries/flink-sql-client/pom.xml
index 3763bf0..6bcfc13 100644
--- a/flink-libraries/flink-sql-client/pom.xml
+++ b/flink-libraries/flink-sql-client/pom.xml
@@ -192,23 +192,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <!-- Enable enforcer plugin for checking dependency convergence -->
- <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>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/064db536/flink-libraries/flink-table/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
index acffb2b..395e5cb 100644
--- a/flink-libraries/flink-table/pom.xml
+++ b/flink-libraries/flink-table/pom.xml
@@ -385,23 +385,6 @@ under the License.
<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
</configuration>
</plugin>
-
- <!-- Enable enforcer plugin for checking dependency convergence -->
- <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>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/064db536/flink-libraries/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/pom.xml b/flink-libraries/pom.xml
index c0ac124..f2ddd20 100644
--- a/flink-libraries/pom.xml
+++ b/flink-libraries/pom.xml
@@ -67,24 +67,4 @@ under the License.
<artifactId>flink-test-utils-junit</artifactId>
</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>