Skip to content

Commit 5abb87f

Browse files
authored
Fix duplicate artifacts issue with maven-source-plugin in release build (#4237)
1 parent ca98a7e commit 5abb87f

File tree

27 files changed

+15
-60
lines changed

27 files changed

+15
-60
lines changed

bookkeeper-common/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<plugin>
115115
<groupId>org.apache.maven.plugins</groupId>
116116
<artifactId>maven-jar-plugin</artifactId>
117-
<version>${maven-jar-plugin.version}</version>
118117
<executions>
119118
<execution>
120119
<goals>

bookkeeper-dist/all/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</parent>
2929

3030
<artifactId>bookkeeper-dist-all</artifactId>
31-
<packaging>jar</packaging>
31+
<packaging>pom</packaging>
3232
<name>Apache BookKeeper :: Dist (All)</name>
3333

3434
<dependencies>
@@ -129,8 +129,8 @@
129129
<build>
130130
<plugins>
131131
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
132133
<artifactId>maven-assembly-plugin</artifactId>
133-
<version>${maven-assembly-plugin.version}</version>
134134
<configuration>
135135
<finalName>bookkeeper-all-${project.version}</finalName>
136136
<attach>false</attach>
@@ -152,7 +152,6 @@
152152
<plugin>
153153
<groupId>org.apache.maven.plugins</groupId>
154154
<artifactId>maven-deploy-plugin</artifactId>
155-
<version>${maven-deploy-plugin.version}</version>
156155
<configuration>
157156
<skip>true</skip>
158157
</configuration>

bookkeeper-dist/bkctl/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</parent>
2929

3030
<artifactId>bkctl</artifactId>
31-
<packaging>jar</packaging>
31+
<packaging>pom</packaging>
3232
<name>Apache BookKeeper :: Dist (Bkctl)</name>
3333

3434
<dependencies>
@@ -49,8 +49,8 @@
4949
<build>
5050
<plugins>
5151
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
5253
<artifactId>maven-assembly-plugin</artifactId>
53-
<version>${maven-assembly-plugin.version}</version>
5454
<configuration>
5555
<finalName>bkctl-${project.version}</finalName>
5656
<attach>true</attach>
@@ -72,7 +72,6 @@
7272
<plugin>
7373
<groupId>org.apache.maven.plugins</groupId>
7474
<artifactId>maven-deploy-plugin</artifactId>
75-
<version>${maven-deploy-plugin.version}</version>
7675
<configuration>
7776
<skip>true</skip>
7877
</configuration>

bookkeeper-dist/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<build>
3838
<plugins>
3939
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
4041
<artifactId>maven-jar-plugin</artifactId>
41-
<version>${maven-jar-plugin.version}</version>
4242
<executions>
4343
<execution>
4444
<id>default-jar</id>
@@ -47,8 +47,8 @@
4747
</executions>
4848
</plugin>
4949
<plugin>
50+
<groupId>org.apache.maven.plugins</groupId>
5051
<artifactId>maven-assembly-plugin</artifactId>
51-
<version>${maven-assembly-plugin.version}</version>
5252
<configuration>
5353
<finalName>bookkeeper-${project.version}</finalName>
5454
<descriptors>

bookkeeper-dist/server/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</parent>
2929

3030
<artifactId>bookkeeper-dist-server</artifactId>
31-
<packaging>jar</packaging>
31+
<packaging>pom</packaging>
3232
<name>Apache BookKeeper :: Dist (Server)</name>
3333

3434
<dependencies>
@@ -103,8 +103,8 @@
103103
<build>
104104
<plugins>
105105
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
106107
<artifactId>maven-assembly-plugin</artifactId>
107-
<version>${maven-assembly-plugin.version}</version>
108108
<configuration>
109109
<finalName>bookkeeper-server-${project.version}</finalName>
110110
<attach>true</attach>
@@ -126,7 +126,6 @@
126126
<plugin>
127127
<groupId>org.apache.maven.plugins</groupId>
128128
<artifactId>maven-deploy-plugin</artifactId>
129-
<version>${maven-deploy-plugin.version}</version>
130129
<configuration>
131130
<skip>true</skip>
132131
</configuration>

bookkeeper-server/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@
239239
<plugin>
240240
<groupId>org.apache.maven.plugins</groupId>
241241
<artifactId>maven-jar-plugin</artifactId>
242-
<version>${maven-jar-plugin.version}</version>
243242
<executions>
244243
<execution>
245244
<goals>

circe-checksum/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
<plugin>
9494
<groupId>org.apache.maven.plugins</groupId>
9595
<artifactId>maven-assembly-plugin</artifactId>
96-
<version>${maven-assembly-plugin.version}</version>
9796
<configuration>
9897
<descriptors>
9998
<descriptor>src/main/assembly/assembly.xml</descriptor>

cpu-affinity/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,11 @@
5252
<plugin>
5353
<groupId>com.github.maven-nar</groupId>
5454
<artifactId>nar-maven-plugin</artifactId>
55-
<version>${nar-maven-plugin.version}</version>
5655
<extensions>true</extensions>
5756
</plugin>
5857
<plugin>
5958
<groupId>org.apache.maven.plugins</groupId>
6059
<artifactId>maven-assembly-plugin</artifactId>
61-
<version>${maven-assembly-plugin.version}</version>
6260
<configuration>
6361
<descriptors>
6462
<descriptor>src/main/assembly/assembly.xml</descriptor>
@@ -103,7 +101,6 @@
103101
<plugin>
104102
<groupId>com.github.maven-nar</groupId>
105103
<artifactId>nar-maven-plugin</artifactId>
106-
<version>${nar-maven-plugin.version}</version>
107104
<extensions>true</extensions>
108105
<executions>
109106
<execution>
@@ -140,7 +137,6 @@
140137
<plugin>
141138
<groupId>com.github.maven-nar</groupId>
142139
<artifactId>nar-maven-plugin</artifactId>
143-
<version>${nar-maven-plugin.version}</version>
144140
<extensions>true</extensions>
145141
<configuration>
146142
<runtime>${nar.runtime}</runtime>
@@ -175,7 +171,6 @@
175171
<plugin>
176172
<groupId>com.github.maven-nar</groupId>
177173
<artifactId>nar-maven-plugin</artifactId>
178-
<version>${nar-maven-plugin.version}</version>
179174
<extensions>true</extensions>
180175
<configuration>
181176
<runtime>${nar.runtime}</runtime>
@@ -212,7 +207,6 @@
212207
<plugin>
213208
<groupId>com.github.maven-nar</groupId>
214209
<artifactId>nar-maven-plugin</artifactId>
215-
<version>${nar-maven-plugin.version}</version>
216210
<extensions>true</extensions>
217211
<configuration>
218212
<runtime>${nar.runtime}</runtime>

microbenchmarks/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
<plugin>
8282
<groupId>org.apache.maven.plugins</groupId>
8383
<artifactId>maven-shade-plugin</artifactId>
84-
<version>${maven-shade-plugin.version}</version>
8584
<executions>
8685
<execution>
8786
<phase>package</phase>

native-io/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,11 @@
4949
<plugin>
5050
<groupId>com.github.maven-nar</groupId>
5151
<artifactId>nar-maven-plugin</artifactId>
52-
<version>${nar-maven-plugin.version}</version>
5352
<extensions>true</extensions>
5453
</plugin>
5554
<plugin>
5655
<groupId>org.apache.maven.plugins</groupId>
5756
<artifactId>maven-assembly-plugin</artifactId>
58-
<version>${maven-assembly-plugin.version}</version>
5957
<configuration>
6058
<descriptors>
6159
<descriptor>src/main/assembly/assembly.xml</descriptor>
@@ -94,7 +92,6 @@
9492
<plugin>
9593
<groupId>com.github.maven-nar</groupId>
9694
<artifactId>nar-maven-plugin</artifactId>
97-
<version>${nar-maven-plugin.version}</version>
9895
<extensions>true</extensions>
9996
<executions>
10097
<execution>
@@ -131,7 +128,6 @@
131128
<plugin>
132129
<groupId>com.github.maven-nar</groupId>
133130
<artifactId>nar-maven-plugin</artifactId>
134-
<version>${nar-maven-plugin.version}</version>
135131
<extensions>true</extensions>
136132
<configuration>
137133
<runtime>${nar.runtime}</runtime>
@@ -166,7 +162,6 @@
166162
<plugin>
167163
<groupId>com.github.maven-nar</groupId>
168164
<artifactId>nar-maven-plugin</artifactId>
169-
<version>${nar-maven-plugin.version}</version>
170165
<extensions>true</extensions>
171166
<configuration>
172167
<runtime>${nar.runtime}</runtime>
@@ -203,7 +198,6 @@
203198
<plugin>
204199
<groupId>com.github.maven-nar</groupId>
205200
<artifactId>nar-maven-plugin</artifactId>
206-
<version>${nar-maven-plugin.version}</version>
207201
<extensions>true</extensions>
208202
<configuration>
209203
<runtime>${nar.runtime}</runtime>

pom.xml

+3-13
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.apache</groupId>
2121
<artifactId>apache</artifactId>
22-
<version>26</version>
22+
<version>29</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>org.apache.bookkeeper</groupId>
@@ -187,17 +187,8 @@
187187
<license-maven-plugin.version>1.6</license-maven-plugin.version>
188188
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
189189
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
190-
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
191190
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
192-
<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
193191
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
194-
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
195-
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
196-
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
197-
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
198-
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
199-
<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
200-
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
201192
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
202193
<dependency-check-maven.version>8.0.2</dependency-check-maven.version>
203194
<nar-maven-plugin.version>3.10.1</nar-maven-plugin.version>
@@ -884,7 +875,6 @@
884875
<plugin>
885876
<groupId>org.apache.maven.plugins</groupId>
886877
<artifactId>maven-javadoc-plugin</artifactId>
887-
<version>${maven-javadoc-plugin.version}</version>
888878
<configuration>
889879
<!-- skip javadoc generation by default, use -Pdelombok to activate -->
890880
<skip>true</skip>
@@ -991,12 +981,11 @@
991981
<plugin>
992982
<groupId>org.apache.maven.plugins</groupId>
993983
<artifactId>maven-source-plugin</artifactId>
994-
<version>${maven-source-plugin.version}</version>
995984
<executions>
996985
<execution>
997986
<id>attach-sources</id>
998987
<goals>
999-
<goal>jar</goal>
988+
<goal>jar-no-fork</goal>
1000989
</goals>
1001990
</execution>
1002991
</executions>
@@ -1314,6 +1303,7 @@
13141303
<build>
13151304
<plugins>
13161305
<plugin>
1306+
<groupId>org.apache.maven.plugins</groupId>
13171307
<artifactId>maven-assembly-plugin</artifactId>
13181308
<executions>
13191309
<execution>

shaded/bookkeeper-server-shaded/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<plugin>
5959
<groupId>org.apache.maven.plugins</groupId>
6060
<artifactId>maven-shade-plugin</artifactId>
61-
<version>${maven-shade-plugin.version}</version>
6261
<executions>
6362
<execution>
6463
<phase>package</phase>
@@ -119,8 +118,8 @@
119118
</executions>
120119
</plugin>
121120
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
122122
<artifactId>maven-clean-plugin</artifactId>
123-
<version>${maven-clean-plugin.version}</version>
124123
<configuration>
125124
<filesets>
126125
<fileset>

shaded/bookkeeper-server-tests-shaded/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<plugin>
8484
<groupId>org.apache.maven.plugins</groupId>
8585
<artifactId>maven-shade-plugin</artifactId>
86-
<version>${maven-shade-plugin.version}</version>
8786
<executions>
8887
<execution>
8988
<phase>package</phase>
@@ -137,8 +136,8 @@
137136
</executions>
138137
</plugin>
139138
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140140
<artifactId>maven-clean-plugin</artifactId>
141-
<version>${maven-clean-plugin.version}</version>
142141
<configuration>
143142
<filesets>
144143
<fileset>

shaded/distributedlog-core-shaded/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<plugin>
6464
<groupId>org.apache.maven.plugins</groupId>
6565
<artifactId>maven-shade-plugin</artifactId>
66-
<version>${maven-shade-plugin.version}</version>
6766
<executions>
6867
<execution>
6968
<phase>package</phase>
@@ -231,8 +230,8 @@
231230
</executions>
232231
</plugin>
233232
<plugin>
233+
<groupId>org.apache.maven.plugins</groupId>
234234
<artifactId>maven-clean-plugin</artifactId>
235-
<version>${maven-clean-plugin.version}</version>
236235
<configuration>
237236
<filesets>
238237
<fileset>

stream/clients/java/all/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<plugin>
5151
<groupId>org.apache.maven.plugins</groupId>
5252
<artifactId>maven-shade-plugin</artifactId>
53-
<version>${maven-shade-plugin.version}</version>
5453
<executions>
5554
<execution>
5655
<phase>package</phase>
@@ -97,8 +96,8 @@
9796
</executions>
9897
</plugin>
9998
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100100
<artifactId>maven-clean-plugin</artifactId>
101-
<version>${maven-clean-plugin.version}</version>
102101
<configuration>
103102
<filesets>
104103
<fileset>

stream/clients/java/base/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
<plugin>
6767
<groupId>org.apache.maven.plugins</groupId>
6868
<artifactId>maven-jar-plugin</artifactId>
69-
<version>${maven-jar-plugin.version}</version>
7069
<executions>
7170
<execution>
7271
<goals>

stream/distributedlog/common/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
<plugin>
9797
<groupId>org.apache.maven.plugins</groupId>
9898
<artifactId>maven-jar-plugin</artifactId>
99-
<version>${maven-jar-plugin.version}</version>
10099
<executions>
101100
<execution>
102101
<goals>

stream/distributedlog/core/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
<plugin>
9797
<groupId>org.apache.maven.plugins</groupId>
9898
<artifactId>maven-jar-plugin</artifactId>
99-
<version>${maven-jar-plugin.version}</version>
10099
<executions>
101100
<execution>
102101
<goals>

stream/distributedlog/protocol/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-jar-plugin</artifactId>
49-
<version>${maven-jar-plugin.version}</version>
5049
<executions>
5150
<execution>
5251
<goals>

stream/proto/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
<plugin>
101101
<groupId>org.apache.maven.plugins</groupId>
102102
<artifactId>maven-jar-plugin</artifactId>
103-
<version>${maven-jar-plugin.version}</version>
104103
<executions>
105104
<execution>
106105
<goals>

0 commit comments

Comments
 (0)