Skip to content

Commit bdbca37

Browse files
pnowojskialjoscha
pnowojski
authored and
aljoscha
committed
[FLINK-7765][build] Enable dependency convergence by default
Disable it in most modules.
1 parent 856e8d2 commit bdbca37

File tree

14 files changed

+266
-5
lines changed

14 files changed

+266
-5
lines changed

‎flink-connectors/pom.xml

+20
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,24 @@ under the License.
100100
</profile>
101101
</profiles>
102102

103+
<build>
104+
<plugins>
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-enforcer-plugin</artifactId>
108+
<executions>
109+
<execution>
110+
<id>dependency-convergence</id>
111+
<goals>
112+
<goal>enforce</goal>
113+
</goals>
114+
<configuration>
115+
<skip>true</skip>
116+
</configuration>
117+
</execution>
118+
</executions>
119+
</plugin>
120+
</plugins>
121+
</build>
122+
103123
</project>

‎flink-examples/pom.xml

+19
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,23 @@ under the License.
7171

7272
</dependencies>
7373

74+
<build>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-enforcer-plugin</artifactId>
79+
<executions>
80+
<execution>
81+
<id>dependency-convergence</id>
82+
<goals>
83+
<goal>enforce</goal>
84+
</goals>
85+
<configuration>
86+
<skip>true</skip>
87+
</configuration>
88+
</execution>
89+
</executions>
90+
</plugin>
91+
</plugins>
92+
</build>
7493
</project>

‎flink-filesystems/pom.xml

+20
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,24 @@ under the License.
4242
<module>flink-s3-fs-presto</module>
4343
</modules>
4444

45+
<build>
46+
<plugins>
47+
<plugin>
48+
<groupId>org.apache.maven.plugins</groupId>
49+
<artifactId>maven-enforcer-plugin</artifactId>
50+
<executions>
51+
<execution>
52+
<id>dependency-convergence</id>
53+
<goals>
54+
<goal>enforce</goal>
55+
</goals>
56+
<configuration>
57+
<skip>true</skip>
58+
</configuration>
59+
</execution>
60+
</executions>
61+
</plugin>
62+
</plugins>
63+
</build>
64+
4565
</project>

‎flink-fs-tests/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,22 @@ under the License.
9999

100100
<build>
101101
<plugins>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-enforcer-plugin</artifactId>
105+
<executions>
106+
<execution>
107+
<id>dependency-convergence</id>
108+
<goals>
109+
<goal>enforce</goal>
110+
</goals>
111+
<configuration>
112+
<skip>true</skip>
113+
</configuration>
114+
</execution>
115+
</executions>
116+
</plugin>
117+
102118
<plugin>
103119
<groupId>org.apache.maven.plugins</groupId>
104120
<artifactId>maven-surefire-plugin</artifactId>

‎flink-java/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ under the License.
7171

7272
<build>
7373
<plugins>
74-
7574
<!-- activate API compatibility checks -->
7675
<plugin>
7776
<groupId>com.github.siom79.japicmp</groupId>

‎flink-libraries/pom.xml

+19
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,23 @@ under the License.
6161
</dependency>
6262
</dependencies>
6363

64+
<build>
65+
<plugins>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-enforcer-plugin</artifactId>
69+
<executions>
70+
<execution>
71+
<id>dependency-convergence</id>
72+
<goals>
73+
<goal>enforce</goal>
74+
</goals>
75+
<configuration>
76+
<skip>true</skip>
77+
</configuration>
78+
</execution>
79+
</executions>
80+
</plugin>
81+
</plugins>
82+
</build>
6483
</project>

‎flink-runtime/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,21 @@ under the License.
241241

242242
<build>
243243
<plugins>
244+
<plugin>
245+
<groupId>org.apache.maven.plugins</groupId>
246+
<artifactId>maven-enforcer-plugin</artifactId>
247+
<executions>
248+
<execution>
249+
<id>dependency-convergence</id>
250+
<goals>
251+
<goal>enforce</goal>
252+
</goals>
253+
<configuration>
254+
<skip>true</skip>
255+
</configuration>
256+
</execution>
257+
</executions>
258+
</plugin>
244259
<plugin>
245260
<groupId>org.apache.maven.plugins</groupId>
246261
<artifactId>maven-checkstyle-plugin</artifactId>

