Merge branch 'stable-5.11'
* stable-5.11:
Refactor CommitCommand to improve readability
CommitCommand: fix formatting
CommitCommand: remove unncessary comment
Ensure post-commit hook is called after index lock was released
sshd: try all configured signature algorithms for a key
sshd: modernize ssh config file parsing
sshd: implement ssh config PubkeyAcceptedAlgorithms
Change-Id: Ic3235ffd84c9d7537a1fe5ff4f216578e6e26724
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/Documentation/config-options.md b/Documentation/config-options.md
index d463551..a9ca48c 100644
--- a/Documentation/config-options.md
+++ b/Documentation/config-options.md
@@ -7,6 +7,8 @@
| ✅ | option defined by native git |
| ⃞ | jgit custom option not supported by native git |
+For details on native git options see also the official [git config documentation](https://git-scm.com/docs/git-config).
+
## __core__ options
| option | default | git option | description |
@@ -59,6 +61,24 @@
| `gc.pruneExpire` | `2.weeks.ago` | ✅ | Grace period after which unreachable objects will be pruned. |
| `gc.prunePackExpire` | `1.hour.ago` | ⃞ | Grace period after which packfiles only containing unreachable objects will be pruned. |
+## __http__ options
+
+| option | default | git option | description |
+|---------|---------|------------|-------------|
+| `http.cookieFile`| | ✅ | Absolute path (with tilde expansion) of a cookie file in Netscape format. |
+| `http.cookieFileCacheLimit`| 10 | ⃞ | JGit caches at most this number of the most recently used cookie files. |
+| `http.extraHeader`| | ✅ | Extra HTTP header(s) to send with HTTP requests, in the format "`Key: Value`". May appear multiple times; an empty option clears the list. |
+| `http.followRedirects`| `initial` | ✅ | `true`, `false`, or `initial`. Whether to follow a redirect always, never, or only on the first HTTP request in a git remote operation. |
+| `http.maxRedirects`| 5 | ⃞ | Maximum number of redirects to follow; can be overridden via the Java system property `http.maxRedirects`. |
+| `http.postBuffer`| `1 MiB` | ✅ | Maximum size in bytes for single HTTP POST requests; for larger requests, HTTP 1.1 chunked transfer is used. |
+| `http.saveCookies`| `false` | ✅ | Boolean; if `true` and `http.cookieFile` is set, save received cookies. |
+| `http.sslVerify`| `true` | ✅ | Boolean; whether to check SSL certificates in HTTPS connections. |
+| `http.userAgent`| | ✅ | User-agent string to send with HTTP requests. Must be 7bit-ASCII. Can be overridden via environment variable `GIT_HTTP_USER_AGENT`. |
+
+All `http.*` options can also be specified in a URL-specific way using the format `http.<url>.*`. See the official [git config documentation](https://git-scm.com/docs/git-config#Documentation/git-config.txt-httplturlgt) for details.
+
+Proxy configuration uses the standard Java mechanisms via class `java.net.ProxySelector`.
+
## __pack__ options
| option | default | git option | description |
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 7bb56a0..5fc0e9a 100644
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
Automatic-Module-Name: org.eclipse.jgit.ant.test
Bundle-SymbolicName: org.eclipse.jgit.ant.test
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.ant.tasks;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index cc46d76..f1e01e7 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index fd05d2c..812634e 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ant
Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)"
+ org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="5.11.1",
- org.eclipse.jgit.ant.tasks;version="5.11.1";
+Export-Package: org.eclipse.jgit.ant;version="5.12.0",
+ org.eclipse.jgit.ant.tasks;version="5.12.0";
uses:="org.apache.tools.ant,
org.apache.tools.ant.types"
diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
index 81c01f6..ee4006a 100644
--- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ant - Sources
Bundle-SymbolicName: org.eclipse.jgit.ant.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 9bc075c..f6a268a 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant</artifactId>
diff --git a/org.eclipse.jgit.archive/.settings/.api_filters b/org.eclipse.jgit.archive/.settings/.api_filters
deleted file mode 100644
index f4a934a..0000000
--- a/org.eclipse.jgit.archive/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.jgit.archive" version="2">
- <resource path="src/org/eclipse/jgit/archive/BaseFormat.java" type="org.eclipse.jgit.archive.BaseFormat">
- <filter id="336658481">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.archive.BaseFormat"/>
- <message_argument value="COMPRESSION_LEVEL"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index 7d22393..043241e 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.archive
Bundle-SymbolicName: org.eclipse.jgit.archive
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -13,17 +13,17 @@
org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)",
org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)",
org.apache.commons.compress.compressors.xz;version="[1.4,2.0)",
- org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.jgit.archive.FormatActivator
-Export-Package: org.eclipse.jgit.archive;version="5.11.1";
+Export-Package: org.eclipse.jgit.archive;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.api,
org.apache.commons.compress.archivers,
org.osgi.framework",
- org.eclipse.jgit.archive.internal;version="5.11.1";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="5.12.0";x-internal:=true
diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
index 8897c1d..e63330e 100644
--- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.archive - Sources
Bundle-SymbolicName: org.eclipse.jgit.archive.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index 1440f91..2da96d4 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml
index 49dae02..6178745 100644
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jgit</groupId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
<artifactId>org.eclipse.jgit.benchmarks</artifactId>
<packaging>jar</packaging>
diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml
index bc93418..6c42abf 100644
--- a/org.eclipse.jgit.coverage/pom.xml
+++ b/org.eclipse.jgit.coverage/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,88 +27,88 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.archive</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ui</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.test</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.test</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
index 2b8b1a5..0e584f8 100644
--- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -12,9 +12,9 @@
org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
- org.eclipse.jgit.gpg.bc.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.gpg.bc.internal.keys;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.sha1;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.gpg.bc.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.sha1;version="[5.12.0,5.13.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)",
org.junit.runners;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml
index 29fc22c..f55b54a 100644
--- a/org.eclipse.jgit.gpg.bc.test/pom.xml
+++ b/org.eclipse.jgit.gpg.bc.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.gpg.bc.test</artifactId>
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index e77177f..11aa3fd 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.gpg.bc
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.1,5.12.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.0,5.13.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)",
org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)",
@@ -29,9 +29,9 @@
org.bouncycastle.util;version="[1.65.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
org.bouncycastle.util.io;version="[1.65.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.gpg.bc;version="5.11.1",
- org.eclipse.jgit.gpg.bc.internal;version="5.11.1";x-friends:="org.eclipse.jgit.gpg.bc.test",
- org.eclipse.jgit.gpg.bc.internal.keys;version="5.11.1";x-friends:="org.eclipse.jgit.gpg.bc.test"
+Export-Package: org.eclipse.jgit.gpg.bc;version="5.12.0",
+ org.eclipse.jgit.gpg.bc.internal;version="5.12.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="5.12.0";x-friends:="org.eclipse.jgit.gpg.bc.test"
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
index 662d8f0..7851004 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.gpg.bc - Sources
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml
index feb17dd..d5b7962 100644
--- a/org.eclipse.jgit.gpg.bc/pom.xml
+++ b/org.eclipse.jgit.gpg.bc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.gpg.bc</artifactId>
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index 07572c6..3f1068a 100644
--- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.apache
Bundle-SymbolicName: org.eclipse.jgit.http.apache
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
@@ -25,11 +25,11 @@
org.apache.http.impl.conn;version="[4.4.0,5.0.0)",
org.apache.http.params;version="[4.3.0,5.0.0)",
org.apache.http.ssl;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="5.11.1";
+ org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="5.12.0";
uses:="org.apache.http.client,
org.eclipse.jgit.transport.http,
org.apache.http.entity,
diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
index 806a9b6..b53fff2 100644
--- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.http.apache - Sources
Bundle-SymbolicName: org.eclipse.jgit.http.apache.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index 09525a7..7d6cffe 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 1efd612..a4bbfd9 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.server
Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="5.11.1",
- org.eclipse.jgit.http.server.glue;version="5.11.1";
+Export-Package: org.eclipse.jgit.http.server;version="5.12.0",
+ org.eclipse.jgit.http.server.glue;version="5.12.0";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="5.11.1";
+ org.eclipse.jgit.http.server.resolver;version="5.12.0";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.lib,
org.eclipse.jgit.transport,
@@ -18,14 +18,14 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)"
+ org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)"
diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
index 3e7e444..5ef910d 100644
--- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.http.server - Sources
Bundle-SymbolicName: org.eclipse.jgit.http.server.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index a3f1d2d..fb3890c 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.server</artifactId>
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index fcd738d..170595f 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.test
Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,26 +28,26 @@
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.http.server;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.http.server.glue;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.http.server.resolver;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit.http;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.http.server;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.http.server.glue;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.http.server.resolver;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit.http;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.hamcrest;version="[1.1.0,2.0.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index 226fa3c..5e3f2d1 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.test</artifactId>
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 563a780..a170764 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit.http
Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
@@ -22,16 +22,16 @@
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.http.server;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.http.server;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)",
org.junit;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="5.11.1";
+Export-Package: org.eclipse.jgit.junit.http;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.junit,
javax.servlet.http,
diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
index 5788778..55d08fb 100644
--- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.junit.http - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.http.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index 1b06523..03b1692 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.http</artifactId>
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index fc6d388..b0d87bd 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit.ssh
Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
@@ -33,16 +33,16 @@
org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)",
org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.ssh;version="5.11.1"
+Export-Package: org.eclipse.jgit.junit.ssh;version="5.12.0"
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
index 836e419..9dd564f 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.junit.ssh - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index 4811ba7..b73fcf1 100644
--- a/org.eclipse.jgit.junit.ssh/pom.xml
+++ b/org.eclipse.jgit.junit.ssh/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.ssh</artifactId>
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index b23b82f..c9aa1ec 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -3,35 +3,35 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit
Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.merge;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="5.11.1",
- org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.time;version="[5.11.1,5.12.0)",
+Import-Package: org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.merge;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="5.12.0",
+ org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.time;version="[5.12.0,5.13.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)",
org.junit.runners;version="[4.13,5.0.0)",
org.junit.runners.model;version="[4.13,5.0.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="5.11.1";
+Export-Package: org.eclipse.jgit.junit;version="5.12.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
@@ -44,4 +44,4 @@
org.junit.runners.model,
org.junit.runner,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.junit.time;version="5.11.1";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="5.12.0";uses:="org.eclipse.jgit.util.time"
diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
index 42e8610..8e44b87 100644
--- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.junit - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 7815a55..f1ad71a 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
index 64556ac..5622108 100644
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
@@ -25,6 +25,7 @@
import java.io.Reader;
import java.nio.file.Path;
import java.time.Instant;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -39,6 +40,7 @@
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
+import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -386,6 +388,16 @@
}
/**
+ * Get all Refs
+ *
+ * @return list of refs
+ * @throws IOException
+ */
+ public List<Ref> getRefs() throws IOException {
+ return db.getRefDatabase().getRefs();
+ }
+
+ /**
* Checkout a branch
*
* @param branchName
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index 75f5e4c..c0fd56e 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.server.test
Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,24 +28,24 @@
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit.http;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.server;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.test;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit.http;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.server;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.test;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index a4812b1..5d8352c 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index 78f545b..2bf113b 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.server
Bundle-SymbolicName: org.eclipse.jgit.lfs.server
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="5.11.1";
+Export-Package: org.eclipse.jgit.lfs.server;version="5.12.0";
uses:="javax.servlet.http,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="5.11.1";
+ org.eclipse.jgit.lfs.server.fs;version="5.12.0";
uses:="javax.servlet,
javax.servlet.http,
org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.internal;version="5.11.1";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="5.11.1";
+ org.eclipse.jgit.lfs.server.internal;version="5.12.0";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="5.12.0";
uses:="org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -24,15 +24,15 @@
javax.servlet.annotation;version="[3.1.0,4.0.0)",
javax.servlet.http;version="[3.1.0,4.0.0)",
org.apache.http;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
index b1d9aee..38fc66c 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.lfs.server - Sources
Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index b726e6b..cfb0f9f 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index 72aa22b..3626a2f 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.test
Bundle-SymbolicName: org.eclipse.jgit.lfs.test
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+Import-Package: org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)",
org.junit.runners;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.lfs.test;version="5.11.1";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="5.12.0";x-friends:="org.eclipse.jgit.lfs.server.test"
diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml
index cbe507c..1e463b9 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index 13f91fb..73d3d3c 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -3,31 +3,31 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs
Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs;version="5.11.1",
- org.eclipse.jgit.lfs.errors;version="5.11.1",
- org.eclipse.jgit.lfs.internal;version="5.11.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
- org.eclipse.jgit.lfs.lib;version="5.11.1"
+Export-Package: org.eclipse.jgit.lfs;version="5.12.0",
+ org.eclipse.jgit.lfs.errors;version="5.12.0",
+ org.eclipse.jgit.lfs.internal;version="5.12.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
+ org.eclipse.jgit.lfs.lib;version="5.12.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.google.gson;version="[2.8.0,3.0.0)",
com.google.gson.stream;version="[2.8.0,3.0.0)",
- org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)";resolution:=optional,
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.diff;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.hooks;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)"
+ org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.diff;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.hooks;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)"
diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index bd0b06a..1540c2b 100644
--- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.lfs - Sources
Bundle-SymbolicName: org.eclipse.jgit.lfs.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index 1308ed8..1295bf8 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs</artifactId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
index 40598bb..e5ef30a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
index 414fc48..3fa237c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
index ac452c2..bd4c49f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.gpg.bc"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="5.11.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.12.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
index b6d2a41..6269334 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
index b4cbd8f..5de91d5 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.http.apache"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="5.11.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.12.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
index 0969e76..aa08757 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
index a245a4a..15ba0ff 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.junit"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -24,7 +24,7 @@
<requires>
<import plugin="com.jcraft.jsch"/>
- <import plugin="org.eclipse.jgit" version="5.11.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.12.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
index 7520348..2434a94 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
index fd0425d..2b1738d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.lfs"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="5.11.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.12.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
index 4603675..3c536f7 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index a17381e..0941cc6 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.pgm"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -35,9 +35,9 @@
version="0.0.0"/>
<requires>
- <import feature="org.eclipse.jgit" version="5.11.1" match="equivalent"/>
- <import feature="org.eclipse.jgit.lfs" version="5.11.1" match="equivalent"/>
- <import feature="org.eclipse.jgit.ssh.apache" version="5.11.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.12.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.lfs" version="5.12.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.ssh.apache" version="5.12.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
index 44a8465..924cebd 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
index f6b9c39..c12f4d9 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.repository</artifactId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
index 90826b2..017d4f2 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.source"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="5.11.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.12.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
index 715a747..cd47a06 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
index 45ef4aa..2386f7b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.ssh.apache"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="5.11.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.12.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
index 0626dfa..ea12537 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
index 539984e..15cbc15 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.ssh.jsch"
label="%featureName"
- version="5.11.1.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="5.11.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.12.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
index 1e637ee..f1d1786 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
index 508de9c..0d297e3 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
@@ -2,4 +2,4 @@
Bundle-ManifestVersion: 2
Bundle-Name: JGit Target Platform Bundle
Bundle-SymbolicName: org.eclipse.jgit.target
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
index 9ed76bd..993f552 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.target</artifactId>
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index e566098..09ad1a4 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -16,7 +16,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JGit Tycho Parent</name>
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index 04f3d59..9e18df9 100644
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -3,28 +3,28 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.pgm.test
Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.diff;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="5.11.1",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.merge;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.pgm;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.pgm.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.pgm.opt;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)",
+Import-Package: org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.diff;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="5.12.0",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.merge;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.pgm;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.pgm.opt;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)",
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index d5fc1d8..8398d6b 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 5acaed5..fe1b42b 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.pgm
Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -14,46 +14,46 @@
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.archive;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.awtui;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.blame;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.diff;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.gitrepo;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.server;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs.server.s3;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.merge;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.notes;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.sshd;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.archive;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.awtui;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.blame;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.diff;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.gitrepo;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.server;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.merge;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.notes;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)",
org.kohsuke.args4j;version="[2.33.0,3.0.0)",
org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)"
-Export-Package: org.eclipse.jgit.console;version="5.11.1";
+Export-Package: org.eclipse.jgit.console;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="5.11.1";
+ org.eclipse.jgit.pgm;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util.io,
org.eclipse.jgit.awtui,
@@ -65,14 +65,14 @@
org.eclipse.jgit.treewalk,
org.eclipse.jgit.api,
javax.swing",
- org.eclipse.jgit.pgm.debug;version="5.11.1";
+ org.eclipse.jgit.pgm.debug;version="5.12.0";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm,
org.eclipse.jetty.servlet",
- org.eclipse.jgit.pgm.internal;version="5.11.1";
+ org.eclipse.jgit.pgm.internal;version="5.12.0";
x-friends:="org.eclipse.jgit.pgm.test,
org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="5.11.1";
+ org.eclipse.jgit.pgm.opt;version="5.12.0";
uses:="org.kohsuke.args4j,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index 017810d..017861c 100644
--- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.pgm - Sources
Bundle-SymbolicName: org.eclipse.jgit.pgm.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 3d6ad70..4e14858 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index b035453..2a11652 100644
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test
Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -20,15 +20,15 @@
org.apache.sshd.core;version="[2.6.0,2.7.0)",
org.apache.sshd.server;version="[2.6.0,2.7.0)",
org.apache.sshd.server.forward;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit.ssh;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.sshd;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml
index 4080c11..adc9bee 100644
--- a/org.eclipse.jgit.ssh.apache.test/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 7343437..defa710 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.11.1";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.12.0";x-internal:=true;
uses:="org.apache.sshd.client,
org.apache.sshd.client.auth,
org.apache.sshd.client.auth.keyboard,
@@ -23,9 +23,9 @@
org.apache.sshd.common.signature,
org.apache.sshd.common.util.buffer,
org.eclipse.jgit.transport",
- org.eclipse.jgit.internal.transport.sshd.auth;version="5.11.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.proxy;version="5.11.1";x-friends:="org.eclipse.jgit.ssh.apache.test",
- org.eclipse.jgit.transport.sshd;version="5.11.1";
+ org.eclipse.jgit.internal.transport.sshd.auth;version="5.12.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="5.12.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.apache.sshd.client.config.hosts,
org.apache.sshd.common.keyprovider,
@@ -78,12 +78,12 @@
org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)",
org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.fnmatch;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.fnmatch;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
index ee8d386..cd7f30c 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ssh.apache - Sources
Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index a8c98ee..c53dcac 100644
--- a/org.eclipse.jgit.ssh.apache/pom.xml
+++ b/org.eclipse.jgit.ssh.apache/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index cef1558b..c2d3423 100644
--- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit.ssh;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml
index 9d99b73..781d903 100644
--- a/org.eclipse.jgit.ssh.jsch.test/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index 3bb7ffc..a23e3d8 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.jsch
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.1,5.12.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.0,5.13.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.11.1";x-friends:="org.eclipse.egit.core",
- org.eclipse.jgit.transport;version="5.11.1";
+Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.12.0";x-friends:="org.eclipse.egit.core",
+ org.eclipse.jgit.transport;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.internal.transport.ssh,
org.eclipse.jgit.util,
com.jcraft.jsch"
Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)",
org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
index 82d9734..37f2096 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml
index 7afb0c2..ea34818 100644
--- a/org.eclipse.jgit.ssh.jsch/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index ca82ab8..4800cfc 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.test
Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -16,59 +16,59 @@
org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)",
org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)",
org.assertj.core.api;version="[3.14.0,4.0.0)",
- org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.archive;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.awtui;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.blame;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.diff;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.events;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.fnmatch;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.gitrepo;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.hooks;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.ignore;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.ignore.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.fsck;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.transport.connectivity;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.transport.http;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.junit.time;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.logging;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.merge;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.notes;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.patch;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.pgm;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.pgm.internal;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.submodule;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util.sha1;version="[5.11.1,5.12.0)",
+ org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.archive;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.awtui;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.blame;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.diff;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.events;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.fnmatch;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.gitrepo;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.hooks;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.ignore;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.ignore.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.fsck;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.transport.connectivity;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.transport.http;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.junit.time;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.logging;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.merge;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.notes;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.patch;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.pgm;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.submodule;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util.sha1;version="[5.12.0,5.13.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.function;version="[4.13.0,5.0.0)",
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index 6ff1e21..5339873 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java
index 6203fed..2ea3cd7 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java
@@ -543,6 +543,43 @@
}
@Test
+ public void testExactRename_LargeFile() throws Exception {
+ ObjectId aId = blob("blah\nblah\nfoo"); // size = 14
+
+ DiffEntry a = DiffEntry.add(PATH_A, aId);
+ DiffEntry b = DiffEntry.delete(PATH_Q, aId);
+
+ rd.add(a);
+ rd.add(b);
+
+ // Exact renames are identified for large files
+ rd.setBigFileThreshold(10);
+ List<DiffEntry> entries = rd.compute();
+ assertEquals(1, entries.size());
+ assertRename(b, a, 100, entries.get(0));
+ }
+
+ @Test
+ public void testInexactRename_LargeFile() throws Exception {
+ ObjectId aId = blob("blah\nblah\nfoo"); // size = 14
+ ObjectId bId = blob("bla\nblah\nfoo"); // size = 13
+
+ DiffEntry a = DiffEntry.add(PATH_A, aId);
+ DiffEntry b = DiffEntry.delete(PATH_Q, bId);
+
+ rd.add(a);
+ rd.add(b);
+
+ rd.setBigFileThreshold(10);
+
+ // Inexact renames are not detected for large files
+ List<DiffEntry> entries = rd.compute();
+ assertEquals(2, entries.size());
+ assertAdd(PATH_A, aId, FileMode.REGULAR_FILE, entries.get(0));
+ assertDelete(PATH_Q, bId, FileMode.REGULAR_FILE, entries.get(1));
+ }
+
+ @Test
public void testSetRenameScore_IllegalArgs() throws Exception {
try {
rd.setRenameScore(-1);
@@ -634,4 +671,15 @@
assertEquals(AbbreviatedObjectId.fromObjectId(newId), add.newId);
assertEquals(newMode, add.newMode);
}
+
+ private static void assertDelete(String oldName, ObjectId oldId,
+ FileMode oldMode, DiffEntry delete) {
+ assertEquals(DiffEntry.DEV_NULL, delete.newPath);
+ assertEquals(DiffEntry.A_ZERO, delete.newId);
+ assertEquals(FileMode.MISSING, delete.newMode);
+ assertEquals(ChangeType.DELETE, delete.changeType);
+ assertEquals(oldName, delete.oldPath);
+ assertEquals(AbbreviatedObjectId.fromObjectId(oldId), delete.oldId);
+ assertEquals(oldMode, delete.oldMode);
+ }
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java
index 2c21eb6..2f16aa4 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java
@@ -11,6 +11,9 @@
import static org.junit.Assert.assertTrue;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.eclipse.jgit.lib.Ref;
import org.junit.Test;
public class RevWalkMergedIntoTest extends RevWalkTestCase {
@@ -44,4 +47,82 @@
final RevCommit t = commit(n, o);
assertTrue(rw.isMergedInto(b, t));
}
+
+ @Test
+ public void testGetMergedInto() throws Exception {
+ /*
+ * i
+ * / \
+ * A o
+ * / \ \
+ * o1 o2 E
+ * / \ / \
+ * B C D
+ */
+ String b = "refs/heads/b";
+ String c = "refs/heads/c";
+ String d = "refs/heads/d";
+ String e = "refs/heads/e";
+ final RevCommit i = commit();
+ final RevCommit a = commit(i);
+ final RevCommit o1 = commit(a);
+ final RevCommit o2 = commit(a);
+ createBranch(commit(o1), b);
+ createBranch(commit(o1, o2), c);
+ createBranch(commit(o2), d);
+ createBranch(commit(commit(i)), e);
+
+ List<String> modifiedResult = rw.getMergedInto(a, getRefs())
+ .stream().map(Ref::getName).collect(Collectors.toList());
+
+ assertTrue(modifiedResult.size() == 3);
+ assertTrue(modifiedResult.contains(b));
+ assertTrue(modifiedResult.contains(c));
+ assertTrue(modifiedResult.contains(d));
+ }
+
+ @Test
+ public void testIsMergedIntoAny() throws Exception {
+ /*
+ * i
+ * / \
+ * A o
+ * / \
+ * o C
+ * /
+ * B
+ */
+ String b = "refs/heads/b";
+ String c = "refs/heads/c";
+ final RevCommit i = commit();
+ final RevCommit a = commit(i);
+ createBranch(commit(commit(a)), b);
+ createBranch(commit(commit(i)), c);
+
+ assertTrue( rw.isMergedIntoAny(a, getRefs()));
+ }
+
+ @Test
+ public void testIsMergedIntoAll() throws Exception {
+ /*
+ *
+ * A
+ * / \
+ * o1 o2
+ * / \ / \
+ * B C D
+ */
+
+ String b = "refs/heads/b";
+ String c = "refs/heads/c";
+ String d = "refs/heads/c";
+ final RevCommit a = commit();
+ final RevCommit o1 = commit(a);
+ final RevCommit o2 = commit(a);
+ createBranch(commit(o1), b);
+ createBranch(commit(o1, o2), c);
+ createBranch(commit(o2), d);
+
+ assertTrue(rw.isMergedIntoAll(a, getRefs()));
+ }
}
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 5f5cf27..824a446 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ui
Bundle-SymbolicName: org.eclipse.jgit.ui
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.awtui;version="5.11.1"
-Import-Package: org.eclipse.jgit.errors;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.lib;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.nls;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.transport;version="[5.11.1,5.12.0)",
- org.eclipse.jgit.util;version="[5.11.1,5.12.0)"
+Export-Package: org.eclipse.jgit.awtui;version="5.12.0"
+Import-Package: org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.0,5.13.0)"
diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
index 0cd6d11..0a53526 100644
--- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ui - Sources
Bundle-SymbolicName: org.eclipse.jgit.ui.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 913d173..ca8a663 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
deleted file mode 100644
index d389ac5..0000000
--- a/org.eclipse.jgit/.settings/.api_filters
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.jgit" version="2">
- <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
- <filter id="338755678">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
- <message_argument value="CONFIG_REFSTORAGE_REFTREE"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/revwalk/ObjectWalk.java" type="org.eclipse.jgit.revwalk.ObjectWalk">
- <filter id="421654647">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.revwalk.ObjectWalk"/>
- <message_argument value="createObjectReachabilityChecker()"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/revwalk/RevWalk.java" type="org.eclipse.jgit.revwalk.RevWalk">
- <filter id="421654647">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.revwalk.RevWalk"/>
- <message_argument value="createReachabilityChecker()"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
- <filter id="338792546">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.util.FS"/>
- <message_argument value="internalRunHookIfPresent(Repository, String, String[], PrintStream, PrintStream, String)"/>
- </message_arguments>
- </filter>
- <filter id="338792546">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.util.FS"/>
- <message_argument value="runHookIfPresent(Repository, String, String[], PrintStream, PrintStream, String)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/FS_POSIX.java" type="org.eclipse.jgit.util.FS_POSIX">
- <filter id="338792546">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.util.FS_POSIX"/>
- <message_argument value="runHookIfPresent(Repository, String, String[], PrintStream, PrintStream, String)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/FS_Win32_Cygwin.java" type="org.eclipse.jgit.util.FS_Win32_Cygwin">
- <filter id="338792546">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.util.FS_Win32_Cygwin"/>
- <message_argument value="runHookIfPresent(Repository, String, String[], PrintStream, PrintStream, String)"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 158e880..7d07696 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit
Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 5.11.1.qualifier
+Bundle-Version: 5.12.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.jgit.annotations;version="5.11.1",
- org.eclipse.jgit.api;version="5.11.1";
+Export-Package: org.eclipse.jgit.annotations;version="5.12.0",
+ org.eclipse.jgit.api;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.notes,
org.eclipse.jgit.dircache,
@@ -23,18 +23,18 @@
org.eclipse.jgit.revwalk.filter,
org.eclipse.jgit.blame,
org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="5.11.1";
+ org.eclipse.jgit.api.errors;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="5.11.1";
+ org.eclipse.jgit.attributes;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.blame;version="5.11.1";
+ org.eclipse.jgit.blame;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="5.11.1";
+ org.eclipse.jgit.diff;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.revwalk,
@@ -42,44 +42,44 @@
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="5.11.1";
+ org.eclipse.jgit.dircache;version="5.12.0";
uses:="org.eclipse.jgit.events,
org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.errors;version="5.11.1";
+ org.eclipse.jgit.errors;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack",
- org.eclipse.jgit.events;version="5.11.1";
+ org.eclipse.jgit.events;version="5.12.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="5.11.1",
- org.eclipse.jgit.gitrepo;version="5.11.1";
+ org.eclipse.jgit.fnmatch;version="5.12.0",
+ org.eclipse.jgit.gitrepo;version="5.12.0";
uses:="org.xml.sax.helpers,
org.eclipse.jgit.api,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="5.11.1";x-internal:=true,
- org.eclipse.jgit.hooks;version="5.11.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="5.11.1",
- org.eclipse.jgit.ignore.internal;version="5.11.1";
+ org.eclipse.jgit.gitrepo.internal;version="5.12.0";x-internal:=true,
+ org.eclipse.jgit.hooks;version="5.12.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="5.12.0",
+ org.eclipse.jgit.ignore.internal;version="5.12.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="5.11.1";
+ org.eclipse.jgit.internal;version="5.12.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.fsck;version="5.11.1";
+ org.eclipse.jgit.internal.fsck;version="5.12.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.revwalk;version="5.11.1";
+ org.eclipse.jgit.internal.revwalk;version="5.12.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.dfs;version="5.11.1";
+ org.eclipse.jgit.internal.storage.dfs;version="5.12.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.server,
org.eclipse.jgit.http.test,
org.eclipse.jgit.lfs.test",
- org.eclipse.jgit.internal.storage.file;version="5.11.1";
+ org.eclipse.jgit.internal.storage.file;version="5.12.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.http,
@@ -88,31 +88,31 @@
org.eclipse.jgit.pgm,
org.eclipse.jgit.pgm.test,
org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.internal.storage.io;version="5.11.1";
+ org.eclipse.jgit.internal.storage.io;version="5.12.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="5.11.1";
+ org.eclipse.jgit.internal.storage.pack;version="5.12.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="5.11.1";
+ org.eclipse.jgit.internal.storage.reftable;version="5.12.0";
x-friends:="org.eclipse.jgit.http.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="5.11.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.connectivity;version="5.11.1";
+ org.eclipse.jgit.internal.submodule;version="5.12.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.connectivity;version="5.12.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.http;version="5.11.1";
+ org.eclipse.jgit.internal.transport.http;version="5.12.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="5.11.1";
+ org.eclipse.jgit.internal.transport.parser;version="5.12.0";
x-friends:="org.eclipse.jgit.http.server,
org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="5.11.1";
+ org.eclipse.jgit.internal.transport.ssh;version="5.12.0";
x-friends:="org.eclipse.jgit.ssh.apache,
org.eclipse.jgit.ssh.jsch",
- org.eclipse.jgit.lib;version="5.11.1";
+ org.eclipse.jgit.lib;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util.sha1,
org.eclipse.jgit.dircache,
@@ -126,10 +126,10 @@
org.eclipse.jgit.util,
org.eclipse.jgit.submodule,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.lib.internal;version="5.11.1";
+ org.eclipse.jgit.lib.internal;version="5.12.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.logging;version="5.11.1",
- org.eclipse.jgit.merge;version="5.11.1";
+ org.eclipse.jgit.logging;version="5.12.0",
+ org.eclipse.jgit.merge;version="5.12.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
@@ -138,40 +138,40 @@
org.eclipse.jgit.util,
org.eclipse.jgit.api,
org.eclipse.jgit.attributes",
- org.eclipse.jgit.nls;version="5.11.1",
- org.eclipse.jgit.notes;version="5.11.1";
+ org.eclipse.jgit.nls;version="5.12.0",
+ org.eclipse.jgit.notes;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="5.11.1";
+ org.eclipse.jgit.patch;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="5.11.1";
+ org.eclipse.jgit.revplot;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="5.11.1";
+ org.eclipse.jgit.revwalk;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.revwalk.filter,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.revwalk.filter;version="5.11.1";
+ org.eclipse.jgit.revwalk.filter;version="5.12.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="5.11.1";
+ org.eclipse.jgit.storage.file;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="5.11.1";
+ org.eclipse.jgit.storage.pack;version="5.12.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="5.11.1";
+ org.eclipse.jgit.submodule;version="5.12.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.transport;version="5.11.1";
+ org.eclipse.jgit.transport;version="5.12.0";
uses:="javax.crypto,
org.eclipse.jgit.util.io,
org.eclipse.jgit.lib,
@@ -184,21 +184,21 @@
org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.storage.pack,
org.eclipse.jgit.errors",
- org.eclipse.jgit.transport.http;version="5.11.1";
+ org.eclipse.jgit.transport.http;version="5.12.0";
uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="5.11.1";
+ org.eclipse.jgit.transport.resolver;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.lib",
- org.eclipse.jgit.treewalk;version="5.11.1";
+ org.eclipse.jgit.treewalk;version="5.12.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
- org.eclipse.jgit.treewalk.filter;version="5.11.1";
+ org.eclipse.jgit.treewalk.filter;version="5.12.0";
uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="5.11.1";
+ org.eclipse.jgit.util;version="5.12.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.hooks,
org.eclipse.jgit.revwalk,
@@ -211,12 +211,12 @@
org.eclipse.jgit.treewalk,
javax.net.ssl,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.util.io;version="5.11.1";
+ org.eclipse.jgit.util.io;version="5.12.0";
uses:="org.eclipse.jgit.attributes,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util.sha1;version="5.11.1",
- org.eclipse.jgit.util.time;version="5.11.1"
+ org.eclipse.jgit.util.sha1;version="5.12.0",
+ org.eclipse.jgit.util.time;version="5.12.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
javax.crypto,
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 21c59de..0591651 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit - Sources
Bundle-SymbolicName: org.eclipse.jgit.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.11.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="5.11.1.qualifier";roots="."
+Bundle-Version: 5.12.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="5.12.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index 0c38492..f947327 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index d4bcd9a..feef397 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -139,6 +139,7 @@
connectionFailed=connection failed
connectionTimeOut=Connection time out: {0}
contextMustBeNonNegative=context must be >= 0
+cookieFilePathRelative=git config http.cookieFile contains a relative path, should be absolute: {0}
corruptionDetectedReReadingAt=Corruption detected re-reading at {0}
corruptObjectBadDate=bad date
corruptObjectBadEmail=bad email
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java
index 80e1b18..75784c2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java
@@ -12,6 +12,7 @@
import static org.eclipse.jgit.diff.DiffEntry.Side.NEW;
import static org.eclipse.jgit.diff.DiffEntry.Side.OLD;
+import static org.eclipse.jgit.storage.pack.PackConfig.DEFAULT_BIG_FILE_THRESHOLD;
import java.io.IOException;
import java.util.ArrayList;
@@ -97,6 +98,12 @@
/** Limit in the number of files to consider for renames. */
private int renameLimit;
+ /**
+ * File size threshold (in bytes) for detecting renames. Files larger
+ * than this size will not be processed for renames.
+ */
+ private int bigFileThreshold = DEFAULT_BIG_FILE_THRESHOLD;
+
/** Set if the number of adds or deletes was over the limit. */
private boolean overRenameLimit;
@@ -209,6 +216,26 @@
}
/**
+ * Get file size threshold for detecting renames. Files larger
+ * than this size will not be processed for rename detection.
+ *
+ * @return threshold in bytes of the file size.
+ * @since 5.12
+ */
+ public int getBigFileThreshold() { return bigFileThreshold; }
+
+ /**
+ * Set the file size threshold for detecting renames. Files larger than this
+ * threshold will be skipped during rename detection computation.
+ *
+ * @param threshold file size threshold in bytes.
+ * @since 5.12
+ */
+ public void setBigFileThreshold(int threshold) {
+ this.bigFileThreshold = threshold;
+ }
+
+ /**
* Check if the detector is over the rename limit.
* <p>
* This method can be invoked either before or after {@code getEntries} has
@@ -493,6 +520,7 @@
d = new SimilarityRenameDetector(reader, deleted, added);
d.setRenameScore(getRenameScore());
+ d.setBigFileThreshold(getBigFileThreshold());
d.compute(pm);
overRenameLimit |= d.isTableOverflow();
deleted = d.getLeftOverSources();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java
index 74a11a0..082f31d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java
@@ -12,6 +12,7 @@
import static org.eclipse.jgit.diff.DiffEntry.Side.NEW;
import static org.eclipse.jgit.diff.DiffEntry.Side.OLD;
+import static org.eclipse.jgit.storage.pack.PackConfig.DEFAULT_BIG_FILE_THRESHOLD;
import java.io.IOException;
import java.util.ArrayList;
@@ -80,6 +81,12 @@
/** Score a pair must exceed to be considered a rename. */
private int renameScore = 60;
+ /**
+ * File size threshold (in bytes) for detecting renames. Files larger
+ * than this size will not be processed for renames.
+ */
+ private int bigFileThreshold = DEFAULT_BIG_FILE_THRESHOLD;
+
/** Set if any {@link SimilarityIndex.TableFullException} occurs. */
private boolean tableOverflow;
@@ -96,6 +103,10 @@
renameScore = score;
}
+ void setBigFileThreshold(int threshold) {
+ bigFileThreshold = threshold;
+ }
+
void compute(ProgressMonitor pm) throws IOException, CancelledException {
if (pm == null)
pm = NullProgressMonitor.INSTANCE;
@@ -253,6 +264,11 @@
continue;
}
+ if (max > bigFileThreshold) {
+ pm.update(1);
+ continue;
+ }
+
if (s == null) {
try {
s = hash(OLD, srcEnt);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index fe8c2d2..09fe03e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -167,6 +167,7 @@
/***/ public String connectionFailed;
/***/ public String connectionTimeOut;
/***/ public String contextMustBeNonNegative;
+ /***/ public String cookieFilePathRelative;
/***/ public String corruptionDetectedReReadingAt;
/***/ public String corruptObjectBadDate;
/***/ public String corruptObjectBadEmail;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
index 631d861..5d5ba12 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
@@ -32,10 +32,13 @@
import org.eclipse.jgit.lib.AsyncObjectLoaderQueue;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.MutableObjectId;
+import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectIdOwnerMap;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.lib.ObjectReader;
+import org.eclipse.jgit.lib.ProgressMonitor;
+import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
@@ -181,6 +184,12 @@
boolean shallowCommitsInitialized;
+ private enum GetMergedIntoStrategy {
+ RETURN_ON_FIRST_FOUND,
+ RETURN_ON_FIRST_NOT_FOUND,
+ EVALUATE_ALL
+ }
+
/**
* Create a new revision walker for a given repository.
*
@@ -425,6 +434,145 @@
}
/**
+ * Determine the Refs into which a commit is merged.
+ * <p>
+ * A commit is merged into a ref if we can find a path of commits that leads
+ * from that specific ref and ends at <code>commit</code>.
+ * <p>
+ *
+ * @param commit
+ * commit the caller thinks is reachable from <code>refs</code>.
+ * @param refs
+ * refs to start iteration from, and which is most likely a
+ * descendant (child) of <code>commit</code>.
+ * @return list of refs that are reachable from <code>commit</code>.
+ * @throws java.io.IOException
+ * a pack file or loose object could not be read.
+ * @since 5.12
+ */
+ public List<Ref> getMergedInto(RevCommit commit, Collection<Ref> refs)
+ throws IOException{
+ return getMergedInto(commit, refs, NullProgressMonitor.INSTANCE);
+ }
+
+ /**
+ * Determine the Refs into which a commit is merged.
+ * <p>
+ * A commit is merged into a ref if we can find a path of commits that leads
+ * from that specific ref and ends at <code>commit</code>.
+ * <p>
+ *
+ * @param commit
+ * commit the caller thinks is reachable from <code>refs</code>.
+ * @param refs
+ * refs to start iteration from, and which is most likely a
+ * descendant (child) of <code>commit</code>.
+ * @param monitor
+ * the callback for progress and cancellation
+ * @return list of refs that are reachable from <code>commit</code>.
+ * @throws java.io.IOException
+ * a pack file or loose object could not be read.
+ * @since 5.12
+ */
+ public List<Ref> getMergedInto(RevCommit commit, Collection<Ref> refs,
+ ProgressMonitor monitor) throws IOException{
+ return getMergedInto(commit, refs,
+ GetMergedIntoStrategy.EVALUATE_ALL,
+ monitor);
+ }
+
+ /**
+ * Determine if a <code>commit</code> is merged into any of the given
+ * <code>refs</code>.
+ *
+ * @param commit
+ * commit the caller thinks is reachable from <code>refs</code>.
+ * @param refs
+ * refs to start iteration from, and which is most likely a
+ * descendant (child) of <code>commit</code>.
+ * @return true if commit is merged into any of the refs; false otherwise.
+ * @throws java.io.IOException
+ * a pack file or loose object could not be read.
+ * @since 5.12
+ */
+ public boolean isMergedIntoAny(RevCommit commit, Collection<Ref> refs)
+ throws IOException {
+ return getMergedInto(commit, refs,
+ GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND,
+ NullProgressMonitor.INSTANCE).size() > 0;
+ }
+
+ /**
+ * Determine if a <code>commit</code> is merged into all of the given
+ * <code>refs</code>.
+ *
+ * @param commit
+ * commit the caller thinks is reachable from <code>refs</code>.
+ * @param refs
+ * refs to start iteration from, and which is most likely a
+ * descendant (child) of <code>commit</code>.
+ * @return true if commit is merged into all of the refs; false otherwise.
+ * @throws java.io.IOException
+ * a pack file or loose object could not be read.
+ * @since 5.12
+ */
+ public boolean isMergedIntoAll(RevCommit commit, Collection<Ref> refs)
+ throws IOException {
+ return getMergedInto(commit, refs,
+ GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND,
+ NullProgressMonitor.INSTANCE).size()
+ == refs.size();
+ }
+
+ private List<Ref> getMergedInto(RevCommit needle, Collection<Ref> haystacks,
+ Enum returnStrategy, ProgressMonitor monitor) throws IOException {
+ List<Ref> result = new ArrayList<>();
+ RevFilter oldRF = filter;
+ TreeFilter oldTF = treeFilter;
+ try {
+ finishDelayedFreeFlags();
+ filter = RevFilter.ALL;
+ treeFilter = TreeFilter.ALL;
+ for (Ref r: haystacks) {
+ if (monitor.isCancelled()) {
+ return result;
+ }
+ monitor.update(1);
+ RevObject o = parseAny(r.getObjectId());
+ if (!(o instanceof RevCommit)) {
+ continue;
+ }
+ RevCommit c = (RevCommit) o;
+ resetRetain(RevFlag.UNINTERESTING);
+ markStart(c);
+ boolean commitFound = false;
+ RevCommit next;
+ while ((next = next()) != null) {
+ if (References.isSameObject(next, needle)) {
+ result.add(r);
+ if (returnStrategy == GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND) {
+ return result;
+ }
+ commitFound = true;
+ break;
+ }
+ }
+ if(!commitFound){
+ markUninteresting(c);
+ if (returnStrategy == GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND) {
+ return result;
+ }
+ }
+ }
+ } finally {
+ reset(~freeFlags & APP_FLAGS);
+ filter = oldRF;
+ treeFilter = oldTF;
+ }
+ return result;
+ }
+
+ /**
* Pop the next most recent commit.
*
* @return next most recent commit; null if traversal is over.
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java
index 3feb9c5..e52e916 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java
@@ -159,15 +159,12 @@
// Make sure commit is from the same RevWalk
commit = revWalk.parseCommit(commit.getId());
revWalk.reset();
- List<Ref> result = new ArrayList<>();
+ List<Ref> filteredRefs = new ArrayList<>();
monitor.beginTask(JGitText.get().searchForReachableBranches,
refs.size());
final int SKEW = 24*3600; // one day clock skew
for (Ref ref : refs) {
- if (monitor.isCancelled())
- return result;
- monitor.update(1);
RevObject maybehead = revWalk.parseAny(ref.getObjectId());
if (!(maybehead instanceof RevCommit))
continue;
@@ -179,9 +176,9 @@
if (headCommit.getCommitTime() + SKEW < commit.getCommitTime())
continue;
- if (revWalk.isMergedInto(commit, headCommit))
- result.add(ref);
+ filteredRefs.add(ref);
}
+ List<Ref> result = revWalk.getMergedInto(commit, filteredRefs, monitor);
monitor.endTask();
return result;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
index 2e5d18d..0710d3f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
@@ -35,6 +35,7 @@
import java.io.BufferedInputStream;
import java.io.BufferedReader;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -53,8 +54,6 @@
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.GeneralSecurityException;
import java.security.cert.CertPathBuilderException;
import java.security.cert.CertPathValidatorException;
@@ -101,6 +100,7 @@
import org.eclipse.jgit.transport.http.HttpConnection;
import org.eclipse.jgit.transport.http.HttpConnectionFactory;
import org.eclipse.jgit.transport.http.HttpConnectionFactory2;
+import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.HttpSupport;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.RawParseUtils;
@@ -1157,17 +1157,28 @@
return new TransportException(uri, why);
}
- private static NetscapeCookieFile getCookieFileFromConfig(
+ private NetscapeCookieFile getCookieFileFromConfig(
HttpConfig config) {
- if (!StringUtils.isEmptyOrNull(config.getCookieFile())) {
+ String path = config.getCookieFile();
+ if (!StringUtils.isEmptyOrNull(path)) {
try {
- Path cookieFilePath = Paths.get(config.getCookieFile());
+ FS fs = local != null ? local.getFS() : FS.DETECTED;
+ File f;
+ if (path.startsWith("~/")) { //$NON-NLS-1$
+ f = fs.resolve(fs.userHome(), path.substring(2));
+ } else {
+ f = new File(path);
+ if (!f.isAbsolute()) {
+ f = fs.resolve(null, path);
+ LOG.warn(MessageFormat.format(
+ JGitText.get().cookieFilePathRelative, f));
+ }
+ }
return NetscapeCookieFileCache.getInstance(config)
- .getEntry(cookieFilePath);
+ .getEntry(f.toPath());
} catch (InvalidPathException e) {
LOG.warn(MessageFormat.format(
- JGitText.get().couldNotReadCookieFile,
- config.getCookieFile()), e);
+ JGitText.get().couldNotReadCookieFile, path), e);
}
}
return null;
diff --git a/pom.xml b/pom.xml
index 5dfd2a7..e4454ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<packaging>pom</packaging>
- <version>5.11.1-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
<name>JGit - Parent</name>
<url>${jgit-url}</url>
@@ -151,7 +151,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
- <jgit-last-release-version>5.10.0.202012080955-r</jgit-last-release-version>
+ <jgit-last-release-version>5.11.0.202103091610-r</jgit-last-release-version>
<apache-sshd-version>2.6.0</apache-sshd-version>
<jsch-version>0.1.55</jsch-version>
<jzlib-version>1.1.1</jzlib-version>
