Merge branch 'stable-5.10' into stable-5.11

* stable-5.10:
  Fix target platforms

- jetty 9.4.36 moved to archive.eclipse.org
- use the final release p2 repo instead of staging for 2021-03

Change-Id: I6ce2294bb150fedf8ded7fe6c1e23019d9c178d6
This commit is contained in:
Matthias Sohn 2021-11-03 23:09:15 +01:00
commit 8ff0859703
17 changed files with 38 additions and 38 deletions

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="1615333029">
<target name="jgit-4.10" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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="1615333055">
<target name="jgit-4.11" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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="1615333029">
<target name="jgit-4.12" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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="1615333029">
<target name="jgit-4.13" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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" sequenceNumber="1615333029">
<target name="jgit-4.14" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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="1615333029">
<target name="jgit-4.15" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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.16" sequenceNumber="1615333030">
<target name="jgit-4.16" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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.17" sequenceNumber="1615333030">
<target name="jgit-4.17" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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.18" sequenceNumber="1615333029">
<target name="jgit-4.18" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

View File

@ -1,8 +0,0 @@
target "jgit-4.19-staging" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/R20210223232630-2021-03.tpd"
location "https://download.eclipse.org/staging/2021-03/" {
org.eclipse.osgi lazy
}

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.19-staging" sequenceNumber="1615333029">
<target name="jgit-4.19" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
@ -90,7 +90,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/2021-03/"/>
<repository location="https://download.eclipse.org/releases/2021-03/"/>
</location>
</locations>
</target>

View File

@ -0,0 +1,8 @@
target "jgit-4.19" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/R20210223232630-2021-03.tpd"
location "https://download.eclipse.org/releases/2021-03/" {
org.eclipse.osgi lazy
}

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="1615333044">
<target name="jgit-4.6" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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="1615333034">
<target name="jgit-4.7" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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="1615333030">
<target name="jgit-4.8" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

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.9" sequenceNumber="1615333029">
<target name="jgit-4.9" sequenceNumber="1635977193">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
<repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
<repository id="jetty-9.4.36" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>

View File

@ -1,6 +1,6 @@
target "jetty-9.4.x" with source configurePhase
location jetty-9.4.36 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/" {
location jetty-9.4.36 "https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.36.v20210114/" {
org.eclipse.jetty.client [9.4.36.v20210114,9.4.36.v20210114]
org.eclipse.jetty.client.source [9.4.36.v20210114,9.4.36.v20210114]
org.eclipse.jetty.continuation [9.4.36.v20210114,9.4.36.v20210114]