Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disable jetty-home 

enabled a few more ee9 modules, but not enough
enabled integrations
This commit is contained in:
Greg Wilkins 2022-05-04 19:29:27 +02:00
parent 34809d7cf7
commit 3f6f725cce
17 changed files with 180 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-ee9/jetty-ee9-annotations/pom.xml
View File

@ -20,7 +20,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.ee9.annotations.resources=org.eclipse.jetty.plus
@{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.ee9.annotations/org.eclipse.jetty.ee9.annotations.resources=org.eclipse.jetty.ee9.plus
</argLine>
</configuration>
</plugin>

2
jetty-ee9/jetty-ee9-annotations/src/main/java/module-info.java
View File

@ -25,6 +25,8 @@ module org.eclipse.jetty.ee9.annotations
exports org.eclipse.jetty.ee9.annotations;
uses jakarta.servlet.ServletContainerInitializer;
provides Configuration with
AnnotationConfiguration;
}

5
jetty-ee9/jetty-ee9-annotations/src/main/java/org/eclipse/jetty/ee9/annotations/AnnotationConfiguration.java
View File

@ -69,13 +69,14 @@ public class AnnotationConfiguration extends AbstractConfiguration
{
private static final Logger LOG = LoggerFactory.getLogger(AnnotationConfiguration.class);
// TODO review if these should be in ee9 space?
public static final String SERVLET_CONTAINER_INITIALIZER_EXCLUSION_PATTERN = "org.eclipse.jetty.containerInitializerExclusionPattern";
public static final String SERVLET_CONTAINER_INITIALIZER_ORDER = "org.eclipse.jetty.containerInitializerOrder";
public static final String CLASS_INHERITANCE_MAP = "org.eclipse.jetty.classInheritanceMap";
public static final String CONTAINER_INITIALIZERS = "org.eclipse.jetty.containerInitializers";
public static final String CONTAINER_INITIALIZER_STARTER = "org.eclipse.jetty.containerInitializerStarter";
public static final String MULTI_THREADED = "org.eclipse.jetty.annotations.multiThreaded";
public static final String MAX_SCAN_WAIT = "org.eclipse.jetty.annotations.maxWait";
public static final String MULTI_THREADED = "org.eclipse.jetty.ee9.annotations.multiThreaded";
public static final String MAX_SCAN_WAIT = "org.eclipse.jetty.ee9.annotations.maxWait";
public static final int DEFAULT_MAX_SCAN_WAIT = 60; /* time in sec */
public static final boolean DEFAULT_MULTI_THREADED = true;

50
jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestAnnotationInheritance.java
View File

@ -50,7 +50,7 @@ public class TestAnnotationInheritance
@Override
public void handle(AnnotationParser.ClassInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
if (annotation == null || !"org.eclipse.jetty.ee9.annotations.Sample".equals(annotation))
return;
annotatedClassNames.add(info.getClassName());
@ -59,7 +59,7 @@ public class TestAnnotationInheritance
@Override
public void handle(AnnotationParser.FieldInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
if (annotation == null || !"org.eclipse.jetty.ee9.annotations.Sample".equals(annotation))
return;
annotatedFields.add(info.getClassInfo().getClassName() + "." + info.getFieldName());
}
@ -67,7 +67,7 @@ public class TestAnnotationInheritance
@Override
public void handle(AnnotationParser.MethodInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
if (annotation == null || !"org.eclipse.jetty.ee9.annotations.Sample".equals(annotation))
return;
annotatedMethods.add(info.getClassInfo().getClassName() + "." + info.getMethodName());
}
@ -103,17 +103,17 @@ public class TestAnnotationInheritance
//check we got all annotated methods on each class
assertEquals(7, handler.annotatedMethods.size());
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.a"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.b"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.c"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.d"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.l"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassB.a"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassB.c"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.a"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.b"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.c"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.d"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.l"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassB.a"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassB.c"));
//check we got all annotated fields on each class
assertEquals(1, handler.annotatedFields.size());
assertEquals("org.eclipse.jetty.annotations.ClassA.m", handler.annotatedFields.get(0));
assertEquals("org.eclipse.jetty.ee9.annotations.ClassA.m", handler.annotatedFields.get(0));
}
@Test
@ -128,17 +128,17 @@ public class TestAnnotationInheritance
//check we got all annotated methods on each class
assertEquals(7, handler.annotatedMethods.size());
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.a"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.b"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.c"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.d"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassA.l"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassB.a"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.annotations.ClassB.c"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.a"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.b"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.c"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.d"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassA.l"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassB.a"));
assertTrue(handler.annotatedMethods.contains("org.eclipse.jetty.ee9.annotations.ClassB.c"));
//check we got all annotated fields on each class
assertEquals(1, handler.annotatedFields.size());
assertEquals("org.eclipse.jetty.annotations.ClassA.m", handler.annotatedFields.get(0));
assertEquals("org.eclipse.jetty.ee9.annotations.ClassA.m", handler.annotatedFields.get(0));
}
@Test
@ -165,13 +165,13 @@ public class TestAnnotationInheritance
assertFalse(map.isEmpty());
assertEquals(2, map.size());
assertThat(map, hasKey("org.eclipse.jetty.annotations.ClassA"));
assertThat(map, hasKey("org.eclipse.jetty.annotations.InterfaceD"));
Set<String> classes = map.get("org.eclipse.jetty.annotations.ClassA");
assertThat(classes, contains("org.eclipse.jetty.annotations.ClassB"));
assertThat(map, hasKey("org.eclipse.jetty.ee9.annotations.ClassA"));
assertThat(map, hasKey("org.eclipse.jetty.ee9.annotations.InterfaceD"));
Set<String> classes = map.get("org.eclipse.jetty.ee9.annotations.ClassA");
assertThat(classes, contains("org.eclipse.jetty.ee9.annotations.ClassB"));
classes = map.get("org.eclipse.jetty.annotations.InterfaceD");
assertThat(classes, containsInAnyOrder("org.eclipse.jetty.annotations.ClassB",
classes = map.get("org.eclipse.jetty.ee9.annotations.InterfaceD");
assertThat(classes, containsInAnyOrder("org.eclipse.jetty.ee9.annotations.ClassB",
Foo.class.getName()));
}
}

