Skip to content

Commit

Permalink
[FLINK-7765][build] Enable dependency convergence by default
Browse files Browse the repository at this point in the history 
Disable it in most modules.
  • Loading branch information
@pnowojski @aljoscha
pnowojski authored and aljoscha committed Nov 9, 2017
1 parent 856e8d2 commit bdbca37
Show file tree
Hide file tree
Showing 14 changed files with 266 additions and 5 deletions.
20 changes: 20 additions & 0 deletions flink-connectors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
19 changes: 19 additions & 0 deletions flink-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
20 changes: 20 additions & 0 deletions flink-filesystems/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
16 changes: 16 additions & 0 deletions flink-fs-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,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>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion flink-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ under the License.

<build>
<plugins>

<!-- activate API compatibility checks -->
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
Expand Down
19 changes: 19 additions & 0 deletions flink-libraries/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 15 additions & 0 deletions flink-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand Down
15 changes: 15 additions & 0 deletions flink-scala/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 15 additions & 0 deletions flink-shaded-hadoop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
Expand Down
16 changes: 16 additions & 0 deletions flink-streaming-scala/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 17 additions & 1 deletion flink-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 16 additions & 0 deletions flink-yarn-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-->
Expand Down
16 changes: 16 additions & 0 deletions flink-yarn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit bdbca37

Please sign in to comment.