* stable-5.1: Fix NoSuchFileException during directory cleanup in RefDirectory Update japicmp to 0.13.0 Prepare 5.1.1-SNAPSHOT builds JGit v5.1.0.201809111528-r Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Fix replacement quoting for replaceAll in filter command Prepare 4.11.3-SNAPSHOT builds JGit v4.11.2.201809100523-r Change-Id: Ia27fec6dabf87db26e2fd29c17570932649e234a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.2.0.201811281532-m3
@@ -1,18 +1,10 @@ | |||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> | |||
<component id="org.eclipse.jgit" version="2"> | |||
<resource path="META-INF/MANIFEST.MF"> | |||
<filter id="924844039"> | |||
<message_arguments> | |||
<message_argument value="5.1.0"/> | |||
<message_argument value="5.1.0"/> | |||
</message_arguments> | |||
</filter> | |||
</resource> | |||
<resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> | |||
<filter id="1141899266"> | |||
<message_arguments> | |||
<message_argument value="4.7"/> | |||
<message_argument value="5.1"/> | |||
<message_argument value="5.2"/> | |||
<message_argument value="createNewFileAtomic(File)"/> | |||
</message_arguments> | |||
</filter> | |||
@@ -21,7 +13,7 @@ | |||
<filter id="1141899266"> | |||
<message_arguments> | |||
<message_argument value="4.7"/> | |||
<message_argument value="5.1"/> | |||
<message_argument value="5.2"/> | |||
<message_argument value="LockToken"/> | |||
</message_arguments> | |||
</filter> |
@@ -50,6 +50,7 @@ import java.io.IOException; | |||
import java.util.HashMap; | |||
import java.util.Map; | |||
import java.util.Set; | |||
import java.util.regex.Matcher; | |||
import org.eclipse.jgit.annotations.Nullable; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
@@ -1438,7 +1439,8 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { | |||
return null; | |||
} | |||
return filterCommand.replaceAll("%f", //$NON-NLS-1$ | |||
QuotedString.BOURNE.quote((getPathString()))); | |||
Matcher.quoteReplacement( | |||
QuotedString.BOURNE.quote((getPathString())))); | |||
} | |||
/** |
@@ -208,7 +208,7 @@ | |||
<osgi-core-version>4.3.1</osgi-core-version> | |||
<servlet-api-version>3.1.0</servlet-api-version> | |||
<jetty-version>9.4.11.v20180605</jetty-version> | |||
<japicmp-version>0.12.0</japicmp-version> | |||
<japicmp-version>0.13.0</japicmp-version> | |||
<httpclient-version>4.5.5</httpclient-version> | |||
<httpcore-version>4.4.9</httpcore-version> | |||
<slf4j-version>1.7.2</slf4j-version> |