‎flink-scala/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,21 @@ under the License.
111111

112112
<build>
113113
<plugins>
114+
<plugin>
115+
<groupId>org.apache.maven.plugins</groupId>
116+
<artifactId>maven-enforcer-plugin</artifactId>
117+
<executions>
118+
<execution>
119+
<id>dependency-convergence</id>
120+
<goals>
121+
<goal>enforce</goal>
122+
</goals>
123+
<configuration>
124+
<skip>true</skip>
125+
</configuration>
126+
</execution>
127+
</executions>
128+
</plugin>
114129

115130
<!-- activate API compatibility checks -->
116131
<plugin>

‎flink-shaded-hadoop/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@ under the License.
5656

5757
<build>
5858
<plugins>
59+
<plugin>
60+
<groupId>org.apache.maven.plugins</groupId>
61+
<artifactId>maven-enforcer-plugin</artifactId>
62+
<executions>
63+
<execution>
64+
<id>dependency-convergence</id>
65+
<goals>
66+
<goal>enforce</goal>
67+
</goals>
68+
<configuration>
69+
<skip>true</skip>
70+
</configuration>
71+
</execution>
72+
</executions>
73+
</plugin>
5974
<!-- Relocate the Hadoop's Guava dependency into a different namespace and
6075
put Hadoop into a fat-jar.
6176
-->

‎flink-streaming-scala/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,22 @@ under the License.
106106

107107
<build>
108108
<plugins>
109+
<plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-enforcer-plugin</artifactId>
112+
<executions>
113+
<execution>
114+
<id>dependency-convergence</id>
115+
<goals>
116+
<goal>enforce</goal>
117+
</goals>
118+
<configuration>
119+
<skip>true</skip>
120+
</configuration>
121+
</execution>
122+
</executions>
123+
</plugin>
124+
109125
<!-- Scala Compiler -->
110126
<plugin>
111127
<groupId>net.alchim31.maven</groupId>

‎flink-tests/pom.xml

+17-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,23 @@ under the License.
235235
</dependencies>
236236

237237
<build>
238-
<plugins>
238+
<plugins>
239+
<plugin>
240+
<groupId>org.apache.maven.plugins</groupId>
241+
<artifactId>maven-enforcer-plugin</artifactId>
242+
<executions>
243+
<execution>
244+
<id>dependency-convergence</id>
245+
<goals>
246+
<goal>enforce</goal>
247+
</goals>
248+
<configuration>
249+
<skip>true</skip>
250+
</configuration>
251+
</execution>
252+
</executions>
253+
</plugin>
254+
239255
<!-- Scala Compiler -->
240256
<plugin>
241257
<groupId>net.alchim31.maven</groupId>

‎flink-yarn-tests/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,22 @@ under the License.
138138

139139
<build>
140140
<plugins>
141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-enforcer-plugin</artifactId>
144+
<executions>
145+
<execution>
146+
<id>dependency-convergence</id>
147+
<goals>
148+
<goal>enforce</goal>
149+
</goals>
150+
<configuration>
151+
<skip>true</skip>
152+
</configuration>
153+
</execution>
154+
</executions>
155+
</plugin>
156+
141157
<!-- Set the root directory for all tests to the project root.
142158
We need this to be able to locate the final build (in flink-dist)
143159
-->

‎flink-yarn/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,22 @@ under the License.
157157

158158
<build>
159159
<plugins>
160+
<plugin>
161+
<groupId>org.apache.maven.plugins</groupId>
162+
<artifactId>maven-enforcer-plugin</artifactId>
163+
<executions>
164+
<execution>
165+
<id>dependency-convergence</id>
166+
<goals>
167+
<goal>enforce</goal>
168+
</goals>
169+
<configuration>
170+
<skip>true</skip>
171+
</configuration>
172+
</execution>
173+
</executions>
174+
</plugin>
175+
160176
<!-- Scala Compiler -->
161177
<plugin>
162178
<groupId>net.alchim31.maven</groupId>

0 commit comments

Comments
 (0)