Browse Source

Merge branch 'stable-5.9'

* stable-5.9:
  Upgrade maven-resources-plugin to 3.2.0
  Upgrade plexus-compiler version to 2.8.8
  [bazel] Add missing dependency to slf4j-api
  [errorprone] DirCacheEntry: make clear operator precedence
  [errorprone] PackWriter#parallelDeltaSearch: avoid suppressed exception
  [errorprone] Declare DirCache#version final
  Add jgit-4.17-staging target platform for 2020-09
  Update target platform to R20200831200620

Signed-off-by: Marco Miller <marco.miller@ericsson.com>
Change-Id: I2e2f41cf6ebbcb45b8978b519db3f1c8f7afb5f4
tags/v5.9.0.202009080501-r
Marco Miller 3 years ago
parent
commit
df6a1c55fa
34 changed files with 235 additions and 123 deletions
  1. 2
    2
      WORKSPACE
  2. 1
    0
      org.eclipse.jgit.junit.ssh/BUILD
  3. 1
    0
      org.eclipse.jgit.lfs.test/BUILD
  4. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
  5. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
  6. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
  7. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd
  8. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
  9. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd
  10. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
  11. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd
  12. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
  13. 2
    2
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd
  14. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
  15. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd
  16. 0
    8
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.tpd
  17. 94
    0
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target
  18. 8
    0
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd
  19. 7
    7
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.target
  20. 8
    0
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.tpd
  21. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
  22. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
  23. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
  24. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
  25. 6
    6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
  26. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
  27. 23
    23
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
  28. 1
    1
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
  29. 12
    12
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20200831200620-2020-09.tpd
  30. 1
    1
      org.eclipse.jgit.packaging/pom.xml
  31. 1
    1
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java
  32. 1
    1
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
  33. 9
    1
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
  34. 2
    2
      pom.xml

+ 2
- 2
WORKSPACE View File

