Merge branch 'stable-5.12' into stable-5.13

* stable-5.12:
  Fix target platforms

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

Change-Id: I35c1264b8e9c63874663141288dca03b47f263ed
This commit is contained in:
Matthias Sohn 2021-11-03 23:18:21 +01:00
commit 8e7dfb5e4b
18 changed files with 35 additions and 35 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="1630003272">
<target name="jgit-4.10" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.11" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.12" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.13" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.14" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.15" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.16" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.17" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.18" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.19-staging" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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.20" sequenceNumber="1630003272">
<target name="jgit-4.20" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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.21" sequenceNumber="1630003272">
<target name="jgit-4.21" sequenceNumber="1635977845">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
@ -93,7 +93,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-09/"/>
<repository location="https://download.eclipse.org/releases/2021-09/"/>
</location>
</locations>
</target>

View File

@ -3,6 +3,6 @@ target "jgit-4.21" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "orbit/R20210825222808-2021-09.tpd"
location "https://download.eclipse.org/staging/2021-09/" {
location "https://download.eclipse.org/releases/2021-09/" {
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="1630003285">
<target name="jgit-4.6" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003276">
<target name="jgit-4.7" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.8" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

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="1630003272">
<target name="jgit-4.9" sequenceNumber="1635977786">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -22,7 +22,7 @@
<unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
<repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
<repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>

View File

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