Skip to content

Commit 31a805c

Browse files
committed
Switch to spring-asciidoctor-backends.
Resolves #1263.
1 parent e9578c9 commit 31a805c

File tree

1 file changed

+16
-50
lines changed

1 file changed

+16
-50
lines changed

pom.xml

Lines changed: 16 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<xmlunit1.version>1.6</xmlunit1.version>
123123
<xmlunit.version>2.7.0</xmlunit.version>
124124
<xom.version>1.3.7</xom.version>
125-
<docs.resources.version>0.2.5</docs.resources.version>
125+
<spring-asciidoctor-backends.version>0.0.3</spring-asciidoctor-backends.version>
126126
</properties>
127127

128128
<dependencyManagement>
@@ -229,13 +229,6 @@
229229
<version>${woodstox.version}</version>
230230
<scope>test</scope>
231231
</dependency>
232-
<dependency>
233-
<groupId>io.spring.docresources</groupId>
234-
<artifactId>spring-doc-resources</artifactId>
235-
<version>${docs.resources.version}</version>
236-
<type>zip</type>
237-
<optional>true</optional>
238-
</dependency>
239232
</dependencies>
240233

241234
<build>
@@ -530,27 +523,6 @@
530523
<build>
531524

532525
<plugins>
533-
<plugin>
534-
<groupId>org.apache.maven.plugins</groupId>
535-
<artifactId>maven-dependency-plugin</artifactId>
536-
<executions>
537-
<execution>
538-
<id>unpack-doc-resources</id>
539-
<goals>
540-
<goal>unpack-dependencies</goal>
541-
</goals>
542-
<phase>generate-resources</phase>
543-
<inherited>false</inherited>
544-
<configuration>
545-
<includeGroupIds>io.spring.docresources</includeGroupIds>
546-
<includeArtifactIds>spring-doc-resources</includeArtifactIds>
547-
<includeTypes>zip</includeTypes>
548-
<excludeTransitive>true</excludeTransitive>
549-
<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
550-
</configuration>
551-
</execution>
552-
</executions>
553-
</plugin>
554526
<plugin>
555527
<groupId>org.apache.maven.plugins</groupId>
556528
<artifactId>maven-resources-plugin</artifactId>
@@ -577,17 +549,17 @@
577549
<plugin>
578550
<groupId>org.asciidoctor</groupId>
579551
<artifactId>asciidoctor-maven-plugin</artifactId>
580-
<version>2.1.0</version>
552+
<version>2.2.2</version>
581553
<dependencies>
582554
<dependency>
583555
<groupId>org.asciidoctor</groupId>
584556
<artifactId>asciidoctorj-pdf</artifactId>
585-
<version>1.5.4</version>
557+
<version>2.3.0</version>
586558
</dependency>
587559
<dependency>
588-
<groupId>org.asciidoctor</groupId>
589-
<artifactId>asciidoctorj-epub3</artifactId>
590-
<version>1.5.1</version>
560+
<groupId>io.spring.asciidoctor.backends</groupId>
561+
<artifactId>spring-asciidoctor-backends</artifactId>
562+
<version>${spring-asciidoctor-backends.version}</version>
591563
</dependency>
592564
</dependencies>
593565
<executions>
@@ -599,14 +571,14 @@
599571
<goal>process-asciidoc</goal>
600572
</goals>
601573
<configuration>
602-
<backend>html5</backend>
574+
<backend>spring-html</backend>
603575
<outputDirectory>${project.build.directory}/site/reference/html</outputDirectory>
604576
<sourceHighlighter>highlight.js</sourceHighlighter>
605577
<attributes>
606578
// these attributes are required to use the doc resources
607579
<docinfo>shared</docinfo>
608580
<stylesdir>css/</stylesdir>
609-
<stylesheet>spring.css</stylesheet>
581+
<stylesheet>site.css</stylesheet>
610582
<linkcss>true</linkcss>
611583
<icons>font</icons>
612584
<highlightjsdir>js/highlight</highlightjsdir>
@@ -630,19 +602,6 @@
630602
</configuration>
631603
</execution>
632604

633-
<execution>
634-
<id>epub</id>
635-
<phase>generate-resources</phase>
636-
<inherited>false</inherited>
637-
<goals>
638-
<goal>process-asciidoc</goal>
639-
</goals>
640-
<configuration>
641-
<outputDirectory>${project.build.directory}/site/reference/epub</outputDirectory>
642-
<backend>epub3</backend>
643-
<sourceHighlighter>coderay</sourceHighlighter>
644-
</configuration>
645-
</execution>
646605
</executions>
647606

648607
<configuration>
@@ -659,7 +618,6 @@
659618
<baseDir>${project.basedir}</baseDir>
660619
</attributes>
661620
</configuration>
662-
663621
</plugin>
664622
<plugin>
665623
<groupId>org.apache.maven.plugins</groupId>
@@ -760,6 +718,14 @@
760718
</profiles>
761719

762720
<repositories>
721+
<repository>
722+
<id>spring-release</id>
723+
<name>Spring Releases</name>
724+
<url>https://repo.spring.io/releases</url>
725+
<snapshots>
726+
<enabled>false</enabled>
727+
</snapshots>
728+
</repository>
763729
<repository>
764730
<id>spring-libs-snapshot</id>
765731
<url>https://repo.spring.io/libs-snapshot</url>

0 commit comments

Comments
 (0)