Skip to content

Commit 334cd36

Browse files
ngocnhan-tran1996snicoll
authored andcommitted
Handle <p> in Maven Plugin Reference documentation
See gh-43622
1 parent 12e753c commit 334cd36

File tree

2 files changed

+3
-2
lines changed
  • buildSrc/src/main/java/org/springframework/boot/build/mavenplugin
  • spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages

2 files changed

+3
-2
lines changed

buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/PluginXmlParser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -118,6 +118,7 @@ private String format(String input) {
118118
.replace("<br>", " ")
119119
.replace("\n", " ")
120120
.replace("&quot;", "\"")
121+
.replace("<p>", " ")
121122
.replaceAll("\\{@code (.*?)}", "`$1`")
122123
.replaceAll("\\{@link (.*?)}", "`$1`")
123124
.replaceAll("\\{@literal (.*?)}", "`$1`")

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/packaging.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ The following configuration installs/deploys a single `task` classified artifact
168168
include::example$packaging/classified-artifact-pom.xml[tags=classified-artifact]
169169
----
170170

171-
As both the `maven-jar-plugin` and the `spring-boot-maven-plugin` runs at the same phase, it is important that the jar plugin is defined first (so that it runs before the repackage goal).
171+
As both the `maven-jar-plugin` and the `spring-boot-maven-plugin` run at the same phase, it is important that the jar plugin is defined first (so that it runs before the repackage goal).
172172
Again, if you are using `spring-boot-starter-parent`, this can be simplified as follows:
173173

174174
[source,xml,indent=0,subs="verbatim,attributes"]

0 commit comments

Comments
 (0)