Skip to content

Commit 0ece5aa

Browse files
aclementaclement
committed
Script and maven changes to build the bundle for publishing in one go
1 parent 5813dd5 commit 0ece5aa

File tree

8 files changed

+764
-101
lines changed

8 files changed

+764
-101
lines changed

‎aspectjmatcher/pom.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@
144144
<!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want -->
145145
<appendAssemblyId>true</appendAssemblyId>
146146
<skipAssembly>${maven.source.skip}</skipAssembly>
147+
<!-- Override parent's finalName to use module's finalName -->
148+
<finalName>${project.build.finalName}</finalName>
147149
<archive>
148150
</archive>
149151
<descriptors>
@@ -193,7 +195,11 @@
193195
<goal>jar</goal>
194196
</goals>
195197
<configuration>
198+
<skip>${maven.javadoc.skip}</skip>
196199
<sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
200+
<!-- Override parent's subpackages - when using sourcepath, javadoc should discover packages automatically -->
201+
<!-- But we still need to tell it which packages to process, so use the same package name -->
202+
<subpackages>org.aspectj</subpackages>
197203
</configuration>
198204
</execution>
199205
</executions>
@@ -213,6 +219,12 @@
213219
</executions>
214220
</plugin>
215221

222+
<!-- Generate checksums for published artifacts -->
223+
<plugin>
224+
<groupId>net.nicoulaj.maven.plugins</groupId>
225+
<artifactId>checksum-maven-plugin</artifactId>
226+
</plugin>
227+
216228
<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
217229
<plugin>
218230
<groupId>org.codehaus.mojo</groupId>
@@ -238,11 +250,6 @@
238250
</executions>
239251
</plugin>
240252

241-
<!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) -->
242-
<plugin>
243-
<groupId>org.sonatype.plugins</groupId>
244-
<artifactId>nexus-staging-maven-plugin</artifactId>
245-
</plugin>
246253

247254
</plugins>
248255
<pluginManagement>

‎aspectjrt/pom.xml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@
142142
<!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want -->
143143
<appendAssemblyId>true</appendAssemblyId>
144144
<skipAssembly>${maven.source.skip}</skipAssembly>
145+
<!-- Override parent's finalName to use module's finalName -->
146+
<finalName>${project.build.finalName}</finalName>
145147
<archive>
146148
</archive>
147149
<descriptors>
@@ -191,7 +193,13 @@
191193
<goal>jar</goal>
192194
</goals>
193195
<configuration>
196+
<skip>${maven.javadoc.skip}</skip>
194197
<sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
198+
<!-- Override parent's subpackages - when using sourcepath, javadoc should discover packages automatically -->
199+
<!-- But we still need to tell it which packages to process, so use the same package name -->
200+
<subpackages>org.aspectj</subpackages>
201+
<!-- Additional debug: show what javadoc is processing -->
202+
<verbose>true</verbose>
195203
</configuration>
196204
</execution>
197205
</executions>
@@ -239,6 +247,12 @@
239247
</executions>
240248
</plugin>
241249

250+
<!-- Generate checksums for published artifacts -->
251+
<plugin>
252+
<groupId>net.nicoulaj.maven.plugins</groupId>
253+
<artifactId>checksum-maven-plugin</artifactId>
254+
</plugin>
255+
242256
<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
243257
<plugin>
244258
<groupId>org.codehaus.mojo</groupId>
@@ -264,11 +278,6 @@
264278
</executions>
265279
</plugin>
266280

267-
<!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) -->
268-
<plugin>
269-
<groupId>org.sonatype.plugins</groupId>
270-
<artifactId>nexus-staging-maven-plugin</artifactId>
271-
</plugin>
272281

273282
</plugins>
274283
<pluginManagement>

‎aspectjtools/pom.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@
167167
<!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want -->
168168
<appendAssemblyId>true</appendAssemblyId>
169169
<skipAssembly>${maven.source.skip}</skipAssembly>
170+
<!-- Override parent's finalName to use module's finalName -->
171+
<finalName>${project.build.finalName}</finalName>
170172
<archive>
171173
</archive>
172174
<descriptors>
@@ -265,7 +267,11 @@
265267
<goal>jar</goal>
266268
</goals>
267269
<configuration>
270+
<skip>${maven.javadoc.skip}</skip>
268271
<sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
272+
<!-- Override parent's subpackages - when using sourcepath, javadoc should discover packages automatically -->
273+
<!-- But we still need to tell it which packages to process, so use the same package name -->
274+
<subpackages>org.aspectj</subpackages>
269275
</configuration>
270276
</execution>
271277
</executions>
@@ -285,6 +291,12 @@
285291
</executions>
286292
</plugin>
287293

294+
<!-- Generate checksums for published artifacts -->
295+
<plugin>
296+
<groupId>net.nicoulaj.maven.plugins</groupId>
297+
<artifactId>checksum-maven-plugin</artifactId>
298+
</plugin>
299+
288300
<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
289301
<plugin>
290302
<groupId>org.codehaus.mojo</groupId>
@@ -310,11 +322,6 @@
310322
</executions>
311323
</plugin>
312324

313-
<!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) -->
314-
<plugin>
315-
<groupId>org.sonatype.plugins</groupId>
316-
<artifactId>nexus-staging-maven-plugin</artifactId>
317-
</plugin>
318325

319326
</plugins>
320327

‎aspectjweaver/pom.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@
168168
<!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want -->
169169
<appendAssemblyId>true</appendAssemblyId>
170170
<skipAssembly>${maven.source.skip}</skipAssembly>
171+
<!-- Override parent's finalName to use module's finalName -->
172+
<finalName>${project.build.finalName}</finalName>
171173
<archive>
172174
</archive>
173175
<descriptors>
@@ -266,7 +268,11 @@
266268
<goal>jar</goal>
267269
</goals>
268270
<configuration>
271+
<skip>${maven.javadoc.skip}</skip>
269272
<sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
273+
<!-- Override parent's subpackages - when using sourcepath, javadoc should discover packages automatically -->
274+
<!-- But we still need to tell it which packages to process, so use the same package name -->
275+
<subpackages>org.aspectj</subpackages>
270276
</configuration>
271277
</execution>
272278
</executions>
@@ -314,6 +320,12 @@
314320
</executions>
315321
</plugin>
316322

323+
<!-- Generate checksums for published artifacts -->
324+
<plugin>
325+
<groupId>net.nicoulaj.maven.plugins</groupId>
326+
<artifactId>checksum-maven-plugin</artifactId>
327+
</plugin>
328+
317329
<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
318330
<plugin>
319331
<groupId>org.codehaus.mojo</groupId>
@@ -339,11 +351,6 @@
339351
</executions>
340352
</plugin>
341353

342-
<!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) -->
343-
<plugin>
344-
<groupId>org.sonatype.plugins</groupId>
345-
<artifactId>nexus-staging-maven-plugin</artifactId>
346-
</plugin>
347354

348355
</plugins>
349356
<pluginManagement>

0 commit comments

Comments
 (0)