Merge "RawTextComparator.WS_IGNORE_CHANGE must not compare whitespace"
diff --git a/WORKSPACE b/WORKSPACE
index 630e85f..64218b5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -209,48 +209,48 @@
sha1 = "3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf",
)
-JETTY_VER = "9.4.25.v20191220"
+JETTY_VER = "9.4.28.v20200408"
maven_jar(
name = "jetty-servlet",
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER,
- sha1 = "bee77d6a4f87dc90d5bc142cbd6cef470ec46aae",
- src_sha1 = "e8b09b6431fc9cfbff588698ac0262a745fe00e4",
+ sha1 = "7df27a6d73e3094ad94ea4f32e3e6597cecbdf38",
+ src_sha1 = "49da8455dd5760b7c5961df3b1e7d1490ff9723e",
)
maven_jar(
name = "jetty-security",
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER,
- sha1 = "593ff5b5dfd5bf973184329f5d1209b9a411ec12",
- src_sha1 = "369f869a13a33d25535db3176a84945e94a3718a",
+ sha1 = "d5fe6851f14d1375e4b4ab1818475bfd929cf517",
+ src_sha1 = "204f19ac7e4df9f6f68df1910154d7667ecd78e8",
)
maven_jar(
name = "jetty-server",
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER,
- sha1 = "5b352c9f9135a1c20e4808e5cb1d84fbddfdc460",
- src_sha1 = "0f3acc2abcdb86491a2c37074592860cb1100269",
+ sha1 = "9c2cbd96426be38b1273ec87ae21e2696688a737",
+ src_sha1 = "83454098deb880ecc7168252578f712c06a5504b",
)
maven_jar(
name = "jetty-http",
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER,
- sha1 = "c3aa7da362f1a492667ce754ba16b2535b793668",
- src_sha1 = "70ef1436dc895eafe2cc24cf59af6e2d2874d963",
+ sha1 = "dd56750ea7410c925f1fbae973c0a19cce5a0a68",
+ src_sha1 = "1ef8d10cb5ce5694f12650cbb49b31008c673182",
)
maven_jar(
name = "jetty-io",
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER,
- sha1 = "3eb34b5481012701de0ea9dfaf2bdf1dbb947b16",
- src_sha1 = "ad129617793088aaf69eab18a13c9bce02cb1195",
+ sha1 = "adda6786588a922f834e9c33c7db5f1484310f44",
+ src_sha1 = "4e7756e00b97b439d404e6a682bb1cdeb36fc887",
)
maven_jar(
name = "jetty-util",
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER,
- sha1 = "fd8b642cc16728f1c36ca6a64653cb1b26ec0232",
- src_sha1 = "c84dc3026cc4aea013dc97b18228756816167745",
+ sha1 = "118d2a44721885a04238aee21a5055dc1ab3818a",
+ src_sha1 = "e2e6d7c90e4126645d2667014d02f0732c08c948",
)
BOUNCYCASTLE_VER = "1.65"
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
index c0a2490..f42e3f3 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.10" sequenceNumber="1589936387">
+<target name="jgit-4.10" sequenceNumber="1590537488">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
index 09883e0..fb95c1b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.11" sequenceNumber="1589936387">
+<target name="jgit-4.11" sequenceNumber="1590537487">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
index f2e5634..0a5a4b3 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.12" sequenceNumber="1589936388">
+<target name="jgit-4.12" sequenceNumber="1590537488">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
index bebedb6..39cea03 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.13" sequenceNumber="1589936387">
+<target name="jgit-4.13" sequenceNumber="1590537488">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
index 0e748d5..2b5938c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.14-staging" sequenceNumber="1589936386">
+<target name="jgit-4.14-staging" sequenceNumber="1590537487">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.tpd
deleted file mode 100644
index b21bd6a..0000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.tpd
+++ /dev/null
@@ -1,8 +0,0 @@
-target "jgit-4.14-staging" with source configurePhase
-
-include "projects/jetty-9.4.x.tpd"
-include "orbit/S20200519202422.tpd"
-
-location "https://download.eclipse.org/staging/2020-03/" {
- org.eclipse.osgi lazy
-}
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
similarity index 81%
copy from org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.target
copy to org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
index 09c1e74..d71cd42 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.14-staging" sequenceNumber="1589936386">
+<target name="jgit-4.15" sequenceNumber="1590537486">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@@ -88,7 +88,7 @@
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
- <repository location="https://download.eclipse.org/staging/2020-03/"/>
+ <repository location="https://download.eclipse.org/releases/2020-03/202003181000/"/>
</location>
</locations>
</target>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd
new file mode 100644
index 0000000..93e1faf
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd
@@ -0,0 +1,8 @@
+target "jgit-4.15" with source configurePhase
+
+include "projects/jetty-9.4.x.tpd"
+include "orbit/S20200519202422.tpd"
+
+location "https://download.eclipse.org/releases/2020-03/202003181000/" {
+ org.eclipse.osgi lazy
+}
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.target
similarity index 83%
rename from org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.target
rename to org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.target
index 09c1e74..f0609c5 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15-staging.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.14-staging" sequenceNumber="1589936386">
+<target name="jgit-4.15" sequenceNumber="1590537479">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@@ -88,7 +88,7 @@
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
- <repository location="https://download.eclipse.org/staging/2020-03/"/>
+ <repository location="https://download.eclipse.org/staging/2020-06/"/>
</location>
</locations>
</target>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.tpd
new file mode 100644
index 0000000..7c5f0d6
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.tpd
@@ -0,0 +1,8 @@
+target "jgit-4.15" with source configurePhase
+
+include "projects/jetty-9.4.x.tpd"
+include "orbit/S20200519202422.tpd"
+
+location "https://download.eclipse.org/staging/2020-06/" {
+ org.eclipse.osgi lazy
+}
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index 2fd0c31..9145c15 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.6" sequenceNumber="1589936402">
+<target name="jgit-4.6" sequenceNumber="1590537503">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
index bf79c31..6d98531 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.7" sequenceNumber="1589936392">
+<target name="jgit-4.7" sequenceNumber="1590537493">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
index 42adace..4ad9601 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.8" sequenceNumber="1589936388">
+<target name="jgit-4.8" sequenceNumber="1590537488">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
index c48d691..69eacd4 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.9" sequenceNumber="1589936388">
+<target name="jgit-4.9" sequenceNumber="1590537488">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd
index fb9bb2d..0eea06d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd
@@ -1,20 +1,20 @@
target "jetty-9.4.x" with source configurePhase
-location jetty-9.4.25 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/" {
- org.eclipse.jetty.client [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.client.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.continuation [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.continuation.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.http [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.http.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.io [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.io.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.security [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.security.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.server [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.server.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.servlet [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.servlet.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.util [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.util.source [9.4.25.v20191220,9.4.25.v20191220]
+location jetty-9.4.25 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/" {
+ org.eclipse.jetty.client [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.client.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.continuation [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.continuation.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.http [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.http.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.io [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.io.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.security [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.security.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.server [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.server.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.servlet [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.servlet.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.util [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.util.source [9.4.28.v20200408,9.4.28.v20200408]
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java
index 74b46bc..c9bb167 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java
@@ -72,6 +72,7 @@ EWAHCompressedBitmap getBitmap() {
if (r instanceof EWAHCompressedBitmap) {
out = out.xor((EWAHCompressedBitmap) r);
out.trim();
+ bitmapContainer = out;
return out;
}
xb = (XorCompressedBitmap) r;
diff --git a/pom.xml b/pom.xml
index 6949463..ec5cbc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
<commons-compress-version>1.19</commons-compress-version>
<osgi-core-version>4.3.1</osgi-core-version>
<servlet-api-version>3.1.0</servlet-api-version>
- <jetty-version>9.4.25.v20191220</jetty-version>
+ <jetty-version>9.4.28.v20200408</jetty-version>
<japicmp-version>0.14.3</japicmp-version>
<httpclient-version>4.5.10</httpclient-version>
<httpcore-version>4.4.12</httpcore-version>