@@ -107,8 +107,8 @@ maven_jar(

maven_jar(
name = "commons-codec",
artifact = "commons-codec:commons-codec:1.13",
sha1 = "3f18e1aa31031d89db6f01ba05d501258ce69d2c",
artifact = "commons-codec:commons-codec:1.14",
sha1 = "3cb1181b2141a7e752f5bdc998b7ef1849f726cf",
)

maven_jar(

+ 1
- 0
org.eclipse.jgit.junit.ssh/BUILD View File

@@ -14,6 +14,7 @@ java_library(
],
deps = [
"//lib:junit",
"//lib:slf4j-api",
"//lib:sshd-osgi",
"//lib:sshd-sftp",
# We want these deps to be provided_deps

+ 1
- 0
org.eclipse.jgit.lfs.test/BUILD View File

@@ -13,6 +13,7 @@ junit_tests(
deps = [
":helpers",
"//lib:junit",
"//lib:slf4j-api",
"//org.eclipse.jgit:jgit",
"//org.eclipse.jgit.junit:junit",
"//org.eclipse.jgit.lfs:jgit-lfs",

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target View File

@@ -1,7 +1,7 @@
<?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="1594244911">
<target name="jgit-4.10" sequenceNumber="1598915260">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.10" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/2018-12/" {
org.eclipse.osgi lazy

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target View File

@@ -1,7 +1,7 @@
<?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="1594244912">
<target name="jgit-4.11" sequenceNumber="1598915260">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.11" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/2019-03/" {
org.eclipse.osgi lazy

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target View File

@@ -1,7 +1,7 @@
<?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="1594244911">
<target name="jgit-4.12" sequenceNumber="1598915260">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.12" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/2019-06/" {
org.eclipse.osgi lazy

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target View File

@@ -1,7 +1,7 @@
<?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="1594244911">
<target name="jgit-4.13" sequenceNumber="1598915260">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.13" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/2019-09/" {
org.eclipse.osgi lazy

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target View File

@@ -1,7 +1,7 @@
<?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="1594244908">
<target name="jgit-4.14" sequenceNumber="1598915258">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 2
- 2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.14-staging" with source configurePhase
target "jgit-4.14" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/2019-12/201912181000/" {
org.eclipse.osgi lazy

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.15" sequenceNumber="1594244908">
<target name="jgit-4.15" sequenceNumber="1598915258">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.15" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/2020-03/202003181000/" {
org.eclipse.osgi lazy

+ 0
- 8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.tpd View File

@@ -1,8 +0,0 @@
target "jgit-4.15" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"

location "https://download.eclipse.org/staging/2020-06/" {
org.eclipse.osgi lazy
}

+ 94
- 0
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target View File

@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.16" sequenceNumber="1598915255">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.client.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.continuation" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.http" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.http.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.io" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.io.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.security" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.security.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.server" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.server.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.servlet" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.util" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.30.v20200611"/>
<repository id="jetty-9.4.30" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.30.v20200611/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="com.google.gson.source" version="2.8.2.v20180104-1110"/>
<unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
<unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
<unit id="javaewah" version="1.1.7.v20200107-0831"/>
<unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
<unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
<unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/>
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.4.0.v20200318-1614"/>
<unit id="org.apache.sshd.osgi.source" version="2.4.0.v20200318-1614"/>
<unit id="org.apache.sshd.sftp" version="2.4.0.v20200319-1547"/>
<unit id="org.apache.sshd.sftp.source" version="2.4.0.v20200319-1547"/>
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
<unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
<unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
<unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
<unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
<unit id="org.junit" version="4.13.0.v20200204-1500"/>
<unit id="org.junit.source" version="4.13.0.v20200204-1500"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
<unit id="org.mockito.source" version="2.23.0.v20200310-1642"/>
<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</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/releases/2020-06/"/>
</location>
</locations>
</target>

+ 8
- 0
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd View File

@@ -0,0 +1,8 @@
target "jgit-4.16" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/2020-06/" {
org.eclipse.osgi lazy
}

org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16-staging.target → org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.target View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.15" sequenceNumber="1594244911">
<target name="jgit-4.17-staging" sequenceNumber="1598916122">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,11 +84,11 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</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-06/"/>
<repository location="https://download.eclipse.org/staging/2020-09/"/>
</location>
</locations>
</target>

+ 8
- 0
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.tpd View File

@@ -0,0 +1,8 @@
target "jgit-4.17-staging" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/staging/2020-09/" {
org.eclipse.osgi lazy
}

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target View File

@@ -1,7 +1,7 @@
<?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="1594244939">
<target name="jgit-4.6" sequenceNumber="1598915275">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.6" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/neon/" {
org.eclipse.osgi lazy

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target View File

@@ -1,7 +1,7 @@
<?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="1594244919">
<target name="jgit-4.7" sequenceNumber="1598915265">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.7" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/oxygen/" {
org.eclipse.osgi lazy

+ 6
- 6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target View File

@@ -1,7 +1,7 @@
<?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="1594244890">
<target name="jgit-4.8" sequenceNumber="1598915261">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.8" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/photon/" {
org.eclipse.osgi lazy

+ 23
- 23
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target View File

@@ -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="1590935836">
<target name="jgit-4.9" sequenceNumber="1598915260">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<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/"/>
<unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.client.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.continuation" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.continuation.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.http" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.http.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.io" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.io.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.security" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.security.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.server" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.server.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.servlet" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.servlet.source" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.util" version="9.4.30.v20200611"/>
<unit id="org.eclipse.jetty.util.source" version="9.4.30.v20200611"/>
<repository id="jetty-9.4.30" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.30.v20200611/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
@@ -41,14 +41,14 @@
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
<unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200830-2311"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -84,7 +84,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>

+ 1
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd View File

@@ -1,7 +1,7 @@
target "jgit-4.9" with source configurePhase

include "projects/jetty-9.4.x.tpd"
include "orbit/R20200529191137-2020-06.tpd"
include "orbit/R20200831200620-2020-09.tpd"

location "https://download.eclipse.org/releases/2018-09/" {
org.eclipse.osgi lazy

org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20200519202422.tpd → org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20200831200620-2020-09.tpd View File

@@ -1,7 +1,7 @@
target "S20200519202422" with source configurePhase
target "R20200831200620-2020-09" with source configurePhase
// see https://download.eclipse.org/tools/orbit/downloads/

location "https://download.eclipse.org/tools/orbit/downloads/drops/S20200519202422/repository" {
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository" {
com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
@@ -20,14 +20,14 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202005192024
net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
org.apache.ant [1.10.8.v20200515-1239,1.10.8.v20200515-1239]
org.apache.ant.source [1.10.8.v20200515-1239,1.10.8.v20200515-1239]
org.apache.commons.codec [1.13.0.v20200108-0001,1.13.0.v20200108-0001]
org.apache.commons.codec.source [1.13.0.v20200108-0001,1.13.0.v20200108-0001]
org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
org.apache.commons.compress [1.19.0.v20200106-2343,1.19.0.v20200106-2343]
org.apache.commons.compress.source [1.19.0.v20200106-2343,1.19.0.v20200106-2343]
org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
org.apache.httpcomponents.httpclient [4.5.10.v20200114-1512,4.5.10.v20200114-1512]
org.apache.httpcomponents.httpclient.source [4.5.10.v20200114-1512,4.5.10.v20200114-1512]
org.apache.httpcomponents.httpclient [4.5.10.v20200830-2311,4.5.10.v20200830-2311]
org.apache.httpcomponents.httpclient.source [4.5.10.v20200830-2311,4.5.10.v20200830-2311]
org.apache.httpcomponents.httpcore [4.4.12.v20200108-1212,4.4.12.v20200108-1212]
org.apache.httpcomponents.httpcore.source [4.4.12.v20200108-1212,4.4.12.v20200108-1212]
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
@@ -38,12 +38,12 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202005192024
org.apache.sshd.sftp.source [2.4.0.v20200319-1547,2.4.0.v20200319-1547]
org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926]
org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926]
org.bouncycastle.bcpg [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
org.bouncycastle.bcpg.source [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
org.bouncycastle.bcpkix [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
org.bouncycastle.bcpkix.source [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
org.bouncycastle.bcprov [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
org.bouncycastle.bcprov.source [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
org.bouncycastle.bcpg [1.65.0.v20200527-1955,1.65.0.v20200527-1955]
org.bouncycastle.bcpg.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955]
org.bouncycastle.bcpkix [1.65.0.v20200527-1955,1.65.0.v20200527-1955]
org.bouncycastle.bcpkix.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955]
org.bouncycastle.bcprov [1.65.1.v20200529-1514,1.65.1.v20200529-1514]
org.bouncycastle.bcprov.source [1.65.1.v20200529-1514,1.65.1.v20200529-1514]
org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000]
org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519]

+ 1
- 1
org.eclipse.jgit.packaging/pom.xml View File

@@ -212,7 +212,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<configuration>
<encoding>ISO-8859-1</encoding>
</configuration>

+ 1
- 1
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java View File

@@ -1033,7 +1033,7 @@ public class DirCache {
*/
DIRC_VERSION_PATHCOMPRESS(4);

private int version;
private final int version;

private DirCacheVersion(int versionCode) {
this.version = versionCode;

+ 1
- 1
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java View File

@@ -149,7 +149,7 @@ public class DirCacheEntry {
toRemove = (toRemove << 7) | (b & 0x7F);
}
if (toRemove < 0
|| previous != null && toRemove > previous.path.length) {
|| (previous != null && toRemove > previous.path.length)) {
if (previous == null) {
throw new IOException(MessageFormat.format(
JGitText.get().DIRCCorruptLengthFirst,

+ 9
- 1
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java View File

@@ -1548,6 +1548,7 @@ public class PackWriter implements AutoCloseable {
endPhase(monitor);
}

@SuppressWarnings("Finally")
private void parallelDeltaSearch(ProgressMonitor monitor,
ObjectToPack[] list, int cnt, int threads) throws IOException {
DeltaCache dc = new ThreadSafeDeltaCache(config);
@@ -1569,15 +1570,22 @@ public class PackWriter implements AutoCloseable {
// Caller didn't give us a way to run the tasks, spawn up a
// temporary thread pool and make sure it tears down cleanly.
ExecutorService pool = Executors.newFixedThreadPool(threads);
Throwable e1 = null;
try {
runTasks(pool, pm, taskBlock, errors);
} catch (Exception e) {
e1 = e;
} finally {
pool.shutdown();
for (;;) {
try {
if (pool.awaitTermination(60, TimeUnit.SECONDS))
if (pool.awaitTermination(60, TimeUnit.SECONDS)) {
break;
}
} catch (InterruptedException e) {
if (e1 != null) {
e.addSuppressed(e1);
}
throw new IOException(JGitText
.get().packingCancelledDuringObjectsWriting, e);
}

+ 2
- 2
pom.xml View File

@@ -178,7 +178,7 @@
<maven-surefire-plugin-version>3.0.0-M4</maven-surefire-plugin-version>
<maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version>
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
<plexus-compiler-version>2.8.7</plexus-compiler-version>
<plexus-compiler-version>2.8.8</plexus-compiler-version>

<!-- Properties to enable jacoco code coverage analysis -->
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -384,7 +384,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>

Loading…
Cancel
Save