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

Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-websocket

This commit is contained in:
Lachlan Roberts 2022-06-24 12:48:30 +10:00
parent 54358b94e2 83f6b80afb
commit 6ce10d67f7
9 changed files with 55 additions and 879 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
jetty-ee10/jetty-ee10-home/pom.xml
View File

@ -101,14 +101,7 @@
<artifactItem>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>6.0.0</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>5.0.2</version>
<version>${jakarta.servlet.api.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
@ -125,8 +118,7 @@
<artifactItem>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>6.0.0</version>
<version>${jakarta.servlet.api.version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
@ -141,30 +133,11 @@
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee10-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-annotations-deps-jakarta-annotation</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${assembly-directory}/lib/ee10-annotations</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-ee10-annotations-src-deps</id>
<phase>generate-resources</phase>
@ -173,63 +146,24 @@
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee10-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-annotations-src-deps-jakarta-annotation</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${source-assembly-directory}/lib/ee10-annotations</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-ee10-jsp-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.30.0</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
<includeArtifactIds>apache-el,apache-jsp,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
</configuration>
</execution>
@ -237,30 +171,13 @@
<id>copy-ee10-jsp-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-SNAPSHOT</version>
</artifactItem>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-SNAPSHOT</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.30.0</version>
</artifactItem>
</artifactItems>
<includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
<includeArtifactIds>apache-el,apache-jsp,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
</configuration>
</execution>
@ -268,26 +185,14 @@
<id>copy-ee10-jstl-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee10-glassfish-jstl</outputDirectory>
</configuration>
</execution>
@ -295,24 +200,13 @@
<id>copy-ee10-jstl-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
</artifactItem>
<artifactItem>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
</artifactItem>
</artifactItems>
<includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee10-glassfish-jstl</outputDirectory>
</configuration>
</execution>
@ -602,4 +496,4 @@
</dependency>
</dependencies>
</project>
</project>

29
jetty-ee10/jetty-ee10-plus/src/main/config/etc/jetty-ee10-plus.xml
View File

@ -1,29 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- =============================================================== -->
<!-- Configure extended support for webapps -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Add plus Configuring classes to all webapps for this Server -->
<!-- =========================================================== -->
<Call class="org.eclipse.jetty.ee10.webapp.Configurations" name="setServerDefault">
<Arg><Ref refid="Server" /></Arg>
<Call name="add">
<Arg>
<Array type="String">
<Item>org.eclipse.jetty.ee10.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.ee10.plus.webapp.PlusConfiguration</Item>
</Array>
</Arg>
</Call>
</Call>
<Call name="addBean">
<Arg><New class="org.eclipse.jetty.ee10.plus.jndi.NamingDump"/></Arg>
</Call>
</Configure>

3
jetty-ee10/pom.xml
View File

@ -19,8 +19,7 @@
<javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
<jakarta.activation.api.version>2.1.0</jakarta.activation.api.version>
<!-- when changing annotation api version you must change in jetty-home with id <id>copy-ee10-annotations-deps-jakarta-annotation</id> -->
<jakarta.annotation.api.version>2.1.0</jakarta.annotation.api.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
<jakarta.authentication.api.version>3.0.0</jakarta.authentication.api.version>
<jakarta.el.api.version>5.0.0</jakarta.el.api.version>
<jakarta.enterprise.cdi.api.version>4.0.1</jakarta.enterprise.cdi.api.version>

160
jetty-ee9/jetty-ee9-home/pom.xml
View File

@ -98,17 +98,10 @@
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>6.0.0</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>5.0.2</version>
<version>${jetty.servlet.api.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
@ -125,8 +118,7 @@
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>5.0.2</version>
<version>${jetty.servlet.api.version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
@ -141,30 +133,11 @@
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee9-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-annotations-deps-jakarta-annotation</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${assembly-directory}/lib/ee9-annotations</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-ee9-annotations-src-deps</id>
<phase>generate-resources</phase>
@ -173,63 +146,24 @@
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee9-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-annotations-src-deps-jakarta-annotation</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${source-assembly-directory}/lib/ee9-annotations</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-ee9-jsp-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.30.0</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
<includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee9-apache-jsp</outputDirectory>
</configuration>
</execution>
@ -237,30 +171,13 @@
<id>copy-ee9-jsp-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-SNAPSHOT</version>
</artifactItem>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-SNAPSHOT</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.30.0</version>
</artifactItem>
</artifactItems>
<includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
<includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee9-apache-jsp</outputDirectory>
</configuration>
</execution>
@ -268,26 +185,14 @@
<id>copy-ee9-jstl-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee9-glassfish-jstl</outputDirectory>
</configuration>
</execution>
@ -295,24 +200,13 @@
<id>copy-ee9-jstl-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
</artifactItem>
<artifactItem>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
</artifactItem>
</artifactItems>
<includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee9-glassfish-jstl</outputDirectory>
</configuration>
</execution>
@ -443,10 +337,10 @@
</dependency>
<!-- <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>
@ -602,4 +496,4 @@
</dependency>
</dependencies>
</project>
</project>

29
jetty-ee9/jetty-ee9-plus/src/main/config/etc/jetty-plus.xml
View File

@ -1,29 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- =============================================================== -->
<!-- Configure extended support for webapps -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Add plus Configuring classes to all webapps for this Server -->
<!-- =========================================================== -->
<Call class="org.eclipse.jetty.ee9.webapp.Configurations" name="setServerDefault">
<Arg><Ref refid="Server" /></Arg>
<Call name="add">
<Arg>
<Array type="String">
<Item>org.eclipse.jetty.ee9.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.ee9.plus.webapp.PlusConfiguration</Item>
</Array>
</Arg>
</Call>
</Call>
<Call name="addBean">
<Arg><New class="org.eclipse.jetty.ee9.plus.jndi.NamingDump"/></Arg>
</Call>
</Configure>

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

@ -171,7 +171,6 @@ public class LifeCycleCallbackCollectionTest
}
@Test
@Disabled // TODO
public void testServletPostConstructPreDestroy() throws Exception
{
Server server = new Server();

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

@ -128,7 +128,7 @@ public class PlusDescriptorProcessorTest
context.setConfigurations(new Configuration[]{new PlusConfiguration(), new EnvConfiguration()});
context.preConfigure();
context.setClassLoader(new WebAppClassLoader(Thread.currentThread().getContextClassLoader(), context));
context.getServerClassMatcher().exclude("org.eclipse.jetty.plus.webapp."); //need visbility of the TestInjections class
context.getServerClassMatcher().exclude("org.eclipse.jetty.ee9.plus.webapp."); //need visbility of the TestInjections class
ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(context.getClassLoader());
Context icontext = new InitialContext();
@ -242,7 +242,6 @@ public class PlusDescriptorProcessorTest
}
@Test
@Disabled // TODO
public void testEnvEntries() throws Exception
{
ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();

10
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/proxy/WebSocketProxy.java
View File

@ -29,16 +29,6 @@ import org.eclipse.jetty.ee9.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.ee9.websocket.client.WebSocketClient;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.WebSocketConnectionListener;
import org.eclipse.jetty.websocket.api.WebSocketPartialListener;
import org.eclipse.jetty.websocket.api.WebSocketPingPongListener;
import org.eclipse.jetty.websocket.api.exceptions.WebSocketException;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

547
jetty-home/pom.xml
View File

@ -131,7 +131,7 @@
<configuration>
<includeGroupIds>jakarta.transaction,org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>
org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.ee9.websocket,org.eclipse.jetty.websocket,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.ee9,org.eclipse.jetty.ee10,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
</excludeGroupIds>
<excludeArtifactIds>
apache-jsp,glassfish-jstl,jetty-start,jetty-slf4j-impl
@ -149,7 +149,7 @@
<configuration>
<includeGroupIds>jakarta.transaction,org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>
org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.ee9,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
</excludeGroupIds>
<excludeArtifactIds>
apache-jsp,glassfish-jstl,jetty-start
@ -186,106 +186,6 @@
<outputDirectory>${source-assembly-directory}/lib/logging</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-ee10-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee10.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee10-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-ee10-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee10.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee10-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-lib-jakarta-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee10-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-lib-jakarta-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee10-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-servlet-api-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>6.0.0</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>5.0.2</version>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-servlet-api-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>6.0.0</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>5.0.2</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-http2-deps</id>
<phase>generate-resources</phase>
@ -365,301 +265,6 @@
<outputDirectory>${source-assembly-directory}/lib/fcgi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-annotations-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee10-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-annotations-deps-jakarta-annotation</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${assembly-directory}/lib/ee10-annotations</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-ee10-annotations-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee10-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-annotations-src-deps-jakarta-annotation</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${source-assembly-directory}/lib/ee10-annotations</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-ee9-annotations-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee9-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-annotations-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee9-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-jsp-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-M16</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-M16</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.30.0</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<outputDirectory>${source-assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-jsp-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-M16</version>
</artifactItem>
<artifactItem>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>10.1.0-M16</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.30.0</version>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-jstl-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<outputDirectory>${source-assembly-directory}/lib/ee10-glassfish-jstl</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-jstl-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<artifactItems>
<artifactItem>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
</artifactItem>
<artifactItem>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>3.0.0</version>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}/lib/ee10-glassfish-jstl</outputDirectory>
</configuration>
</execution>
<!-- TODO: add copy deps for ee9 apache-jsp and jstl -->
<execution>
<id>copy-ee10-jaspi-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.authentication</includeGroupIds>
<includeArtifactIds>jakarta.authentication-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee10-jaspi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-jaspi-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.authentication</includeGroupIds>
<includeArtifactIds>jakarta.authentication-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee10-jaspi</outputDirectory>
</configuration>
</execution>
<!-- TODO: ee9 jaspi -->
<execution>
<id>copy-ee9-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee9</includeGroupIds>
<excludeGroupIds>org.eclipse.jetty.ee9.demos</excludeGroupIds>
<!-- <includeArtifactIds></includeArtifactIds>-->
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee9</includeGroupIds>
<!-- <includeArtifactIds></includeArtifactIds>-->
<excludeGroupIds>org.eclipse.jetty.ee9.demos</excludeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee10</includeGroupIds>
<excludeArtifactIds>websocket-core-client,websocket-core-common,websocket-core-server</excludeArtifactIds>
<excludeGroupIds>org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket</excludeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee10-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee10</includeGroupIds>
<includeTypes>jar</includeTypes>
<excludeGroupIds>org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket</excludeGroupIds>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>unpack-eeX-home</id>
<phase>generate-resources</phase>
@ -896,64 +501,7 @@
<classifier>shaded</classifier>
<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-servlet</artifactId>
</dependency>
<!-- not ready yet -->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9.websocket</groupId>-->
<!-- <artifactId>jetty-ee9-websocket-servlet</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9.websocket</groupId>-->
<!-- <artifactId>jetty-ee9-websocket-jetty-server</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9.websocket</groupId>-->
<!-- <artifactId>jetty-ee9-websocket-jetty-client</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <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-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.ee10</groupId>
<artifactId>jetty-ee10-home</artifactId>
@ -967,95 +515,6 @@
<type>zip</type>
</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>
<artifactId>jetty-ee10-quickstart</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlets</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-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.ee10</groupId>
<artifactId>jetty-ee10-plus</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-proxy</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-cdi</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jaas</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-openid</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jaspi</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>