diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2021-11-19 09:23:12 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-11-22 20:50:28 +0100 |
| commit | f91e47f5b67e1db73cd8af59362a3d6749f15c4a (patch) | |
| tree | 86b994a3acaa75eaa31639b00c0eb9fc7e71d820 /org.eclipse.jgit.packaging | |
| parent | 2e2a3642c3775d0cd3c7184fd9b45a53dcb47629 (diff) | |
| download | jgit-f91e47f5b67e1db73cd8af59362a3d6749f15c4a.tar.gz jgit-f91e47f5b67e1db73cd8af59362a3d6749f15c4a.zip | |
Update Jetty to 10.0.6
- this is the same version eclipse platform currently uses
- update servlet-api to 4.0
- configure keystore used by AppServer with Subject Alternative Names
for host name and ip address to satisfy more strict SNI checking in
Jetty 10. See https://github.com/eclipse/jetty.project/issues/5379
- add jetty bundles to JGit-dependency-bundles in the jgit p2 repository
Bug: 571932
Bug: 576100
Change-Id: Ibd0240cf7ad4dc201947fd69707f517c3c1fc1c8
Diffstat (limited to 'org.eclipse.jgit.packaging')
14 files changed, 159 insertions, 141 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index a15d0fd76e..af9523fd4f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -75,10 +75,52 @@ <bundle id="javaewah.source"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="javax.servlet"> + <bundle id="jakarta.servlet-api"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="javax.servlet.source"> + <bundle id="jakarta.servlet-api.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.http"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.http.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.io"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.io.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.security"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.security.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.server"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.server.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.servlet"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.servlet.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.util"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.util.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.util.ajax"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.eclipse.jetty.util.ajax.source"> <category name="JGit-dependency-bundles"/> </bundle> <bundle id="net.i2p.crypto.eddsa"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index 06090e6742..52742be7e4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,28 +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.17" sequenceNumber="1636551936"> +<target name="jgit-4.17" sequenceNumber="1637441898"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.44.v20210927"/> - <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/"/> + <unit id="jakarta.servlet-api" version="4.0.0"/> + <unit id="jakarta.servlet-api.source" version="4.0.0"/> + <unit id="org.eclipse.jetty.http" version="10.0.6"/> + <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.io" version="10.0.6"/> + <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.security" version="10.0.6"/> + <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.server" version="10.0.6"/> + <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> + <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.8.v20211029-0838"/> @@ -37,8 +35,6 @@ <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> <unit id="javaewah" version="1.1.13.v20211029-0839"/> <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <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"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd index 16527013b7..49725d6cc4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd @@ -1,6 +1,6 @@ target "jgit-4.17" with source configurePhase -include "projects/jetty-9.4.x.tpd" +include "projects/jetty-10.0.x.tpd" include "orbit/S20211108222137.tpd" location "https://download.eclipse.org/releases/2020-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 1d67922291..65a3413f81 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,28 +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.18" sequenceNumber="1636551936"> +<target name="jgit-4.18" sequenceNumber="1637441898"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.44.v20210927"/> - <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/"/> + <unit id="jakarta.servlet-api" version="4.0.0"/> + <unit id="jakarta.servlet-api.source" version="4.0.0"/> + <unit id="org.eclipse.jetty.http" version="10.0.6"/> + <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.io" version="10.0.6"/> + <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.security" version="10.0.6"/> + <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.server" version="10.0.6"/> + <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> + <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.8.v20211029-0838"/> @@ -37,8 +35,6 @@ <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> <unit id="javaewah" version="1.1.13.v20211029-0839"/> <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <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"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd index e732ad6d17..4ed4bc196b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd @@ -1,6 +1,6 @@ target "jgit-4.18" with source configurePhase -include "projects/jetty-9.4.x.tpd" +include "projects/jetty-10.0.x.tpd" include "orbit/S20211108222137.tpd" location "https://download.eclipse.org/releases/2020-12/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index 8b96f5269d..f676d4cd74 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,28 +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.19-staging" sequenceNumber="1636551936"> +<target name="jgit-4.19-staging" sequenceNumber="1637441897"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.44.v20210927"/> - <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/"/> + <unit id="jakarta.servlet-api" version="4.0.0"/> + <unit id="jakarta.servlet-api.source" version="4.0.0"/> + <unit id="org.eclipse.jetty.http" version="10.0.6"/> + <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.io" version="10.0.6"/> + <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.security" version="10.0.6"/> + <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.server" version="10.0.6"/> + <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> + <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.8.v20211029-0838"/> @@ -37,8 +35,6 @@ <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> <unit id="javaewah" version="1.1.13.v20211029-0839"/> <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <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"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd index 0e77c8872a..b712f159f1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd @@ -1,6 +1,6 @@ target "jgit-4.19-staging" with source configurePhase -include "projects/jetty-9.4.x.tpd" +include "projects/jetty-10.0.x.tpd" include "orbit/S20211108222137.tpd" location "https://download.eclipse.org/staging/2021-03/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index a3aca8d794..b418bc360f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,28 +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.20" sequenceNumber="1636551936"> +<target name="jgit-4.20" sequenceNumber="1637441898"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.44.v20210927"/> - <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/"/> + <unit id="jakarta.servlet-api" version="4.0.0"/> + <unit id="jakarta.servlet-api.source" version="4.0.0"/> + <unit id="org.eclipse.jetty.http" version="10.0.6"/> + <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.io" version="10.0.6"/> + <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.security" version="10.0.6"/> + <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.server" version="10.0.6"/> + <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> + <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.8.v20211029-0838"/> @@ -37,8 +35,6 @@ <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> <unit id="javaewah" version="1.1.13.v20211029-0839"/> <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <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"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd index 081864849d..d575fc7e38 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd @@ -1,6 +1,6 @@ target "jgit-4.20" with source configurePhase -include "projects/jetty-9.4.x.tpd" +include "projects/jetty-10.0.x.tpd" include "orbit/S20211108222137.tpd" location "https://download.eclipse.org/releases/2021-06/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index 5f44987235..d2a1279d9e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,28 +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.21" sequenceNumber="1636551936"> +<target name="jgit-4.21" sequenceNumber="1637441395"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.44.v20210927"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.44.v20210927"/> - <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/"/> + <unit id="jakarta.servlet-api" version="4.0.0"/> + <unit id="jakarta.servlet-api.source" version="4.0.0"/> + <unit id="org.eclipse.jetty.http" version="10.0.6"/> + <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.io" version="10.0.6"/> + <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.security" version="10.0.6"/> + <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.server" version="10.0.6"/> + <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> + <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> + <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.8.v20211029-0838"/> @@ -37,8 +35,6 @@ <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> <unit id="javaewah" version="1.1.13.v20211029-0839"/> <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <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"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd index 53848b2699..1a534f9094 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd @@ -1,6 +1,6 @@ target "jgit-4.21" with source configurePhase -include "projects/jetty-9.4.x.tpd" +include "projects/jetty-10.0.x.tpd" include "orbit/S20211108222137.tpd" location "https://download.eclipse.org/releases/2021-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20211108222137.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20211108222137.tpd index 0f0701099e..b935ec9dc2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20211108222137.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20211108222137.tpd @@ -14,8 +14,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202111082221 com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004] javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839] javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] - javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410] net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534] net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534] diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-10.0.x.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-10.0.x.tpd new file mode 100644 index 0000000000..6c3ee18332 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-10.0.x.tpd @@ -0,0 +1,20 @@ +target "jetty-10.0.x" with source configurePhase + +location jetty-10.0.x "https://download.eclipse.org/eclipse/jetty/10.0.6/" { + jakarta.servlet-api [4.0.0, 5.0.0) + jakarta.servlet-api.source [4.0.0, 5.0.0) + org.eclipse.jetty.http [10.0.6,10.0.6] + org.eclipse.jetty.http.source [10.0.6,10.0.6] + org.eclipse.jetty.io [10.0.6,10.0.6] + org.eclipse.jetty.io.source [10.0.6,10.0.6] + org.eclipse.jetty.security [10.0.6,10.0.6] + org.eclipse.jetty.security.source [10.0.6,10.0.6] + org.eclipse.jetty.server [10.0.6,10.0.6] + org.eclipse.jetty.server.source [10.0.6,10.0.6] + org.eclipse.jetty.servlet [10.0.6,10.0.6] + org.eclipse.jetty.servlet.source [10.0.6,10.0.6] + org.eclipse.jetty.util [10.0.6,10.0.6] + org.eclipse.jetty.util.source [10.0.6,10.0.6] + org.eclipse.jetty.util.ajax [10.0.6,10.0.6] + org.eclipse.jetty.util.ajax.source [10.0.6,10.0.6] +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd deleted file mode 100644 index 8a143ce24e..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd +++ /dev/null @@ -1,22 +0,0 @@ -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.44.v20210927/" { - org.eclipse.jetty.client [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.client.source [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.continuation [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.continuation.source [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.http [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.http.source [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.io [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.io.source [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.security [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.security.source [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.server [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.server.source [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.servlet [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.servlet.source [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.util [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.util.source [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.util.ajax [9.4.44.v20210927,9.4.44.v20210927] - org.eclipse.jetty.util.ajax.source [9.4.44.v20210927,9.4.44.v20210927] -} |