(dubbo) branch 3.3 updated: Fix dubbo-maven-plugin failed to run on windows. (#14616)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.3 by this push:
     new 40e214c34c Fix dubbo-maven-plugin failed to run on windows. (#14616)
40e214c34c is described below

commit 40e214c34c5bf94ed16f332b23b032efac17cb08
Author: Sean Yang <oxs...@gmail.com>
AuthorDate: Thu Sep 5 16:46:11 2024 +0800

    Fix dubbo-maven-plugin failed to run on windows. (#14616)
---
 dubbo-maven-plugin/pom.xml                           | 20 ++++++++++++++++++++
 .../plugin/protoc/WinDubboProtocPluginWrapper.java   |  2 +-
 pom.xml                                              |  9 +++++----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml
index be3537760a..6d5816f73a 100644
--- a/dubbo-maven-plugin/pom.xml
+++ b/dubbo-maven-plugin/pom.xml
@@ -37,6 +37,7 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>3.9.9</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -46,6 +47,25 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.5.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.xolstice.maven.plugins</groupId>
+      <artifactId>protobuf-maven-plugin</artifactId>
+      <version>${maven_protobuf_plugin_version}</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
diff --git 
a/dubbo-maven-plugin/src/main/java/org/apache/dubbo/maven/plugin/protoc/WinDubboProtocPluginWrapper.java
 
b/dubbo-maven-plugin/src/main/java/org/apache/dubbo/maven/plugin/protoc/WinDubboProtocPluginWrapper.java
index eff281c3e8..f9bc45a204 100644
--- 
a/dubbo-maven-plugin/src/main/java/org/apache/dubbo/maven/plugin/protoc/WinDubboProtocPluginWrapper.java
+++ 
b/dubbo-maven-plugin/src/main/java/org/apache/dubbo/maven/plugin/protoc/WinDubboProtocPluginWrapper.java
@@ -56,7 +56,7 @@ public class WinDubboProtocPluginWrapper implements 
DubboProtocPluginWrapper {
                 "jre/bin/client/jvm.dll",
                 "bin/client/jvm.dll");
         final File winRun4JIniFile =
-                new File(dubboProtocPlugin.getPluginDirectory(), 
dubboProtocPlugin.getId() + ".ini");
+                new File(dubboProtocPlugin.getPluginDirectory(), "protoc-gen-" 
+ dubboProtocPlugin.getId() + ".ini");
 
         if (winJvmDataModel != null) {
             if (!(winJvmDataModel.equals(WIN_JVM_DATA_MODEL_32) || 
winJvmDataModel.equals(WIN_JVM_DATA_MODEL_64))) {
diff --git a/pom.xml b/pom.xml
index eeac999eb1..2d90f26c07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     
<project.build.outputTimestamp>2020-04-01T08:04:00Z</project.build.outputTimestamp>
     <argline>-server -Xms256m -Xmx512m -XX:MetaspaceSize=64m 
-XX:MaxMetaspaceSize=128m -Dfile.encoding=UTF-8
-            -Djava.net.preferIPv4Stack=true</argline>
+      -Djava.net.preferIPv4Stack=true</argline>
     <arguments />
     <jacocoArgLine />
     <profile.name>oss</profile.name>
@@ -604,9 +604,10 @@
                   <consoleOutput>true</consoleOutput>
                   <failOnViolation>true</failOnViolation>
                   <skip>${checkstyle_unix.skip}</skip>
-                  <resourceExcludes>**/target/**/*</resourceExcludes>
-                  <resourceExcludes>**/generated/**/*
-                                        
**/generated-sources/**/*</resourceExcludes>
+                  <resourceExcludes>**/target/**/*,
+                    **/generated/**/*,
+                    **/generated-sources/**/*</resourceExcludes>
+                  <excludes>**/target/**/*</excludes>
                 </configuration>
               </execution>
             </executions>