From 51417e15684fc60acf1f6573295802521b531d09 Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@vmware.com>
Date: Fri, 8 Sep 2023 11:43:06 +0200
Subject: [PATCH] Fix documentation assembly descriptor

---
 spring-batch-docs/pom.xml                   |  2 +-
 spring-batch-docs/src/assembly/docs.xml     | 38 ---------------------
 spring-batch-docs/src/assembly/javadocs.xml | 15 ++++++++
 3 files changed, 16 insertions(+), 39 deletions(-)
 delete mode 100644 spring-batch-docs/src/assembly/docs.xml
 create mode 100644 spring-batch-docs/src/assembly/javadocs.xml

diff --git a/spring-batch-docs/pom.xml b/spring-batch-docs/pom.xml
index f05fda22c..59d5156c5 100644
--- a/spring-batch-docs/pom.xml
+++ b/spring-batch-docs/pom.xml
@@ -36,7 +36,7 @@
                 <version>${maven-assembly-plugin.version}</version>
                 <configuration>
                     <descriptors>
-                        <descriptor>src/assembly/docs.xml</descriptor>
+                        <descriptor>src/assembly/javadocs.xml</descriptor>
                         <descriptor>src/assembly/schemas.xml</descriptor>
                     </descriptors>
                     <finalName>spring-batch-${project.version}</finalName>
diff --git a/spring-batch-docs/src/assembly/docs.xml b/spring-batch-docs/src/assembly/docs.xml
deleted file mode 100644
index 7bf5caa61..000000000
--- a/spring-batch-docs/src/assembly/docs.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
-		  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
-	<id>docs</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>target/asciidoc</directory>
-			<outputDirectory>reference/html</outputDirectory>
-			<includes>
-				<include>css/*.*</include>
-				<include>images/*.*</include>
-				<include>img/*.*</include>
-				<include>js/**/*.*</include>
-				<include>*.html</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>../target/site/apidocs</directory>
-			<outputDirectory>api</outputDirectory>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target/asciidoc/index-single.pdf</source>
-			<destName>spring-batch-reference.pdf</destName>
-			<outputDirectory>reference/pdf</outputDirectory>
-		</file>
-		<file>
-			<source>target/asciidoc/index-single.epub</source>
-			<destName>spring-batch-reference.epub</destName>
-			<outputDirectory>reference/epub</outputDirectory>
-		</file>
-	</files>
-</assembly>
diff --git a/spring-batch-docs/src/assembly/javadocs.xml b/spring-batch-docs/src/assembly/javadocs.xml
new file mode 100644
index 000000000..9ec174daf
--- /dev/null
+++ b/spring-batch-docs/src/assembly/javadocs.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+		  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+	<id>javadocs</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>../target/site/apidocs</directory>
+			<outputDirectory>api</outputDirectory>
+		</fileSet>
+	</fileSets>
+</assembly>