Skip to content

Commit df4bf84

Browse files
committed
Fix Javadocs assembly
1 parent cf97e65 commit df4bf84

File tree

4 files changed

+4
-52
lines changed

4 files changed

+4
-52
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Generate Assembly
3232
working-directory: spring-batch-docs
33-
run: mvn site
33+
run: mvn assembly:single
3434

3535
- name: Capture project version
3636
run: echo PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version --quiet -DforceStdout) >> $GITHUB_ENV

pom.xml

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,8 @@
147147
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
148148
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
149149
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
150-
<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
151150
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
152151
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
153-
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
154-
<maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
155152
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
156153
<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
157154
</properties>
@@ -231,7 +228,6 @@
231228
<artifactId>maven-javadoc-plugin</artifactId>
232229
<version>${maven-javadoc-plugin.version}</version>
233230
<configuration>
234-
<sourcepath>src/main/java</sourcepath>
235231
<excludePackageNames>
236232
org.springframework.batch.sample.*
237233
</excludePackageNames>
@@ -247,13 +243,9 @@
247243
<goals>
248244
<goal>jar</goal>
249245
</goals>
250-
</execution>
251-
<execution>
252-
<id>generate-aggregate-javadocs</id>
253-
<phase>package</phase>
254-
<goals>
255-
<goal>aggregate</goal>
256-
</goals>
246+
<configuration>
247+
<sourcepath>src/main/java</sourcepath>
248+
</configuration>
257249
</execution>
258250
</executions>
259251
</plugin>
@@ -304,11 +296,6 @@
304296
</execution>
305297
</executions>
306298
</plugin>
307-
<plugin>
308-
<groupId>org.apache.maven.plugins</groupId>
309-
<artifactId>maven-site-plugin</artifactId>
310-
<version>${maven-site-plugin.version}</version>
311-
</plugin>
312299
<plugin>
313300
<groupId>org.apache.maven.plugins</groupId>
314301
<artifactId>maven-deploy-plugin</artifactId>
@@ -455,17 +442,4 @@
455442
</developer>
456443
</developers>
457444

458-
<reporting>
459-
<plugins>
460-
<plugin>
461-
<groupId>org.apache.maven.plugins</groupId>
462-
<artifactId>maven-project-info-reports-plugin</artifactId>
463-
<version>${maven-project-info-reports-plugin.version}</version>
464-
<configuration>
465-
<skip>true</skip>
466-
</configuration>
467-
</plugin>
468-
</plugins>
469-
</reporting>
470-
471445
</project>

spring-batch-bom/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,4 @@
6666
</dependencies>
6767
</dependencyManagement>
6868

69-
<build>
70-
<plugins>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-site-plugin</artifactId>
74-
<version>${maven-site-plugin.version}</version>
75-
<configuration>
76-
<skip>true</skip>
77-
</configuration>
78-
</plugin>
79-
</plugins>
80-
</build>
81-
8269
</project>

spring-batch-docs/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,6 @@
4646
<finalName>spring-batch-${project.version}</finalName>
4747
<appendAssemblyId>true</appendAssemblyId>
4848
</configuration>
49-
<executions>
50-
<execution>
51-
<id>create-distribution</id>
52-
<phase>site</phase>
53-
<goals>
54-
<goal>single</goal>
55-
</goals>
56-
</execution>
57-
</executions>
5849
</plugin>
5950
</plugins>
6051
</build>

0 commit comments

Comments
 (0)