apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-08 08:27:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve the doc text of mvnd.pluginRealmEvictPattern option, fixes #533 (#534)

Browse Source
This commit is contained in:
Guillaume Nodet
2022-01-03 08:31:32 +01:00
committed by GitHub
parent 9f651b1196
commit 09cb99fd48
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-plugin/pom.xml
View File

@@ -34,7 +34,7 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<roaster.version>2.22.2.Final</roaster.version> <roaster.version>2.23.2.Final</roaster.version>
<maven.plugin-tools.version>3.6.0</maven.plugin-tools.version> <maven.plugin-tools.version>3.6.0</maven.plugin-tools.version>
<maven-plugin-plugin.version>${maven.plugin-tools.version}</maven-plugin-plugin.version> <maven-plugin-plugin.version>${maven.plugin-tools.version}</maven-plugin-plugin.version>
</properties> </properties>

3
build-plugin/src/main/java/org/mvndaemon/mvnd/plugin/doc/DocMojo.java
View File

@@ -99,7 +99,8 @@ public class DocMojo extends AbstractMojo {
final Properties optionsProperties = new SortedProperties(); final Properties optionsProperties = new SortedProperties();
for (EnumConstantSource enumConst : source.getEnumConstants()) { for (EnumConstantSource enumConst : source.getEnumConstants()) {
final JavaDocSource<EnumConstantSource> javaDoc = enumConst.getJavaDoc(); final JavaDocSource<EnumConstantSource> javaDoc = enumConst.getJavaDoc();
final String javadocText = javaDoc.getText(); final String javadocText = javaDoc.getText()
.replaceAll("&#47;", "/");
optionsProperties.setProperty(enumConst.getName(), javadocText); optionsProperties.setProperty(enumConst.getName(), javadocText);
} }
optionsProperties.store(Files.newOutputStream(propsPath), null); optionsProperties.store(Files.newOutputStream(propsPath), null);

11
common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
View File

@@ -251,7 +251,16 @@ public enum Environment {
*/ */
MVND_SOCKET_FAMILY("mvnd.socketFamily", null, "inet", OptionType.STRING, Flags.DISCRIMINATING), MVND_SOCKET_FAMILY("mvnd.socketFamily", null, "inet", OptionType.STRING, Flags.DISCRIMINATING),
/** /**
* Regexp pattern that will force eviction of the plugin realms if one of its dependencies matches. * Pattern that will force eviction of the plugin realms if one of its dependencies matches.
* The overall pattern is a comma separated list of either:
* <ul>
* <li>a glob pattern starting with <code>'glob:'</code> (the default syntax if no scheme is specified),</li>
* <li>a regex pattern starting with <code>'regex:'</code>,</li>
* <li>a maven expression, either <code>'mvn:[groupId]:[artifactId]:[version]'</code>,
* <code>'mvn:[groupId]:[artifactId]'</code> or <code>'mvn:[artifactId]</code>'.</li>
* </ul>
* This pattern will be evaluated against the full path of the dependencies, so it is usually desirable to
* start with <code>'glob:**&#47;'</code> to support any location of the local repository.
*/ */
MVND_PLUGIN_REALM_EVICT_PATTERN("mvnd.pluginRealmEvictPattern", null, "", OptionType.STRING, Flags.OPTIONAL), MVND_PLUGIN_REALM_EVICT_PATTERN("mvnd.pluginRealmEvictPattern", null, "", OptionType.STRING, Flags.OPTIONAL),
/** /**