]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.9' into stable-5.10 88/187288/1
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 3 Nov 2021 22:01:44 +0000 (23:01 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 3 Nov 2021 22:01:44 +0000 (23:01 +0100)
* stable-5.9:
  Fix target platforms

Change-Id: Ib1876923ba98252682f41a03877792fd22b418d6

13 files changed:
1  2 
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target

index d7e158503fef0e18d7eaa5889f4248d0e395a2ac,54aeb7a82079ecbb8d03d49f236e393ec46ce35d..c72730b33775bf480e29acebb1aa57f4d149a402
@@@ -1,7 -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="1606854603">
 -<target name="jgit-4.10" sequenceNumber="1635975443">
++<target name="jgit-4.10" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index 42ef49c62c355fe5ff1dd3b111dd6d0c6766f7ba,40a40184c690972cfe787449c5891c042bd1c075..6e8eab07635dd13797c68dc2660edb78ea995435
@@@ -1,7 -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="1606854603">
 -<target name="jgit-4.11" sequenceNumber="1635975442">
++<target name="jgit-4.11" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index 17634cf129e65a49d51fb536716f0257ae0dabbd,f6cdc1e668b89ac294458989888d78a36fd90092..f86baf222de4ed019bfaf80e1c93b0bc42a9724a
@@@ -1,7 -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="1606854603">
 -<target name="jgit-4.12" sequenceNumber="1635975443">
++<target name="jgit-4.12" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index 04b536e6dc667b88960cede84e8531d576b60136,6f8c2e8e89cd4039e8a8ac923741d2e0f2e53f1e..626fb161080ed1e7398d2b92bf434856bce1b371
@@@ -1,7 -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="1606854603">
 -<target name="jgit-4.13" sequenceNumber="1635975443">
++<target name="jgit-4.13" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index c1722ffedcb05d7cf61bf5a8edd90d02c13e915a,8c91bcd05c40ca48aac6b8afc2cf496db361e25f..1a764a447a79108990418e9ba9e0bc09d5823eb0
@@@ -1,7 -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" sequenceNumber="1606854603">
 -<target name="jgit-4.14" sequenceNumber="1635975441">
++<target name="jgit-4.14" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index 7f5f5a17d7c7a561de06ad379e753b3655c00b11,0583cda7b643ada086b38359c1d8b8b5fa80adcf..c1b6f3c1650ccb9191eb653f9b04c11e7fac32b3
@@@ -1,7 -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="1606854603">
 -<target name="jgit-4.15" sequenceNumber="1635975441">
++<target name="jgit-4.15" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index bba090a136fffacf2f6350c307f2bf7c8d579b17,c087e76a8836938f2e8123446947cd22a9ff235f..a45870d6b81b8c469d06b1dbfe5fed9344a5c3b5
@@@ -1,7 -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.16" sequenceNumber="1606854603">
 -<target name="jgit-4.16" sequenceNumber="1635975357">
++<target name="jgit-4.16" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index d7c1728ba3b25c57a781afe2c2ab69ee062282c0,aa23a266238ad91f2af09b756e7e5b595721042b..773db74dd641eb1a4cda650e2c6260edded07ece
@@@ -1,7 -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.17" sequenceNumber="1606854603">
 -<target name="jgit-4.17-staging" sequenceNumber="1635975515">
++<target name="jgit-4.17-staging" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index 4ce2019ff4f6bc4c7755f94d87c2083c04acabf2,0000000000000000000000000000000000000000..1cffcf851e292b6576e0766de0d70cbb187dfd09
mode 100644,000000..100644
--- /dev/null
@@@ -1,94 -1,0 +1,94 @@@
- <target name="jgit-4.18-staging" sequenceNumber="1608217757">
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<?pde?>
 +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-       <repository id="jetty-9.4.30" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.30.v20200611/"/>
++<target name="jgit-4.18-staging" sequenceNumber="1635976698">
 +  <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://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/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.9.v20201106-1946"/>
 +      <unit id="org.apache.ant.source" version="1.10.9.v20201106-1946"/>
 +      <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.30.v20200204-2150"/>
 +      <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
 +      <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
 +      <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
 +      <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/R20201130205003/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-12/"/>
 +    </location>
 +  </locations>
 +</target>
index 061dcf29da81c35001d1cb1cf08f275231794ed9,41070856ae6a236d49d58433992daabb4be30944..16782ac93579ec9cdaf3252b18036dfbb7e10ae6
@@@ -1,7 -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="1606854620">
 -<target name="jgit-4.6" sequenceNumber="1635975454">
++<target name="jgit-4.6" sequenceNumber="1635976707">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index b96c54dfd0b4c28a9733867797c19924011240e0,93a3090d1ae1d5d343e02e3c4bcdadfc9fe9484f..cf737546a6115d397ddb9b64062c33a14050b3dd
@@@ -1,7 -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="1606854608">
 -<target name="jgit-4.7" sequenceNumber="1635975451">
++<target name="jgit-4.7" sequenceNumber="1635976703">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index 3ddc0bc6fa7d5bc38f6e6de113e8ba8be8e39052,ff3abcdd094cc770646b9f60019ac7e3ed770a22..923e238a061632049fcedfcd663fb8a7be7929e7
@@@ -1,7 -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="1606854603">
 -<target name="jgit-4.8" sequenceNumber="1635975443">
++<target name="jgit-4.8" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>
index f119fc10d4fdb6a50fb926f103fa6916c05879f8,c922b9fda20853fc1e7d654df6160e9d36b7f989..aedc418499e14cd3363ec8532396c9fecd681f2a
@@@ -1,7 -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.9" sequenceNumber="1606854603">
 -<target name="jgit-4.9" sequenceNumber="1635975443">
++<target name="jgit-4.9" sequenceNumber="1635976698">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.30.v20200611"/>