Skip to content

Commit 21f5509

Browse files
mp911deodrotbohm
authored andcommitted
Use spring-html Asciidoctor backend
1 parent b17783f commit 21f5509

File tree

1 file changed

+16
-69
lines changed

1 file changed

+16
-69
lines changed

parent/pom.xml

Lines changed: 16 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
<smallrye-mutiny>1.6.0</smallrye-mutiny>
131131
<slf4j>1.7.32</slf4j>
132132
<spring>6.0.0-SNAPSHOT</spring>
133+
<spring-asciidoctor-backends.version>0.0.3</spring-asciidoctor-backends.version>
133134
<spring-hateoas>2.0.0-M5</spring-hateoas>
134135
<spring-plugin>3.0.0-M1</spring-plugin>
135136
<servlet-api>5.0.0</servlet-api>
@@ -268,8 +269,7 @@
268269

269270
<properties>
270271
<shared.resources>${project.build.directory}/shared-resources</shared.resources>
271-
<generated-asciidoc-sources.directory>${project.build.directory}/generated-asciidoc-sources/source/
272-
</generated-asciidoc-sources.directory>
272+
<generated-asciidoc-sources.directory>${project.build.directory}/generated-asciidoc-sources/source/</generated-asciidoc-sources.directory>
273273
<generated-docs.directory>${project.build.directory}/generated-docs</generated-docs.directory>
274274
<maven.test.skip>true</maven.test.skip>
275275
<aspectj.skip>true</aspectj.skip>
@@ -279,13 +279,6 @@
279279
</properties>
280280

281281
<dependencies>
282-
<dependency>
283-
<groupId>io.spring.docresources</groupId>
284-
<artifactId>spring-doc-resources</artifactId>
285-
<version>0.2.5</version>
286-
<type>zip</type>
287-
<optional>true</optional>
288-
</dependency>
289282
<dependency>
290283
<groupId>org.springframework.data.build</groupId>
291284
<artifactId>spring-data-build-resources</artifactId>
@@ -317,20 +310,6 @@
317310
<groupId>org.apache.maven.plugins</groupId>
318311
<artifactId>maven-dependency-plugin</artifactId>
319312
<executions>
320-
<execution>
321-
<id>unpack-doc-resources</id>
322-
<goals>
323-
<goal>unpack-dependencies</goal>
324-
</goals>
325-
<phase>generate-resources</phase>
326-
<configuration>
327-
<includeGroupIds>io.spring.docresources</includeGroupIds>
328-
<includeArtifactIds>spring-doc-resources</includeArtifactIds>
329-
<includeTypes>zip</includeTypes>
330-
<excludeTransitive>true</excludeTransitive>
331-
<outputDirectory>${generated-asciidoc-sources.directory}</outputDirectory>
332-
</configuration>
333-
</execution>
334313
<execution>
335314
<id>unpack-shared-resources</id>
336315
<goals>
@@ -395,61 +374,23 @@
395374
</goals>
396375
</execution>
397376

398-
<execution>
399-
<id>create-generated-docs-resources</id>
400-
<phase>process-resources</phase>
401-
<configuration>
402-
<target>
403-
<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/">
404-
<fileset dir="${project.root}/src/main/asciidoc" includes="**/*.adoc"/>
405-
</copy>
406-
<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/images/">
407-
<fileset dir="${project.root}/src/main/asciidoc/images"/>
408-
</copy>
409-
410-
<copy todir="${generated-docs.directory}">
411-
<fileset dir="${generated-asciidoc-sources.directory}">
412-
<include name="css/**"/>
413-
<include name="js/**"/>
414-
</fileset>
415-
</copy>
416-
</target>
417-
</configuration>
418-
<goals>
419-
<goal>run</goal>
420-
</goals>
421-
</execution>
422-
423377
<execution>
424378
<id>rename-reference-docs</id>
425379
<phase>prepare-package</phase>
426380
<configuration>
427381
<target>
428382

429383
<!-- Copy files for the single-file HTML version -->
430-
<copy failonerror="false" todir="${project.root}/target/site/reference/html/images">
431-
<fileset dir="${generated-docs.directory}/images"/>
432-
</copy>
433-
434-
<!-- Copy shared resources. Spring Data ones first to override the ones shared -->
435-
<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
436-
<fileset dir="${shared.resources}">
437-
<include name="css/**"/>
438-
<include name="js/**"/>
439-
</fileset>
440-
</copy>
441-
442-
<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
443-
<fileset dir="${generated-asciidoc-sources.directory}">
384+
<copy failonerror="false" todir="${project.root}/target/site/reference/html">
385+
<fileset dir="${generated-docs.directory}">
386+
<include name="img/**"/>
387+
<include name="images/**"/>
444388
<include name="css/**"/>
445389
<include name="js/**"/>
390+
<include name="**/*.html"/>
446391
</fileset>
447392
</copy>
448393

449-
<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
450-
<fileset dir="${generated-docs.directory}" includes="*.html"/>
451-
</copy>
452-
453394
<!-- Copy and rename the Epub file -->
454395
<copy failonerror="false" file="${generated-docs.directory}/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
455396

@@ -493,9 +434,8 @@
493434
<goal>process-asciidoc</goal>
494435
</goals>
495436
<configuration>
496-
<sourceDirectory>${generated-asciidoc-sources.directory}</sourceDirectory>
497437
<sourceDocumentName>index.adoc</sourceDocumentName>
498-
<backend>html5</backend>
438+
<backend>spring-html</backend>
499439
<outputDirectory>${generated-docs.directory}</outputDirectory>
500440
<attributes>
501441
<source-highlighter>highlight.js</source-highlighter>
@@ -504,7 +444,7 @@
504444
<linkcss>true</linkcss>
505445
<sectanchors>true</sectanchors>
506446
<stylesdir>./css</stylesdir>
507-
<stylesheet>spring.css</stylesheet>
447+
<stylesheet>site.css</stylesheet>
508448
<toc>left</toc>
509449
</attributes>
510450
</configuration>
@@ -532,6 +472,13 @@
532472
</attributes>
533473
</configuration>
534474

475+
<dependencies>
476+
<dependency>
477+
<groupId>io.spring.asciidoctor.backends</groupId>
478+
<artifactId>spring-asciidoctor-backends</artifactId>
479+
<version>${spring-asciidoctor-backends.version}</version>
480+
</dependency>
481+
</dependencies>
535482
</plugin>
536483

537484
<!--

0 commit comments

Comments
 (0)