Skip to content

Commit ed743fd

Browse files
liugddxliugddx
authored
unify flatten-maven-plugin version (#3078)
1 parent 2f61d8e commit ed743fd

File tree

14 files changed

+15
-81
lines changed

14 files changed

+15
-81
lines changed

‎pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,10 @@
783783
<groupId>org.codehaus.mojo</groupId>
784784
<artifactId>license-maven-plugin</artifactId>
785785
</plugin>
786+
<plugin>
787+
<groupId>org.codehaus.mojo</groupId>
788+
<artifactId>flatten-maven-plugin</artifactId>
789+
</plugin>
786790
</plugins>
787791
</build>
788792

‎seatunnel-connectors-v2/connector-common/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@
4747
</execution>
4848
</executions>
4949
</plugin>
50-
<!-- make sure that flatten runs after maven-shade-plugin -->
51-
<plugin>
52-
<groupId>org.codehaus.mojo</groupId>
53-
<artifactId>flatten-maven-plugin</artifactId>
54-
</plugin>
5550
</plugins>
5651
</build>
57-
</project>
52+
</project>

‎seatunnel-connectors-v2/connector-file/connector-file-base-hadoop/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,7 @@
5757
<skip>true</skip>
5858
</configuration>
5959
</plugin>
60-
<!-- make sure that flatten runs after maven-shade-plugin -->
61-
<plugin>
62-
<groupId>org.codehaus.mojo</groupId>
63-
<artifactId>flatten-maven-plugin</artifactId>
64-
</plugin>
6560
</plugins>
6661
</build>
6762

68-
</project>
63+
</project>

‎seatunnel-connectors-v2/connector-file/connector-file-base/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,6 @@
155155
<skip>true</skip>
156156
</configuration>
157157
</plugin>
158-
<!-- make sure that flatten runs after maven-shade-plugin -->
159-
<plugin>
160-
<groupId>org.codehaus.mojo</groupId>
161-
<artifactId>flatten-maven-plugin</artifactId>
162-
</plugin>
163158
</plugins>
164159
</build>
165-
</project>
160+
</project>

‎seatunnel-connectors-v2/connector-file/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@
7979
</execution>
8080
</executions>
8181
</plugin>
82-
<!-- make sure that flatten runs after maven-shade-plugin -->
83-
<plugin>
84-
<groupId>org.codehaus.mojo</groupId>
85-
<artifactId>flatten-maven-plugin</artifactId>
86-
</plugin>
8782
</plugins>
8883
</build>
89-
</project>
84+
</project>

‎seatunnel-connectors-v2/connector-hive/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>connector-hive</artifactId>
31-
31+
3232
<properties>
3333
<hive.exec.version>2.3.9</hive.exec.version>
3434
<connector.name>connector.hive</connector.name>
@@ -129,11 +129,6 @@
129129
</execution>
130130
</executions>
131131
</plugin>
132-
<!-- make sure that flatten runs after maven-shade-plugin -->
133-
<plugin>
134-
<groupId>org.codehaus.mojo</groupId>
135-
<artifactId>flatten-maven-plugin</artifactId>
136-
</plugin>
137132
</plugins>
138133
</build>
139134
</project>

‎seatunnel-connectors-v2/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-shade-plugin</artifactId>
9393
</plugin>
94-
95-
<!-- make sure that flatten runs after maven-shade-plugin -->
96-
<plugin>
97-
<groupId>org.codehaus.mojo</groupId>
98-
<artifactId>flatten-maven-plugin</artifactId>
99-
</plugin>
10094
</plugins>
10195
</build>
10296

‎seatunnel-connectors/seatunnel-connectors-flink-sql/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@
3939
<groupId>org.apache.maven.plugins</groupId>
4040
<artifactId>maven-shade-plugin</artifactId>
4141
</plugin>
42-
43-
<!-- make sure that flatten runs after maven-shade-plugin -->
44-
<plugin>
45-
<groupId>org.codehaus.mojo</groupId>
46-
<artifactId>flatten-maven-plugin</artifactId>
47-
</plugin>
4842
</plugins>
4943
</build>
50-
</project>
44+
</project>

‎seatunnel-connectors/seatunnel-connectors-flink/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<module>seatunnel-connector-flink-http</module>
5050
<module>seatunnel-connector-flink-assert</module>
5151
</modules>
52-
52+
5353
<dependencyManagement>
5454
<dependencies>
5555
<!--seatunnel dependency-->
@@ -91,7 +91,7 @@
9191
</dependency>
9292
</dependencies>
9393
</dependencyManagement>
94-
94+
9595
<dependencies>
9696
<dependency>
9797
<groupId>org.apache.seatunnel</groupId>
@@ -109,12 +109,6 @@
109109
<groupId>org.apache.maven.plugins</groupId>
110110
<artifactId>maven-shade-plugin</artifactId>
111111
</plugin>
112-
113-
<!-- make sure that flatten runs after maven-shade-plugin -->
114-
<plugin>
115-
<groupId>org.codehaus.mojo</groupId>
116-
<artifactId>flatten-maven-plugin</artifactId>
117-
</plugin>
118112
</plugins>
119113
</build>
120114
</project>

‎seatunnel-connectors/seatunnel-connectors-spark/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
<scope>${spark.scope}</scope>
7777
</dependency>
7878
</dependencies>
79-
79+
8080
</dependencyManagement>
81-
81+
8282
<dependencies>
8383
<dependency>
8484
<groupId>org.apache.seatunnel</groupId>
@@ -102,12 +102,6 @@
102102
<groupId>org.apache.maven.plugins</groupId>
103103
<artifactId>maven-shade-plugin</artifactId>
104104
</plugin>
105-
106-
<!-- make sure that flatten runs after maven-shade-plugin -->
107-
<plugin>
108-
<groupId>org.codehaus.mojo</groupId>
109-
<artifactId>flatten-maven-plugin</artifactId>
110-
</plugin>
111105
</plugins>
112106
</build>
113107
</project>

0 commit comments

Comments
 (0)