Skip to content

Commit d112f6b

Browse files
author
Jay Bryant
committed
Switch to spring-asciidoctor-backends
to get the new look and feel and functionality.
1 parent 5b68dbc commit d112f6b

File tree

1 file changed

+25
-52
lines changed

1 file changed

+25
-52
lines changed

pom.xml

Lines changed: 25 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<source.level>17</source.level>
7373
<artifactory-maven-plugin.version>3.3.0</artifactory-maven-plugin.version>
7474
<assertj.version>3.23.1</assertj.version>
75-
<docs.resources.version>0.2.5</docs.resources.version>
75+
<spring-asciidoctor-backends.version>0.0.3</spring-asciidoctor-backends.version>
7676
<evo.version>1.3</evo.version>
7777
<logback.version>1.2.6</logback.version>
7878
<jacoco>0.8.7</jacoco>
@@ -193,13 +193,6 @@
193193
</properties>
194194

195195
<dependencies>
196-
<dependency>
197-
<groupId>io.spring.docresources</groupId>
198-
<artifactId>spring-doc-resources</artifactId>
199-
<version>${docs.resources.version}</version>
200-
<type>zip</type>
201-
<optional>true</optional>
202-
</dependency>
203196
<dependency>
204197
<groupId>org.springframework.data.build</groupId>
205198
<artifactId>spring-data-build-resources</artifactId>
@@ -221,20 +214,6 @@
221214
<groupId>org.apache.maven.plugins</groupId>
222215
<artifactId>maven-dependency-plugin</artifactId>
223216
<executions>
224-
<execution>
225-
<id>unpack-doc-resources</id>
226-
<goals>
227-
<goal>unpack-dependencies</goal>
228-
</goals>
229-
<phase>generate-resources</phase>
230-
<configuration>
231-
<includeGroupIds>io.spring.docresources</includeGroupIds>
232-
<includeArtifactIds>spring-doc-resources</includeArtifactIds>
233-
<includeTypes>zip</includeTypes>
234-
<excludeTransitive>true</excludeTransitive>
235-
<outputDirectory>${generated-asciidoc-sources.directory}</outputDirectory>
236-
</configuration>
237-
</execution>
238217
<execution>
239218
<id>unpack-shared-resources</id>
240219
<goals>
@@ -356,14 +335,10 @@
356335
<fileset dir="${generated-docs.directory}" includes="*.html"/>
357336
</copy>
358337

359-
<!-- Copy and rename the Epub file -->
338+
<!-- Copy and rename the PDF file -->
360339
<copy failonerror="false" file="${generated-docs.directory}/index.pdf"
361340
tofile="target/site/reference/pdf/spring-hateoas-reference.pdf"/>
362341

363-
<!-- Copy and rename the PDF file -->
364-
<copy failonerror="false" file="${generated-docs.directory}/index.epub"
365-
tofile="target/site/reference/epub/spring-hateoas-reference.epub"/>
366-
367342
</target>
368343
</configuration>
369344
<goals>
@@ -382,7 +357,7 @@
382357
<plugin>
383358
<groupId>org.asciidoctor</groupId>
384359
<artifactId>asciidoctor-maven-plugin</artifactId>
385-
<version>2.0.0-RC.1</version>
360+
<version>2.2.2</version>
386361
<dependencies>
387362
<dependency>
388363
<groupId>org.jruby</groupId>
@@ -392,19 +367,20 @@
392367
<dependency>
393368
<groupId>org.asciidoctor</groupId>
394369
<artifactId>asciidoctorj</artifactId>
395-
<version>2.0.0-RC.1</version>
370+
<version>2.5.3</version>
396371
</dependency>
397372
<dependency>
398373
<groupId>org.asciidoctor</groupId>
399374
<artifactId>asciidoctorj-pdf</artifactId>
400-
<version>1.5.0-alpha.16</version>
401-
</dependency>
402-
<dependency>
403-
<groupId>org.asciidoctor</groupId>
404-
<artifactId>asciidoctorj-epub3</artifactId>
405-
<version>1.5.0-alpha.8.1</version>
375+
<version>1.6.2</version>
406376
</dependency>
377+
<dependency>
378+
<groupId>io.spring.asciidoctor.backends</groupId>
379+
<artifactId>spring-asciidoctor-backends</artifactId>
380+
<version>${spring-asciidoctor-backends.version}</version>
381+
</dependency>
407382
</dependencies>
383+
408384
<executions>
409385

410386
<execution>
@@ -416,7 +392,7 @@
416392
<configuration>
417393
<sourceDirectory>${generated-asciidoc-sources.directory}</sourceDirectory>
418394
<sourceDocumentName>index.adoc</sourceDocumentName>
419-
<backend>html5</backend>
395+
<backend>spring-html</backend>
420396
<outputDirectory>${generated-docs.directory}</outputDirectory>
421397
<sourceHighlighter>highlight.js</sourceHighlighter>
422398
<attributes>
@@ -425,28 +401,13 @@
425401
<linkcss>true</linkcss>
426402
<sectanchors>true</sectanchors>
427403
<stylesdir>./css</stylesdir>
428-
<stylesheet>spring.css</stylesheet>
404+
<stylesheet>site.css</stylesheet>
429405
<toc>left</toc>
430406
</attributes>
431407
</configuration>
432408
</execution>
433409

434410
<!-- Requires a fix to Javadoc generation first otherwise build duration explodes
435-
<execution>
436-
<id>epub</id>
437-
<phase>compile</phase>
438-
<goals>
439-
<goal>process-asciidoc</goal>
440-
</goals>
441-
<configuration>
442-
<sourceDirectory>${generated-asciidoc-sources.directory}</sourceDirectory>
443-
<sourceDocumentName>index.adoc</sourceDocumentName>
444-
<backend>epub3</backend>
445-
<outputDirectory>${generated-docs.directory}</outputDirectory>
446-
<sourceHighlighter>coderay</sourceHighlighter>
447-
</configuration>
448-
</execution>
449-
450411
<execution>
451412
<id>pdf</id>
452413
<phase>compile</phase>
@@ -1215,9 +1176,21 @@
12151176
<enabled>false</enabled>
12161177
</releases>
12171178
</repository>
1179+
<repository>
1180+
<id>spring-release</id>
1181+
<name>Spring Releases</name>
1182+
<url>https://repo.spring.io/release</url>
1183+
<snapshots>
1184+
<enabled>false</enabled>
1185+
</snapshots>
1186+
</repository>
12181187
</repositories>
12191188

12201189
<pluginRepositories>
1190+
<pluginRepository>
1191+
<id>spring-plugins-release</id>
1192+
<url>https://repo.spring.io/plugins-release</url>
1193+
</pluginRepository>
12211194
<pluginRepository>
12221195
<id>bintray-plugins</id>
12231196
<name>bintray-plugins</name>

0 commit comments

Comments
 (0)