Skip to content

Commit 2cfffd7

Browse files
committed
HV-2112 Use the Hibernate theme for rendered javadocs
1 parent ff8d126 commit 2cfffd7

File tree

2 files changed

+27
-30
lines changed

2 files changed

+27
-30
lines changed

documentation/pom.xml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<properties>
2323
<asciidoctor.base-output-dir>${project.build.directory}/asciidoctor/en-US</asciidoctor.base-output-dir>
24-
<asciidoctor.theme-dir>${project.build.directory}/hibernate-asciidoctor-theme</asciidoctor.theme-dir>
24+
<asciidoctor.theme-dir>${project.build.directory}/hibernate-asciidoctor-theme/asciidoc</asciidoctor.theme-dir>
2525
<asciidoctor.aggregated-resources-dir>${project.build.directory}/aggregated-resources</asciidoctor.aggregated-resources-dir>
2626
<asciidoctor.examples-source-dir>${basedir}/src/test/java</asciidoctor.examples-source-dir>
2727
<asciidoctor.examples-resources-dir>${basedir}/src/test/resources</asciidoctor.examples-resources-dir>
@@ -121,30 +121,6 @@
121121
<plugin>
122122
<artifactId>maven-compiler-plugin</artifactId>
123123
</plugin>
124-
<plugin>
125-
<artifactId>maven-dependency-plugin</artifactId>
126-
<executions>
127-
<execution>
128-
<id>unpack-asciidoctor-theme</id>
129-
<phase>generate-resources</phase>
130-
<goals>
131-
<goal>unpack</goal>
132-
</goals>
133-
<configuration>
134-
<artifactItems>
135-
<artifactItem>
136-
<groupId>org.hibernate.infra</groupId>
137-
<artifactId>hibernate-asciidoctor-theme</artifactId>
138-
<version>${version.org.hibernate.infra.hibernate-asciidoctor-theme}</version>
139-
<type>zip</type>
140-
<overWrite>true</overWrite>
141-
<outputDirectory>${project.build.directory}/</outputDirectory>
142-
</artifactItem>
143-
</artifactItems>
144-
</configuration>
145-
</execution>
146-
</executions>
147-
</plugin>
148124
<plugin>
149125
<groupId>org.apache.maven.plugins</groupId>
150126
<artifactId>maven-resources-plugin</artifactId>

pom.xml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<!-- Asciidoctor -->
225225

226226
<version.asciidoctor.plugin>3.2.0</version.asciidoctor.plugin>
227-
<version.org.hibernate.infra.hibernate-asciidoctor-theme>5.0.7.Final</version.org.hibernate.infra.hibernate-asciidoctor-theme>
227+
<version.org.hibernate.infra.hibernate-asciidoctor-theme>5.1.1.Final</version.org.hibernate.infra.hibernate-asciidoctor-theme>
228228
<version.org.hibernate.infra.hibernate-asciidoctor-extensions>3.1.1.Final</version.org.hibernate.infra.hibernate-asciidoctor-extensions>
229229
<version.org.asciidoctor.asciidoctorj>3.0.0</version.org.asciidoctor.asciidoctorj>
230230
<version.org.asciidoctor.asciidoctorj-pdf>2.3.19</version.org.asciidoctor.asciidoctorj-pdf>
@@ -1014,10 +1014,6 @@
10141014
</dependency>
10151015
</dependencies>
10161016
</plugin>
1017-
<plugin>
1018-
<artifactId>maven-dependency-plugin</artifactId>
1019-
<version>${version.dependency.plugin}</version>
1020-
</plugin>
10211017
<plugin>
10221018
<artifactId>maven-install-plugin</artifactId>
10231019
<version>${version.install.plugin}</version>
@@ -1162,8 +1158,33 @@
11621158
<!-- Java 17+ adds a warning for every single class/method/etc. without a javadoc comment, and we have lots of those.-->
11631159
<additionalOption>-Xdoclint:all,-missing</additionalOption>
11641160
</additionalOptions>
1161+
<stylesheetfile>${project.build.directory}/hibernate-asciidoctor-theme/javadoc/jdk21/stylesheet.css</stylesheetfile>
11651162
</configuration>
11661163
</plugin>
1164+
<plugin>
1165+
<artifactId>maven-dependency-plugin</artifactId>
1166+
<executions>
1167+
<execution>
1168+
<id>unpack-asciidoctor-theme</id>
1169+
<phase>generate-resources</phase>
1170+
<goals>
1171+
<goal>unpack</goal>
1172+
</goals>
1173+
<configuration>
1174+
<artifactItems>
1175+
<artifactItem>
1176+
<groupId>org.hibernate.infra</groupId>
1177+
<artifactId>hibernate-asciidoctor-theme</artifactId>
1178+
<version>${version.org.hibernate.infra.hibernate-asciidoctor-theme}</version>
1179+
<type>zip</type>
1180+
<overWrite>true</overWrite>
1181+
<outputDirectory>${project.build.directory}/</outputDirectory>
1182+
</artifactItem>
1183+
</artifactItems>
1184+
</configuration>
1185+
</execution>
1186+
</executions>
1187+
</plugin>
11671188
<plugin>
11681189
<artifactId>maven-deploy-plugin</artifactId>
11691190
<version>${version.deploy.plugin}</version>

0 commit comments

Comments
 (0)