Skip to content

Commit 62586c2

Browse files
authored
Specify locale for case conversion (#345)
1 parent 6f432fb commit 62586c2

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,7 +1787,7 @@ protected File getClassesFile(MavenProject project) {
17871787
* @return the list of source paths for the given project
17881788
*/
17891789
protected List<String> getProjectSourceRoots(MavenProject p) {
1790-
if ("pom".equals(p.getPackaging().toLowerCase())) {
1790+
if ("pom".equals(p.getPackaging().toLowerCase(Locale.ENGLISH))) {
17911791
return Collections.emptyList();
17921792
}
17931793

@@ -1801,7 +1801,7 @@ protected List<String> getProjectSourceRoots(MavenProject p) {
18011801
* @return the list of source paths for the execution project of the given project
18021802
*/
18031803
protected List<String> getExecutionProjectSourceRoots(MavenProject p) {
1804-
if ("pom".equals(p.getExecutionProject().getPackaging().toLowerCase())) {
1804+
if ("pom".equals(p.getExecutionProject().getPackaging().toLowerCase(Locale.ENGLISH))) {
18051805
return Collections.emptyList();
18061806
}
18071807

src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJarMojo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.Arrays;
2626
import java.util.Collections;
2727
import java.util.List;
28+
import java.util.Locale;
2829

2930
import org.apache.maven.artifact.Artifact;
3031
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -189,7 +190,7 @@ protected List<File> getProjectBuildOutputDirs(MavenProject p) {
189190

190191
@Override
191192
protected List<String> getProjectSourceRoots(MavenProject p) {
192-
if ("pom".equals(p.getPackaging().toLowerCase())) {
193+
if ("pom".equals(p.getPackaging().toLowerCase(Locale.ENGLISH))) {
193194
return Collections.emptyList();
194195
}
195196

@@ -198,7 +199,7 @@ protected List<String> getProjectSourceRoots(MavenProject p) {
198199

199200
@Override
200201
protected List<String> getExecutionProjectSourceRoots(MavenProject p) {
201-
if ("pom".equals(p.getExecutionProject().getPackaging().toLowerCase())) {
202+
if ("pom".equals(p.getExecutionProject().getPackaging().toLowerCase(Locale.ENGLISH))) {
202203
return Collections.emptyList();
203204
}
204205

src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ protected List<String> getProjectSourceRoots(MavenProject p) {
214214

215215
@Override
216216
protected List<String> getExecutionProjectSourceRoots(MavenProject p) {
217-
if ("pom".equals(p.getExecutionProject().getPackaging().toLowerCase())) {
217+
if ("pom".equals(p.getExecutionProject().getPackaging().toLowerCase(Locale.ENGLISH))) {
218218
return Collections.emptyList();
219219
}
220220

src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.Collections;
3131
import java.util.HashMap;
3232
import java.util.List;
33+
import java.util.Locale;
3334
import java.util.Map;
3435
import java.util.Objects;
3536

@@ -427,31 +428,31 @@ public void testCustomConfiguration() throws Exception {
427428
// read the contents of the html files based on some of the parameter values
428429
// author == false
429430
String str = readFile(apidocs.resolve("custom/configuration/AppSample.html"));
430-
assertFalse(str.toLowerCase().contains("author"));
431+
assertFalse(str.toLowerCase(Locale.ENGLISH).contains("author"));
431432

432433
// bottom
433-
assertTrue(str.toUpperCase().contains("SAMPLE BOTTOM CONTENT"));
434+
assertTrue(str.toUpperCase(Locale.ENGLISH).contains("SAMPLE BOTTOM CONTENT"));
434435

435436
// offlineLinks
436437
if (JavaVersion.JAVA_VERSION.isBefore("11.0.2")) {
437438
assertThat(str)
438439
.containsIgnoringCase("href=\"http://java.sun.com/j2se/1.4.2/docs/api/java/lang/string.html");
439440
} else {
440-
assertTrue(str.toLowerCase()
441+
assertTrue(str.toLowerCase(Locale.ENGLISH)
441442
.contains("href=\"http://java.sun.com/j2se/1.4.2/docs/api/java.base/java/lang/string.html"));
442443
}
443444

444445
// header
445-
assertTrue(str.toUpperCase().contains("MAVEN JAVADOC PLUGIN TEST"));
446+
assertTrue(str.toUpperCase(Locale.ENGLISH).contains("MAVEN JAVADOC PLUGIN TEST"));
446447

447448
// footer
448449
if (JavaVersion.JAVA_VERSION.isBefore("16-ea")
449450
&& !System.getProperty("java.vm.name").contains("OpenJ9")) {
450-
assertTrue(str.toUpperCase().contains("MAVEN JAVADOC PLUGIN TEST FOOTER"));
451+
assertTrue(str.toUpperCase(Locale.ENGLISH).contains("MAVEN JAVADOC PLUGIN TEST FOOTER"));
451452
}
452453

453454
// nohelp == true
454-
assertFalse(str.toUpperCase().contains("/HELP-DOC.HTML"));
455+
assertFalse(str.toUpperCase(Locale.ENGLISH).contains("/HELP-DOC.HTML"));
455456

456457
// check the wildcard (*) package exclusions -- excludePackageNames parameter
457458
assertThat(apidocs.resolve("custom/configuration/exclude1/Exclude1App.html"))
@@ -798,8 +799,9 @@ public void testTag() throws Exception {
798799
// which is not enough for Java 11 anymore
799800
if (JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore("11")) {
800801
assertThat(readed).contains(">Version:</");
801-
assertTrue(readed.toLowerCase().contains("</dt>" + LINE_SEPARATOR + " <dd>1.0</dd>")
802-
|| readed.toLowerCase().contains("</dt>" + LINE_SEPARATOR + "<dd>1.0</dd>" /* JDK 8 */));
802+
assertTrue(readed.toLowerCase(Locale.ENGLISH).contains("</dt>" + LINE_SEPARATOR + " <dd>1.0</dd>")
803+
|| readed.toLowerCase(Locale.ENGLISH)
804+
.contains("</dt>" + LINE_SEPARATOR + "<dd>1.0</dd>" /* JDK 8 */));
803805
}
804806
}
805807

0 commit comments

Comments
 (0)