26
jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestAnnotationParser.java
View File

@ -101,7 +101,7 @@ public class TestAnnotationParser
@Test
public void testSampleAnnotation() throws Exception
{
String[] classNames = new String[]{"org.eclipse.jetty.annotations.ClassA"};
String[] classNames = new String[]{"org.eclipse.jetty.ee9.annotations.ClassA"};
AnnotationParser parser = new AnnotationParser();
class SampleAnnotationHandler extends AnnotationParser.AbstractHandler
@ -111,16 +111,16 @@ public class TestAnnotationParser
@Override
public void handle(AnnotationParser.ClassInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
if (annotation == null || !"org.eclipse.jetty.ee9.annotations.Sample".equals(annotation))
return;
assertEquals("org.eclipse.jetty.annotations.ClassA", info.getClassName());
assertEquals("org.eclipse.jetty.ee9.annotations.ClassA", info.getClassName());
}
@Override
public void handle(AnnotationParser.FieldInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
if (annotation == null || !"org.eclipse.jetty.ee9.annotations.Sample".equals(annotation))
return;
assertEquals("m", info.getFieldName());
assertEquals(org.objectweb.asm.Type.OBJECT, org.objectweb.asm.Type.getType(info.getFieldType()).getSort());
@ -129,11 +129,11 @@ public class TestAnnotationParser
@Override
public void handle(AnnotationParser.MethodInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
if (annotation == null || !"org.eclipse.jetty.ee9.annotations.Sample".equals(annotation))
return;
assertEquals("org.eclipse.jetty.annotations.ClassA", info.getClassInfo().getClassName());
assertEquals("org.eclipse.jetty.ee9.annotations.ClassA", info.getClassInfo().getClassName());
assertThat(info.getMethodName(), is(in(methods)));
assertEquals("org.eclipse.jetty.annotations.Sample", annotation);
assertEquals("org.eclipse.jetty.ee9.annotations.Sample", annotation);
}
}
@ -147,7 +147,7 @@ public class TestAnnotationParser
@Test
public void testMultiAnnotation() throws Exception
{
String[] classNames = new String[]{"org.eclipse.jetty.annotations.ClassB"};
String[] classNames = new String[]{"org.eclipse.jetty.ee9.annotations.ClassB"};
AnnotationParser parser = new AnnotationParser();
class MultiAnnotationHandler extends AnnotationParser.AbstractHandler
@ -155,24 +155,24 @@ public class TestAnnotationParser
@Override
public void handle(AnnotationParser.ClassInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Multi".equals(annotation))
if (annotation == null || !"org.eclipse.jetty.ee9.annotations.Multi".equals(annotation))
return;
assertTrue("org.eclipse.jetty.annotations.ClassB".equals(info.getClassName()));
assertTrue("org.eclipse.jetty.ee9.annotations.ClassB".equals(info.getClassName()));
}
@Override
public void handle(AnnotationParser.FieldInfo info, String annotation)
{
assertTrue(annotation == null || !"org.eclipse.jetty.annotations.Multi".equals(annotation),
assertTrue(annotation == null || !"org.eclipse.jetty.ee9.annotations.Multi".equals(annotation),
"There should not be any");
}
@Override
public void handle(AnnotationParser.MethodInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Multi".equals(annotation))
if (annotation == null || !"org.eclipse.jetty.ee9.annotations.Multi".equals(annotation))
return;
assertTrue("org.eclipse.jetty.annotations.ClassB".equals(info.getClassInfo().getClassName()));
assertTrue("org.eclipse.jetty.ee9.annotations.ClassB".equals(info.getClassInfo().getClassName()));
assertTrue("a".equals(info.getMethodName()));
}
}

2
jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestSecurityAnnotationConversions.java
View File

@ -27,8 +27,8 @@ import org.eclipse.jetty.ee9.security.ConstraintMapping;
import org.eclipse.jetty.ee9.security.ConstraintSecurityHandler;
import org.eclipse.jetty.ee9.servlet.ServletHolder;
import org.eclipse.jetty.ee9.servlet.ServletMapping;
import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.ee9.webapp.WebAppContext;
import org.eclipse.jetty.util.security.Constraint;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;

12
jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestServletAnnotations.java
View File

@ -62,7 +62,7 @@ public class TestServletAnnotations
public void testServletAnnotation() throws Exception
{
List<String> classes = new ArrayList<String>();
classes.add("org.eclipse.jetty.annotations.ServletC");
classes.add("org.eclipse.jetty.ee9.annotations.ServletC");
AnnotationParser parser = new AnnotationParser();
WebAppContext wac = new WebAppContext();
@ -115,7 +115,7 @@ public class TestServletAnnotations
m.setFromDefaultDescriptor(true); //this mapping will be from a default descriptor
wac.getServletHandler().addServletMapping(m);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.ee9.annotations.ServletD", null);
annotation.apply();
//test that as the original servlet mapping had only 1 pathspec, then the whole
@ -154,7 +154,7 @@ public class TestServletAnnotations
m2.setFromDefaultDescriptor(true); //this mapping will be from a default descriptor
wac.getServletHandler().addServletMapping(m2);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.ee9.annotations.ServletD", null);
annotation.apply();
//test that only the mapping for "/" was removed from the mappings to the default servlet
@ -197,7 +197,7 @@ public class TestServletAnnotations
m.setServletName("foo");
wac.getServletHandler().addServletMapping(m);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.ee9.annotations.ServletD", null);
annotation.apply();
ServletMapping[] resultMappings = wac.getServletHandler().getServletMappings();
@ -239,7 +239,7 @@ public class TestServletAnnotations
m2.setServletName("DServlet");
wac.getServletHandler().addServletMapping(m2);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.ee9.annotations.ServletD", null);
annotation.apply();
ServletMapping[] resultMappings = wac.getServletHandler().getServletMappings();
@ -263,7 +263,7 @@ public class TestServletAnnotations
servlet.setName("foo");
wac.getServletHandler().addServlet(servlet);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.ee9.annotations.ServletD", null);
annotation.apply();
ServletMapping[] resultMappings = wac.getServletHandler().getServletMappings();

16
jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/resources/TestResourceAnnotations.java
View File

@ -80,20 +80,20 @@ public class TestResourceAnnotations
//processing classA should give us these jndi name bindings:
// java:comp/env/myf
// java:comp/env/org.eclipse.jetty.annotations.resources.ResourceA/g
// java:comp/env/org.eclipse.jetty.ee9.annotations.resources.ResourceA/g
// java:comp/env/mye
// java:comp/env/org.eclipse.jetty.annotations.resources.ResourceA/h
// java:comp/env/org.eclipse.jetty.ee9.annotations.resources.ResourceA/h
// java:comp/env/resA
// java:comp/env/org.eclipse.jetty.annotations.resources.ResourceB/f
// java:comp/env/org.eclipse.jetty.annotations.resources.ResourceA/n
// java:comp/env/org.eclipse.jetty.ee9.annotations.resources.ResourceB/f
// java:comp/env/org.eclipse.jetty.ee9.annotations.resources.ResourceA/n
//
assertEquals(objB, env.lookup("myf"));
assertEquals(objA, env.lookup("mye"));
assertEquals(objA, env.lookup("resA"));
assertEquals(objA, env.lookup("org.eclipse.jetty.annotations.resources.ResourceA/g"));
assertEquals(objA, env.lookup("org.eclipse.jetty.annotations.resources.ResourceA/h"));
assertEquals(objB, env.lookup("org.eclipse.jetty.annotations.resources.ResourceB/f"));
assertEquals(objB, env.lookup("org.eclipse.jetty.annotations.resources.ResourceA/n"));
assertEquals(objA, env.lookup("org.eclipse.jetty.ee9.annotations.resources.ResourceA/g"));
assertEquals(objA, env.lookup("org.eclipse.jetty.ee9.annotations.resources.ResourceA/h"));
assertEquals(objB, env.lookup("org.eclipse.jetty.ee9.annotations.resources.ResourceB/f"));
assertEquals(objB, env.lookup("org.eclipse.jetty.ee9.annotations.resources.ResourceA/n"));
//we should have Injections
assertNotNull(injections);

2
jetty-ee9/jetty-ee9-annotations/src/test/resources/jetty-logging.properties
View File

@ -1,3 +1,3 @@
# Jetty Logging using jetty-slf4j-impl
#org.eclipse.jetty.LEVEL=DEBUG
#org.eclipse.jetty.annotations.LEVEL=DEBUG
#org.eclipse.jetty.ee9.annotations.LEVEL=DEBUG

2
jetty-ee9/jetty-ee9-plus/src/main/java/module-info.java
View File

@ -19,7 +19,7 @@ module org.eclipse.jetty.ee9.plus
requires org.eclipse.jetty.jndi;
requires org.slf4j;
requires transitive org.eclipse.jetty.webapp;
requires transitive org.eclipse.jetty.ee9.webapp;
// Only required if using DataSourceLoginService.
requires static java.sql;

2
jetty-ee9/jetty-ee9-plus/src/main/java/org/eclipse/jetty/ee9/plus/annotation/Injection.java
View File

@ -201,7 +201,7 @@ public class Injection
catch (Exception e)
{
LOG.warn("Unable to inject field {} with {}", field, injectable, e);
throw new IllegalStateException("Inject failed for field " + field.getName());
throw new IllegalStateException("Inject failed for field " + field.getName(), e);
}
}

2
jetty-ee9/jetty-ee9-plus/src/test/java/org/eclipse/jetty/ee9/plus/annotation/LifeCycleCallbackCollectionTest.java
View File

@ -21,6 +21,7 @@ import org.eclipse.jetty.ee9.webapp.WebAppContext;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
@ -170,6 +171,7 @@ public class LifeCycleCallbackCollectionTest
}
@Test
@Disabled // TODO
public void testServletPostConstructPreDestroy() throws Exception
{
Server server = new Server();

2
jetty-ee9/jetty-ee9-plus/src/test/java/org/eclipse/jetty/ee9/plus/webapp/PlusDescriptorProcessorTest.java
View File

@ -35,6 +35,7 @@ import org.eclipse.jetty.jndi.NamingUtil;
import org.eclipse.jetty.util.IntrospectionUtil;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
@ -241,6 +242,7 @@ public class PlusDescriptorProcessorTest
}
@Test
@Disabled // TODO
public void testEnvEntries() throws Exception
{
ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();

2
jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/WebAppContext.java
View File

@ -152,7 +152,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
static final Logger LOG = LoggerFactory.getLogger(WebAppContext.class);
public static final String TEMPDIR = ServletContext.TEMPDIR;
public static final String BASETEMPDIR = "org.eclipse.jetty.ee9.webapp.basetempdir";
public static final String BASETEMPDIR = Server.BASE_TEMP_DIR_ATTR;
public static final String WEB_DEFAULTS_XML = "org/eclipse/jetty/ee9/webapp/webdefault.xml";
public static final String ERROR_PAGE = "org.eclipse.jetty.server.error_page";
public static final String SERVER_SYS_CLASSES = "org.eclipse.jetty.ee9.webapp.systemClasses";

4
jetty-ee9/pom.xml
View File

@ -52,7 +52,7 @@
<!-- <module>jetty-ee9-demos</module>-->
<!-- <module>jetty-ee9-apache-jsp</module>-->
<!-- <module>jetty-ee9-glassfish-jstl</module>-->
<!-- <module>jetty-ee9-annotations</module>-->
<module>jetty-ee9-annotations</module>
<!-- <module>jetty-ee9-ant</module>-->
<!-- <module>jetty-ee9-cdi</module>-->
<!-- <module>jetty-ee9-fcgi-server-proxy</module>-->
@ -63,7 +63,7 @@
<!-- <module>jetty-ee9-maven-plugin</module>-->
<!-- <module>jetty-ee9-openid</module>-->
<!-- <module>jetty-ee9-osgi</module>-->
<!-- <module>jetty-ee9-plus</module>-->
<module>jetty-ee9-plus</module>
<!-- <module>jetty-ee9-proxy</module>-->
<!-- <module>jetty-ee9-quickstart</module>-->
<!-- <module>jetty-ee9-runner</module>-->

215
jetty-home/pom.xml
View File

@ -631,22 +631,22 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.authentication</groupId>
<artifactId>jakarta.authentication-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>jakarta.mail</groupId>-->
<!-- <artifactId>jakarta.mail-api</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>jakarta.annotation</groupId>-->
<!-- <artifactId>jakarta.annotation-api</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>jakarta.authentication</groupId>-->
<!-- <artifactId>jakarta.authentication-api</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>jakarta.transaction</groupId>-->
<!-- <artifactId>jakarta.transaction-api</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.ow2.asm</groupId>
@ -686,10 +686,10 @@
<version>${project.version}</version>
</dependency>
<!-- ee9 specific dependencies -->
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-quickstart</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
<!-- <artifactId>jetty-ee9-quickstart</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-servlet</artifactId>
@ -711,56 +711,59 @@
<!-- <groupId>org.eclipse.jetty.ee9.websocket</groupId>-->
<!-- <artifactId>jetty-ee9-websocket-jakarta-server</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-glassfish-jstl</artifactId>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
<!-- <artifactId>jetty-ee9-apache-jsp</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
<!-- <artifactId>jetty-ee9-glassfish-jstl</artifactId>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>javax.el</groupId>-->
<!-- <artifactId>el-api</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>jakarta.el</groupId>-->
<!-- <artifactId>jakarta.el-api</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-plus</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-proxy</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-cdi</artifactId>
<optional>true</optional>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
<!-- <artifactId>jetty-ee9-proxy</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
<!-- <artifactId>jetty-ee9-cdi</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-jaas</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-openid</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-jaspi</artifactId>
<optional>true</optional>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
<!-- <artifactId>jetty-ee9-openid</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
<!-- <artifactId>jetty-ee9-jaspi</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- ee10 specific dependencies -->
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
@ -879,55 +882,55 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-embedded</artifactId>
<version>${project.version}</version>
<type>pom</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-embedded-query</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-remote</artifactId>
<version>${project.version}</version>
<type>pom</type>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.wildfly.common</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-remote-query</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-hazelcast</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.gcloud</groupId>
<artifactId>jetty-gcloud-session-manager</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.memcached</groupId>
<artifactId>jetty-memcached-sessions</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-nosql</artifactId>
<optional>true</optional>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty</groupId>-->
<!-- <artifactId>infinispan-embedded</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <type>pom</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty</groupId>-->
<!-- <artifactId>infinispan-embedded-query</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty</groupId>-->
<!-- <artifactId>infinispan-remote</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <type>pom</type>-->
<!-- <optional>true</optional>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.wildfly.common</groupId>-->
<!-- <artifactId>*</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty</groupId>-->
<!-- <artifactId>infinispan-remote-query</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty</groupId>-->
<!-- <artifactId>jetty-hazelcast</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.gcloud</groupId>-->
<!-- <artifactId>jetty-gcloud-session-manager</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.memcached</groupId>-->
<!-- <artifactId>jetty-memcached-sessions</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty</groupId>-->
<!-- <artifactId>jetty-nosql</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-keystore</artifactId>

4
pom.xml
View File

@ -171,8 +171,8 @@
<module>jetty-core</module>
<module>jetty-ee9</module>
<module>jetty-ee10</module>
<module>jetty-home</module>
<!-- <module>jetty-integrations</module>-->
<module>jetty-integrations</module>
<!-- <module>jetty-home</module>-->
<!-- <module>jetty-p2</module>-->
<module>tests</module>
</modules>