diff options
23 files changed, 252 insertions, 231 deletions
@@ -243,55 +243,55 @@ maven_jar( sha1 = "431fc3cbc0ff81abdbfde070062741089c3ba874", ) -JETTY_VER = "9.4.44.v20210927" +JETTY_VER = "10.0.6" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "1cb43a0d74b7395c7207dbf3dc2ca97eac89f5fd", - src_sha1 = "2bbc54fc1835c963744a4e82ba2541e94fcbcf9b", + sha1 = "482165726bf54dd10ee7e2aeb4ae9481eee0c878", + src_sha1 = "8a8173a0bc6c0d215fc9fb9ba5fd50bae1690f9c", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "ecb80b8e008daa46e95e5691b2611d4007922497", - src_sha1 = "d67d4705a08d9b76592b3e177e2bb1aac968d832", + sha1 = "513f44ed9636ca5e0adefa0c0b81511065dfddd2", + src_sha1 = "2e7eb2edbf1592e15b338096651e379fea860859", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "0bf2de0d31925a8ca71ad80f721236850b636e0d", - src_sha1 = "3582cbf081cf3652f6507093585c2a0f3b8738bb", + sha1 = "125ee07e4d8182a6afca00d543f6a4dcc84f2678", + src_sha1 = "5c0789872ec6743ae893131ae81262aaefc87fe6", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "37f0e30cdc02128e40d095ad63cb18e10ecb7726", - src_sha1 = "7f1a6e3ab54e541f33b8ed100d553d4034d2e3a9", + sha1 = "4c8eed25d577002a6c0f9f3ef340eb581390f696", + src_sha1 = "ac7214d6202ee0cbc4bdbcf90c7906ca716e84e5", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "a2ec01e2b5552b777a3d7085163f80756ef8c1ce", - src_sha1 = "6262966b3cd10ff6b98f0bed428640bbbe4f7e79", + sha1 = "1ab82ae5dfdbb07f0ffa07f28274fdf30e3e96ee", + src_sha1 = "c59082f3a09c024fafc281f432b67432d398b8c0", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "3c7151c5a04a93119988b48a1577a972d90f8990", - src_sha1 = "f7f0420221772bc63ebae21571bb9925ca971a82", + sha1 = "4e2935749ea1c9fcabba61a857f8283c7f5f9885", + src_sha1 = "6baba651899c044e14ba37d43934950670d2aa4e", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "ed2f30e8eef939ab2825e607d83f82f85167e2c0", - src_sha1 = "1a48ae7a45683d20afb90784d1db314be2c73c92", + sha1 = "a801d4b5f5e906f134713ae82fd1ea10a15902c6", + src_sha1 = "f35f5525a5d30dc1237b85457d758d578e3ce8d0", ) BOUNCYCASTLE_VER = "1.69" diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index c7812e4fe8..f4a25ee8f4 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -16,8 +16,8 @@ Export-Package: org.eclipse.jgit.http.server;version="6.0.0", javax.servlet.http" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: javax.servlet;version="[2.5.0,3.2.0)", - javax.servlet.http;version="[2.5.0,3.2.0)", +Import-Package: javax.servlet;version="[2.5.0,5.0.0)", + javax.servlet.http;version="[2.5.0,5.0.0)", org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)", org.eclipse.jgit.errors;version="[6.0.0,6.1.0)", org.eclipse.jgit.internal.storage.dfs;version="[6.0.0,6.1.0)", diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 70a846de20..662f37c35e 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -7,27 +7,25 @@ Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: javax.servlet;version="[2.5.0,3.2.0)", - javax.servlet.http;version="[2.5.0,3.2.0)", +Import-Package: javax.servlet;version="[2.5.0,5.0.0)", + javax.servlet.http;version="[2.5.0,5.0.0)", org.apache.commons.codec;version="[1.6.0,2.0.0)", org.apache.commons.codec.binary;version="[1.6.0,2.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.4.0,5.0.0)", org.apache.http.message;version="[4.3.0,5.0.0)", - org.eclipse.jetty.continuation;version="[9.4.5,10.0.0)", - org.eclipse.jetty.http;version="[9.4.5,10.0.0)", - org.eclipse.jetty.io;version="[9.4.5,10.0.0)", - org.eclipse.jetty.security;version="[9.4.5,10.0.0)", - org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)", - org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", + org.eclipse.jetty.http;version="[10.0.0,11.0.0)", + org.eclipse.jetty.io;version="[10.0.0,11.0.0)", + org.eclipse.jetty.security;version="[10.0.0,11.0.0)", + org.eclipse.jetty.security.authentication;version="[10.0.0,11.0.0)", + org.eclipse.jetty.server;version="[10.0.0,11.0.0)", + org.eclipse.jetty.server.handler;version="[10.0.0,11.0.0)", + org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", org.eclipse.jgit.api;version="[6.0.0,6.1.0)", org.eclipse.jgit.errors;version="[6.0.0,6.1.0)", org.eclipse.jgit.http.server;version="[6.0.0,6.1.0)", diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index e3e3222620..6be5cdd09e 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -8,20 +8,19 @@ Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: javax.servlet;version="[2.5.0,3.2.0)", - javax.servlet.http;version="[2.5.0,3.2.0)", +Import-Package: javax.servlet;version="[2.5.0,5.0.0)", + javax.servlet.http;version="[2.5.0,5.0.0)", org.apache.commons.logging;version="[1.1.1,2.0.0)", - org.eclipse.jetty.http;version="[9.4.5,10.0.0)", - org.eclipse.jetty.security;version="[9.4.5,10.0.0)", - org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)", - org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)", + org.eclipse.jetty.http;version="[10.0.0,11.0.0)", + org.eclipse.jetty.security;version="[10.0.0,11.0.0)", + org.eclipse.jetty.security.authentication;version="[10.0.0,11.0.0)", + org.eclipse.jetty.server;version="[10.0.0,11.0.0)", + org.eclipse.jetty.server.handler;version="[10.0.0,11.0.0)", + org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.ssl;version="[10.0.0,11.0.0)", org.eclipse.jgit.errors;version="[6.0.0,6.1.0)", org.eclipse.jgit.http.server;version="[6.0.0,6.1.0)", org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)", diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 0f052987e3..58646914c1 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -21,20 +21,23 @@ import java.net.URISyntaxException; import java.net.UnknownHostException; import java.nio.file.Files; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.security.AbstractLoginService; import org.eclipse.jetty.security.Authenticator; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; +import org.eclipse.jetty.security.RolePrincipal; +import org.eclipse.jetty.security.UserPrincipal; import org.eclipse.jetty.security.authentication.BasicAuthenticator; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; @@ -143,13 +146,15 @@ public class AppServer { } if (sslPort >= 0) { - SslContextFactory sslContextFactory = createTestSslContextFactory( - hostName); + SslContextFactory.Server sslContextFactory = createTestSslContextFactory( + hostName, ip); secureConfig = new HttpConfiguration(config); - secureConnector = new ServerConnector(server, - new SslConnectionFactory(sslContextFactory, - HttpVersion.HTTP_1_1.asString()), - new HttpConnectionFactory(secureConfig)); + secureConfig.addCustomizer(new SecureRequestCustomizer()); + HttpConnectionFactory http11 = new HttpConnectionFactory( + secureConfig); + SslConnectionFactory tls = new SslConnectionFactory( + sslContextFactory, http11.getProtocol()); + secureConnector = new ServerConnector(server, tls, http11); secureConnector.setPort(sslPort); secureConnector.setHost(ip); } else { @@ -171,8 +176,9 @@ public class AppServer { server.setHandler(log); } - private SslContextFactory createTestSslContextFactory(String hostName) { - SslContextFactory.Client factory = new SslContextFactory.Client(true); + private SslContextFactory.Server createTestSslContextFactory( + String hostName, String ip) { + SslContextFactory.Server factory = new SslContextFactory.Server(); String dName = "CN=,OU=,O=,ST=,L=,C="; @@ -190,6 +196,8 @@ public class AppServer { "-keystore", keyStore.getAbsolutePath(), // "-storepass", keyPassword, "-alias", hostName, // + "-ext", + String.format("san=IP:%s,DNS:%s", ip, hostName), // "-genkeypair", // "-keyalg", "RSA", // "-keypass", keyPassword, // @@ -260,12 +268,12 @@ public class AppServer { } static class TestMappedLoginService extends AbstractLoginService { - private String role; + private RolePrincipal role; protected final Map<String, UserPrincipal> users = new ConcurrentHashMap<>(); TestMappedLoginService(String role) { - this.role = role; + this.role = new RolePrincipal(role); } @Override @@ -277,16 +285,16 @@ public class AppServer { } @Override - protected String[] loadRoleInfo(UserPrincipal user) { - if (users.get(user.getName()) == null) { - return null; - } - return new String[] { role }; + protected UserPrincipal loadUserInfo(String user) { + return users.get(user); } @Override - protected UserPrincipal loadUserInfo(String user) { - return users.get(user); + protected List<RolePrincipal> loadRoleInfo(UserPrincipal user) { + if (users.get(user.getName()) == null) { + return null; + } + return Collections.singletonList(role); } } diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 95ac89b0b0..7a5227022c 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -7,27 +7,25 @@ Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: javax.servlet;version="[3.1.0,4.0.0)", - javax.servlet.http;version="[3.1.0,4.0.0)", +Import-Package: javax.servlet;version="[3.1.0,5.0.0)", + javax.servlet.http;version="[3.1.0,5.0.0)", org.apache.http;version="[4.4.0,5.0.0)", org.apache.http.client;version="[4.4.0,5.0.0)", org.apache.http.client.methods;version="[4.4.0,5.0.0)", org.apache.http.entity;version="[4.4.0,5.0.0)", org.apache.http.impl.client;version="[4.4.0,5.0.0)", - org.eclipse.jetty.continuation;version="[9.4.5,10.0.0)", - org.eclipse.jetty.http;version="[9.4.5,10.0.0)", - org.eclipse.jetty.io;version="[9.4.5,10.0.0)", - org.eclipse.jetty.security;version="[9.4.5,10.0.0)", - org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)", - org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", + org.eclipse.jetty.http;version="[10.0.0,11.0.0)", + org.eclipse.jetty.io;version="[10.0.0,11.0.0)", + org.eclipse.jetty.security;version="[10.0.0,11.0.0)", + org.eclipse.jetty.security.authentication;version="[10.0.0,11.0.0)", + org.eclipse.jetty.server;version="[10.0.0,11.0.0)", + org.eclipse.jetty.server.handler;version="[10.0.0,11.0.0)", + org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", org.eclipse.jgit.api;version="[6.0.0,6.1.0)", org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)", diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index c5d8444260..e1f026acfa 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -20,9 +20,9 @@ Export-Package: org.eclipse.jgit.lfs.server;version="6.0.0"; org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.google.gson;version="[2.8.0,3.0.0)", - javax.servlet;version="[3.1.0,4.0.0)", - javax.servlet.annotation;version="[3.1.0,4.0.0)", - javax.servlet.http;version="[3.1.0,4.0.0)", + javax.servlet;version="[3.1.0,5.0.0)", + javax.servlet.annotation;version="[3.1.0,5.0.0)", + javax.servlet.http;version="[3.1.0,5.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)", org.eclipse.jgit.internal;version="[6.0.0,6.1.0)", 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] -} diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 89ad6d1f3c..f46a3fae6a 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -7,13 +7,13 @@ Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: javax.servlet;version="[3.1.0,4.0.0)", +Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.apache.commons.logging;version="[1.2,2.0)", - org.eclipse.jetty.server;version="[9.4.5,10.0.0)", - org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)", - org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util;version="[9.4.5,10.0.0)", - org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)", + org.eclipse.jetty.server;version="[10.0.0,11.0.0)", + org.eclipse.jetty.server.handler;version="[10.0.0,11.0.0)", + org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util;version="[10.0.0,11.0.0)", + org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)", org.eclipse.jgit.api;version="[6.0.0,6.1.0)", org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)", org.eclipse.jgit.archive;version="[6.0.0,6.1.0)", @@ -162,7 +162,7 @@ <commons-compress-version>1.21</commons-compress-version> <osgi-core-version>4.3.1</osgi-core-version> <servlet-api-version>3.1.0</servlet-api-version> - <jetty-version>9.4.44.v20210927</jetty-version> + <jetty-version>10.0.6</jetty-version> <japicmp-version>0.15.3</japicmp-version> <httpclient-version>4.5.13</httpclient-version> <httpcore-version>4.4.14</httpcore-version> |