Merge branch 'apache-3.2' into 3.2.0-beta.2-release

apache · Nov 22, 2022 · 8ce8c60 · 8ce8c60
2 parents ced5b71 + 4e74e1e
commit 8ce8c60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -416,7 +417,7 @@ public void readSPI(File path, List<String> spis) {
                     absolutePath = absolutePath.substring(absolutePath.lastIndexOf("src" + File.separator + "main" + File.separator + "java" + File.separator)
                         + ("src" + File.separator + "main" + File.separator + "java" + File.separator).length());
                     absolutePath = absolutePath.substring(0, absolutePath.lastIndexOf(".java"));
-                    absolutePath = absolutePath.replaceAll(File.separator, ".");
+                    absolutePath = absolutePath.replaceAll(Matcher.quoteReplacement(File.separator), ".");
                     spis.add(absolutePath);
                 }
             }
@@ -439,7 +440,7 @@ public void readSPIResource(File path, Map<File, String> spis) {
                 String absolutePath = path.getAbsolutePath();
                 absolutePath = absolutePath.substring(absolutePath.lastIndexOf("src" + File.separator + "main" + File.separator + "resources" + File.separator + "META-INF" + File.separator + "dubbo" + File.separator + "internal" + File.separator)
                     + ("src" + File.separator + "main" + File.separator + "resources" + File.separator + "META-INF" + File.separator + "dubbo" + File.separator + "internal" + File.separator).length());
-                absolutePath = absolutePath.replaceAll( File.separator, ".");
+                absolutePath = absolutePath.replaceAll(Matcher.quoteReplacement(File.separator), ".");
                 spis.put(path, absolutePath);
             }
         }

diff --git a/pom.xml b/pom.xml
@@ -120,7 +120,7 @@
         <maven_javadoc_version>3.2.0</maven_javadoc_version>
         <maven_jetty_version>9.4.38.v20210224</maven_jetty_version>
         <maven_checkstyle_version>3.1.2</maven_checkstyle_version>
-        <maven_jacoco_version>0.8.7</maven_jacoco_version>
+        <maven_jacoco_version>0.8.8</maven_jacoco_version>
         <maven_flatten_version>1.3.0</maven_flatten_version>
         <maven_enforce_version>3.0.0-M3</maven_enforce_version>
         <apache-rat-plugin.version>0.13</apache-rat-plugin.version>