Update jetty to 10.0.15 and use it from Maven central directly and update servlet-api to 4.0.1 Change-Id: Id17aad56fc6f10dd64ce088c4b5a0532f5f0c588
diff --git a/WORKSPACE b/WORKSPACE index 56d52c5..66cde05 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -142,8 +142,8 @@ maven_jar( name = "servlet-api", - artifact = "javax.servlet:javax.servlet-api:4.0.0", - sha1 = "60200affc2fe0165136ed3690faf00b66aed581a", + artifact = "javax.servlet:javax.servlet-api:4.0.1", + sha1 = "a27082684a2ff0bf397666c3943496c44541d1ca", ) maven_jar( @@ -214,55 +214,55 @@ sha1 = "b3add478d4382b78ea20b1671390a858002feb6c", ) -JETTY_VER = "10.0.13" +JETTY_VER = "10.0.15" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "a6ee6e48e98377863aa80f41ea979df678b17966", - src_sha1 = "5a01db2e1bae632879e9b90e845ae946059b46c9", + sha1 = "17e21100d9eabae2c0f560ab2c1d5f0edfc4a57b", + src_sha1 = "989ecc16914e7c8f9f78715dd97d0c511d77a99f", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "6d4c88cf068709d9f2499ca417b23f3f835b0c43", - src_sha1 = "887e7a7c457e149df9c23db89c7d2425c4444ccf", + sha1 = "ae9c2fd327090fc749a6656109adf88f84f05854", + src_sha1 = "1cae575fc9f3d9271507642606603cca7dc753e8", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "f472705ebfce7e9a5b6cb8cbb84e73767e35fad7", - src_sha1 = "2689f8e616282b19f34d43f89800f67490ae65fa", + sha1 = "d1e941f30300d64b122d5346f1599ecaa8e270ba", + src_sha1 = "7b04c7d3dc702608306935607bf73ac871816010", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "b3dc7ec1da090106031dd36cb1e2637a7fb6ce1c", - src_sha1 = "1bbb620e34218584bfdf11542e2b46781437335d", + sha1 = "53c4702201c33501bc37a982e5325b5f11084a4e", + src_sha1 = "2cf03c695ea19c1af5668f5c97dac59e3027eb55", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "be9d7f226022b02e174a83d597d088e22e12d365", - src_sha1 = "48f5b1ce8570a9d560e62c39170e754288a1d290", + sha1 = "4481d9593bb89c4da016e49463b0d477faca06dc", + src_sha1 = "c9f241cce63ac929d4b8bd859c761ba83f4a3124", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "35caf3afb3cca22ca4bc36908bf82e6d973c5be4", - src_sha1 = "9d7c19deb76c0247ad0d25afce6e4c0d681d2af0", + sha1 = "eb8901d419e83f2f06809e0cdceaf38b06426f01", + src_sha1 = "757ee2bd100c5bd20aebc7e2fdc4ceb99f23b451", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "bc52bc38cb76b5c260ec109661ebcb02393d83a7", - src_sha1 = "b229198672cfb765ce7571e5e0e855e01170f881", + sha1 = "0cde62dd87845dd6c0c7f07db6c901e7d020653b", + src_sha1 = "135448f8b3b3b06f7f3312d222992525ae4bdd25", ) BOUNCYCASTLE_VER = "1.73"
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 ed364f5..bcc23bd 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,24 +1,9 @@ <?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="1681685328"> +<target name="jgit-4.17" sequenceNumber="1682113709"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2020-09/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
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 1038f27..014daea 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,5 @@ target "jgit-4.17" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
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 54bd2c7..555353e 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,24 +1,9 @@ <?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="1681685328"> +<target name="jgit-4.18" sequenceNumber="1682113710"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2020-12/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
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 2bd7eb7..2895ed7 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,5 @@ target "jgit-4.18" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
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 5c26ff7..7b663d8 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,24 +1,9 @@ <?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="1681685328"> +<target name="jgit-4.19-staging" sequenceNumber="1682113709"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2021-03/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
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 e552824..3cd1c3f 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,5 @@ target "jgit-4.19-staging" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
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 b520e36..e199d55 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,24 +1,9 @@ <?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="1681685328"> +<target name="jgit-4.20" sequenceNumber="1682113709"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2021-06/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
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 b915cd1..7c98488 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,5 @@ target "jgit-4.20" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
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 de01de9..90cca99 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,24 +1,9 @@ <?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="1681685328"> +<target name="jgit-4.21" sequenceNumber="1682113709"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2021-09/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
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 179efb7..75e7455 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,5 @@ target "jgit-4.21" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 4cee278..2e82f80 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
@@ -1,24 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.22" sequenceNumber="1681685328"> +<target name="jgit-4.22" sequenceNumber="1682113708"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2021-12/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd index fe6cfb7..02e92a5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd
@@ -1,6 +1,5 @@ target "jgit-4.22" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index ff8373b..2639417 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target
@@ -1,24 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.23" sequenceNumber="1681685328"> +<target name="jgit-4.23" sequenceNumber="1682113708"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2022-03/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd index d7c2d5f..3921ed5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd
@@ -1,6 +1,5 @@ target "jgit-4.23" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index 859d0fa..9866cc6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target
@@ -1,24 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.24" sequenceNumber="1681685328"> +<target name="jgit-4.24" sequenceNumber="1682113708"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2022-06/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd index d8815dd..b42913a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd
@@ -1,6 +1,5 @@ target "jgit-4.24" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index b65b234..c2ef759 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target
@@ -1,24 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.25" sequenceNumber="1681685328"> +<target name="jgit-4.25" sequenceNumber="1682113708"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2022-09/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd index 6f72107..c276e43 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd
@@ -1,6 +1,5 @@ target "jgit-4.25" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index 17c7a01..08310ab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target
@@ -1,24 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.26" sequenceNumber="1681685328"> +<target name="jgit-4.26" sequenceNumber="1682113652"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.http" version="10.0.13"/> - <unit id="org.eclipse.jetty.io" version="10.0.13"/> - <unit id="org.eclipse.jetty.security" version="10.0.13"/> - <unit id="org.eclipse.jetty.server" version="10.0.13"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.13"/> - <unit id="org.eclipse.jetty.util" version="10.0.13"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.13"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/oomph/jetty/release/10.0.13/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <repository id="jetty-10.0.6" 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.10.1.v20230109-0753"/> <unit id="com.google.gson.source" version="2.10.1.v20230109-0753"/> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -81,6 +66,58 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2022-12/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> <dependencies> <dependency>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd index d80e5bf..71cb057 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd
@@ -1,6 +1,5 @@ target "jgit-4.26" with source configurePhase -include "projects/jetty-10.0.x.tpd" include "orbit/R20230302014618-2023-03.tpd" include "maven/dependencies.tpd"
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 877cfe0..7fce50e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
@@ -27,3 +27,51 @@ version = "1.73" } } + +maven jetty + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-http" + version = "10.0.15" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-io" + version = "10.0.15" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-security" + version = "10.0.15" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-server" + version = "10.0.15" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-servlet" + version = "10.0.15" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-util" + version = "10.0.15" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-util-ajax" + version = "10.0.15" + } + dependency { + groupId = "javax.servlet" + artifactId = "javax.servlet-api" + version = "4.0.1" + } +}
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 deleted file mode 100644 index e1afcff..0000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-10.0.x.tpd +++ /dev/null
@@ -1,16 +0,0 @@ -target "jetty-10.0.x" with source configurePhase - -location jetty-10.0.x "https://download.eclipse.org/oomph/jetty/release/10.0.13/" { - org.eclipse.jetty.http [10.0.13,10.0.14] - org.eclipse.jetty.io [10.0.13,10.0.14] - org.eclipse.jetty.security [10.0.13,10.0.14] - org.eclipse.jetty.server [10.0.13,10.0.14] - org.eclipse.jetty.servlet [10.0.13,10.0.14] - org.eclipse.jetty.util [10.0.13,10.0.14] - org.eclipse.jetty.util.ajax [10.0.13,10.0.14] -} - -location jetty-10.0.6 "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) -} \ No newline at end of file
diff --git a/pom.xml b/pom.xml index 24eff85..ea24cda 100644 --- a/pom.xml +++ b/pom.xml
@@ -161,8 +161,8 @@ <args4j-version>2.33</args4j-version> <commons-compress-version>1.22</commons-compress-version> <osgi-core-version>6.0.0</osgi-core-version> - <servlet-api-version>4.0.0</servlet-api-version> - <jetty-version>10.0.13</jetty-version> + <servlet-api-version>4.0.1</servlet-api-version> + <jetty-version>10.0.15</jetty-version> <japicmp-version>0.17.1</japicmp-version> <httpclient-version>4.5.14</httpclient-version> <httpcore-version>4.4.16</httpcore-version>