From 6c903f4bda7ad9370384602620c905707e38243a Mon Sep 17 00:00:00 2001
From: Gemini Keith <Gemini Keith>
Date: Sun, 11 Sep 2016 10:07:58 +0800
Subject: [PATCH 1/3] add --chache option for git rm

---
 .../maven-scm-provider-gitexe/pom.xml                | 12 ++++++++++--
 .../git/gitexe/command/remove/GitRemoveCommand.java  |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
index b37527b46..27f3834b9 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
@@ -28,11 +28,19 @@
     <version>1.9.5</version>
   </parent>
 
-  <artifactId>maven-scm-provider-gitexe</artifactId>
+  <artifactId>maven-scm-provider-gitexe-dtdream</artifactId>
 
   <name>Maven SCM Git Provider - Git Executable Impl.</name>
   <description>Executable implementation for SCM Git Provider.</description>
 
+  <distributionManagement>
+    <repository>
+      <id>dtdream</id>
+      <name>releases</name>
+      <url>http://maven.tesir.top/content/repositories/releases/</url>
+    </repository>
+  </distributionManagement>
+
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>
@@ -67,7 +75,7 @@
             <goals>
               <goal>generate-metadata</goal>
             </goals>
-          </execution>        
+          </execution>
         </executions>        
       </plugin>
     </plugins>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
index 604cfe404..8e9eb8948 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
@@ -99,6 +99,8 @@ public static Commandline createCommandLine( File workingDirectory, List<File> f
 
         GitCommandLineUtils.addTarget( cl, files );
 
+        cl.createArg().setValue("--cache");
+
         return cl;
     }
 

From cb459afffd3c758acc6a3a339cc7b594b26c3f26 Mon Sep 17 00:00:00 2001
From: cloorc <13597105+cloorc@users.noreply.github.com>
Date: Fri, 24 Aug 2018 15:11:45 +0800
Subject: [PATCH 2/3] Update pom.xml

---
 .../maven-scm-provider-gitexe/pom.xml                  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
index 27f3834b9..1cdb14dee 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
@@ -28,19 +28,11 @@
     <version>1.9.5</version>
   </parent>
 
-  <artifactId>maven-scm-provider-gitexe-dtdream</artifactId>
+  <artifactId>maven-scm-provider-gitexe</artifactId>
 
   <name>Maven SCM Git Provider - Git Executable Impl.</name>
   <description>Executable implementation for SCM Git Provider.</description>
 
-  <distributionManagement>
-    <repository>
-      <id>dtdream</id>
-      <name>releases</name>
-      <url>http://maven.tesir.top/content/repositories/releases/</url>
-    </repository>
-  </distributionManagement>
-
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>

From e27a8204d252e115f8f42c799d6e6f45137373b1 Mon Sep 17 00:00:00 2001
From: cloorc <13597105+cloorc@users.noreply.github.com>
Date: Fri, 24 Aug 2018 15:13:54 +0800
Subject: [PATCH 3/3] Update GitRemoveCommand.java

---
 .../provider/git/gitexe/command/remove/GitRemoveCommand.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
index 8e9eb8948..680b4045f 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
@@ -99,7 +99,7 @@ public static Commandline createCommandLine( File workingDirectory, List<File> f
 
         GitCommandLineUtils.addTarget( cl, files );
 
-        cl.createArg().setValue("--cache");
+        cl.createArg().setValue("--cached");
 
         return cl;
     }