Skip to content

Commit 8ce8c60

Browse files
committed
Merge branch 'apache-3.2' into 3.2.0-beta.2-release
2 parents ced5b71 + 4e74e1e commit 8ce8c60

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.List;
3434
import java.util.Map;
3535
import java.util.Objects;
36+
import java.util.regex.Matcher;
3637
import java.util.regex.Pattern;
3738
import java.util.stream.Collectors;
3839

@@ -416,7 +417,7 @@ public void readSPI(File path, List<String> spis) {
416417
absolutePath = absolutePath.substring(absolutePath.lastIndexOf("src" + File.separator + "main" + File.separator + "java" + File.separator)
417418
+ ("src" + File.separator + "main" + File.separator + "java" + File.separator).length());
418419
absolutePath = absolutePath.substring(0, absolutePath.lastIndexOf(".java"));
419-
absolutePath = absolutePath.replaceAll(File.separator, ".");
420+
absolutePath = absolutePath.replaceAll(Matcher.quoteReplacement(File.separator), ".");
420421
spis.add(absolutePath);
421422
}
422423
}
@@ -439,7 +440,7 @@ public void readSPIResource(File path, Map<File, String> spis) {
439440
String absolutePath = path.getAbsolutePath();
440441
absolutePath = absolutePath.substring(absolutePath.lastIndexOf("src" + File.separator + "main" + File.separator + "resources" + File.separator + "META-INF" + File.separator + "dubbo" + File.separator + "internal" + File.separator)
441442
+ ("src" + File.separator + "main" + File.separator + "resources" + File.separator + "META-INF" + File.separator + "dubbo" + File.separator + "internal" + File.separator).length());
442-
absolutePath = absolutePath.replaceAll( File.separator, ".");
443+
absolutePath = absolutePath.replaceAll(Matcher.quoteReplacement(File.separator), ".");
443444
spis.put(path, absolutePath);
444445
}
445446
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<maven_javadoc_version>3.2.0</maven_javadoc_version>
121121
<maven_jetty_version>9.4.38.v20210224</maven_jetty_version>
122122
<maven_checkstyle_version>3.1.2</maven_checkstyle_version>
123-
<maven_jacoco_version>0.8.7</maven_jacoco_version>
123+
<maven_jacoco_version>0.8.8</maven_jacoco_version>
124124
<maven_flatten_version>1.3.0</maven_flatten_version>
125125
<maven_enforce_version>3.0.0-M3</maven_enforce_version>
126126
<apache-rat-plugin.version>0.13</apache-rat-plugin.version>

0 commit comments

Comments
 (0)