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

Jetty 12.0.x update jakarta api versions (#8192) 

* update to latest jakarta official releases
This commit is contained in:
Jan Bartel 2022-06-22 10:32:54 +10:00 committed by GitHub
parent 3a2a647b08
commit 9893c81abf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
83 changed files with 2094 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-ee10/jetty-ee10-annotations/pom.xml
View File

@ -68,8 +68,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>

4
jetty-ee10/jetty-ee10-apache-jsp/pom.xml
View File

@ -81,8 +81,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

2
jetty-ee10/jetty-ee10-apache-jsp/src/main/java/module-info.java
View File

@ -14,7 +14,7 @@
module org.eclipse.jetty.ee10.apache.jsp
{
requires java.xml;
requires jetty.servlet.api;
requires jakarta.servlet;
requires org.eclipse.jetty.util;
requires org.mortbay.apache.jasper;
requires org.slf4j;

1
jetty-ee10/jetty-ee10-apache-jsp/src/test/java/org/eclipse/jetty/ee10/jsp/TestJettyJspServlet.java
View File

@ -92,7 +92,6 @@ public class TestJettyJspServlet
@Test
public void testWithJsp() throws Exception
{
//TODO this test is producing an IllegalStateException in ServletHolder.init
//test that an ordinary jsp is served by jsp servlet
String request =
"GET /context/foo.jsp HTTP/1.1\r\n" +

29
jetty-ee10/jetty-ee10-bom/pom.xml
View File

@ -50,7 +50,8 @@
<dependencyManagement>
<dependencies>
<dependency>
<!-- FIXME to review it is not sure to work -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>12.0.0-SNAPSHOT</version>
@ -88,18 +89,6 @@
<artifactId>jetty-ee10-jaspi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jspc-maven-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<!-- TODO
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
<version>${project.version}</version>
</dependency>
-->
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-openid</artifactId>
@ -175,15 +164,11 @@
<artifactId>jetty-ee10-websocket-servlet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>test-ee10-sessions-common</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Jakarta EE10 Dependencies -->
<!-- FIXME to review it is not sure to be a good idea to have this in the bom -->
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jetty.servlet.api.version}</version>
</dependency>
<dependency>
@ -202,8 +187,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>${jakarta.websocket.api.version}</version>
</dependency>
</dependencies>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml
View File

@ -24,8 +24,8 @@
<artifactId>jetty-util-ajax</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml
View File

@ -25,8 +25,8 @@
<artifactId>jetty-ee10-demo-async-rest-jar</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

13
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml
View File

@ -131,8 +131,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
@ -177,8 +177,13 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml
View File

@ -90,8 +90,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml
View File

@ -67,8 +67,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml
View File

@ -39,8 +39,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml
View File

@ -39,8 +39,8 @@
<artifactId>jetty-ee10-proxy</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml
View File

@ -33,8 +33,8 @@
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml
View File

@ -190,8 +190,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml
View File

@ -17,8 +17,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
</project>

2
jetty-ee10/jetty-ee10-glassfish-jstl/src/test/java/org/eclipse/jetty/ee10/jstl/JstlTest.java
View File

@ -31,7 +31,6 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.IO;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
@ -39,7 +38,6 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
@Disabled //Need jsp version fix to re-enable
public class JstlTest
{
private static Server server;

605
jetty-ee10/jetty-ee10-home/pom.xml Normal file
View File

@ -0,0 +1,605 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10</artifactId>
<version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ee10-home</artifactId>
<name>EE10 :: Jetty :: Home Assembly</name>
<packaging>pom</packaging>
<properties>
<assembly-directory>${basedir}/target/jetty-ee10-home</assembly-directory>
<source-assembly-directory>${basedir}/target/jetty-ee10-home-sources</source-assembly-directory>
<spotbugs.skip>true</spotbugs.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-config-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>
org.eclipse.jetty.ee10, org.eclipse.jetty.ee10.demos
</includeGroupIds>
<excludeArtifactIds></excludeArtifactIds>
<classifier>config</classifier>
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
<excludes>META-INF/**,webapps/**,start.d/**,start.ini</excludes>
<outputDirectory>${assembly-directory}</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>
</artifactItems>
<outputDirectory>${source-assembly-directory}/lib</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-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-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>
<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-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>
<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>
<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>
<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>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>binary</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/jetty-source-assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
</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>
<!-- Demo EE10 Apps -->
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-mock-resources</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-jetty-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-jaas-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-jndi-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-spec-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-async-rest-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-proxy-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-simple-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-jsp-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
</dependencies>
</project>

20
jetty-ee10/jetty-ee10-home/src/main/assembly/jetty-assembly.xml Normal file
View File

@ -0,0 +1,20 @@
<assembly>
<id>binary-assembly</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${assembly-directory}</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>**/META-INF/**</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>

17
jetty-ee10/jetty-ee10-home/src/main/assembly/jetty-source-assembly.xml Normal file
View File

@ -0,0 +1,17 @@
<assembly>
<id>sources</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${source-assembly-directory}</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
</assembly>

4
jetty-ee10/jetty-ee10-jaspi/pom.xml
View File

@ -40,8 +40,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>

2
jetty-ee10/jetty-ee10-jaspi/src/main/java/module-info.java
View File

@ -13,7 +13,7 @@
module org.eclipse.jetty.ee10.security.jaspi
{
requires jetty.servlet.api;
requires jakarta.servlet;
requires org.slf4j;
requires transitive jakarta.security.auth.message;

15
jetty-ee10/jetty-ee10-jaspi/src/main/java/org/eclipse/jetty/ee10/security/jaspi/DefaultAuthConfigFactory.java
View File

@ -22,6 +22,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import jakarta.security.auth.message.config.AuthConfigFactory;
import jakarta.security.auth.message.config.AuthConfigProvider;
import jakarta.security.auth.message.config.RegistrationListener;
import jakarta.security.auth.message.module.ServerAuthModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -102,6 +103,20 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
return true;
}
@Override
public String registerServerAuthModule(ServerAuthModule serverAuthModule, Object context)
{
// TODO
throw new UnsupportedOperationException();
}
@Override
public void removeServerAuthModule(Object context)
{
// TODO
throw new UnsupportedOperationException();
}
@Override
public String[] detachListener(RegistrationListener listener, String layer, String appContext)
{

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/it-parent-pom/pom.xml
View File

@ -20,8 +20,8 @@
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>@jetty.servlet.api.version@</version>
<scope>provided</scope>
</dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-cdi-start-forked/pom.xml
View File

@ -20,8 +20,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/pom.xml
View File

@ -21,8 +21,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyLibrary/pom.xml
View File

@ -13,8 +13,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/pom.xml
View File

@ -18,8 +18,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-base/pom.xml
View File

@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/pom.xml
View File

@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-gwt-it/beer-server/pom.xml
View File

@ -27,8 +27,8 @@
<artifactId>gwt-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml
View File

@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/pom.xml
View File

@ -15,8 +15,8 @@
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>@jetty.servlet.api.version@</version>
<scope>provided</scope>
</dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-base/pom.xml
View File

@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-base/pom.xml
View File

@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml
View File

@ -33,8 +33,8 @@
</dependency>
<!-- Servlet Deps -->
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<!-- JSP Deps -->
<dependency>

4
jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-context/pom.xml
View File

@ -17,8 +17,8 @@
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>

4
jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml
View File

@ -82,8 +82,8 @@
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

8
jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml
View File

@ -186,8 +186,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
@ -335,8 +335,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>

5
jetty-ee10/jetty-ee10-plus/pom.xml
View File

@ -41,6 +41,11 @@
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>

4
jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod
View File

@ -1,5 +1,5 @@
[description]
Enables Servlet 3.1 resource injection.
Enables Servlet resource injection.
[environment]
ee10
@ -12,4 +12,4 @@ ee10-webapp
[lib]
lib/jetty-ee10-plus-${jetty.version}.jar
lib/jakarta.transaction-api-2.0.0.jar
lib/jakarta.transaction-api-2.0.1.jar

4
jetty-ee10/jetty-ee10-proxy/pom.xml
View File

@ -37,8 +37,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

2
jetty-ee10/jetty-ee10-proxy/src/main/java/module-info.java
View File

@ -13,7 +13,7 @@
module org.eclipse.jetty.ee10.proxy
{
requires jetty.servlet.api;
requires jakarta.servlet;
requires transitive org.eclipse.jetty.client;
requires transitive org.eclipse.jetty.server;
requires transitive org.slf4j;

2
jetty-ee10/jetty-ee10-quickstart/src/main/java/module-info.java
View File

@ -13,7 +13,7 @@
module org.eclipse.jetty.ee10.quickstart
{
requires jetty.servlet.api;
requires jakarta.servlet;
requires org.slf4j;
requires transitive org.eclipse.jetty.ee10.annotations;

4
jetty-ee10/jetty-ee10-servlet/pom.xml
View File

@ -33,8 +33,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

2
jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
View File

@ -11,5 +11,5 @@ server
sessions
[lib]
lib/jetty-jakarta-servlet-api-6.0.0-SNAPSHOT.jar
lib/jakarta.servlet-api-6.0.0.jar
lib/jetty-ee10-servlet-${jetty.version}.jar

2
jetty-ee10/jetty-ee10-servlet/src/main/java/module-info.java
View File

@ -17,7 +17,7 @@ module org.eclipse.jetty.ee10.servlet
{
requires org.slf4j;
requires transitive jetty.servlet.api;
requires transitive jakarta.servlet;
requires transitive org.eclipse.jetty.server;
requires transitive org.eclipse.jetty.session;

6
jetty-ee10/jetty-ee10-servlets/pom.xml
View File

@ -22,7 +22,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-modules jetty.servlet.api --add-modules org.eclipse.jetty.util --add-modules org.eclipse.jetty.io --add-modules org.eclipse.jetty.http --add-modules org.eclipse.jetty.server --add-reads org.eclipse.jetty.servlets=java.management --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx
@{argLine} ${jetty.surefire.argLine} --add-modules jakarta.servlet --add-modules org.eclipse.jetty.util --add-modules org.eclipse.jetty.io --add-modules org.eclipse.jetty.http --add-modules org.eclipse.jetty.server --add-reads org.eclipse.jetty.servlets=java.management --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx
</argLine>
</configuration>
</plugin>
@ -44,8 +44,8 @@
<artifactId>jetty-util</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

2
jetty-ee10/jetty-ee10-servlets/src/main/java/module-info.java
View File

@ -18,7 +18,7 @@ module org.eclipse.jetty.ee10.servlets
{
requires org.slf4j;
requires transitive jetty.servlet.api;
requires transitive jakarta.servlet;
// Only required if using CloseableDoSFilter.
requires static org.eclipse.jetty.io;

8
jetty-ee10/jetty-ee10-tests/test-bad-websocket-webapp/pom.xml
View File

@ -15,8 +15,8 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@ -25,8 +25,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

4
jetty-ee10/jetty-ee10-tests/test-cdi/pom.xml
View File

@ -82,8 +82,8 @@
<artifactId>jetty-test-helper</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

4
jetty-ee10/jetty-ee10-tests/test-http2-webapp/pom.xml
View File

@ -68,8 +68,8 @@
<artifactId>http2-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-tests/test-jmx/jmx-webapp/pom.xml
View File

@ -15,8 +15,8 @@
</properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

13
jetty-ee10/jetty-ee10-tests/test-websocket-client-provided-webapp/pom.xml
View File

@ -23,13 +23,18 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

13
jetty-ee10/jetty-ee10-tests/test-websocket-client-webapp/pom.xml
View File

@ -23,13 +23,18 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

8
jetty-ee10/jetty-ee10-tests/test-websocket-webapp/pom.xml
View File

@ -23,8 +23,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@ -33,8 +33,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

12
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml
View File

@ -16,8 +16,12 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
@ -32,8 +36,8 @@
<artifactId>jetty-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>

4
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/src/main/java/module-info.java
View File

@ -17,10 +17,10 @@ module org.eclipse.jetty.ee10.websocket.jakarta.client
requires org.eclipse.jetty.ee10.websocket.jakarta.common;
requires org.slf4j;
requires transitive jetty.websocket.api;
requires transitive jakarta.websocket;
requires transitive org.eclipse.jetty.client;
requires static jetty.servlet.api;
requires static jakarta.servlet;
exports org.eclipse.jetty.ee10.websocket.jakarta.client;

12
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml
View File

@ -41,8 +41,16 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>

2
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/main/java/module-info.java
View File

@ -15,7 +15,7 @@ module org.eclipse.jetty.ee10.websocket.jakarta.common
{
requires org.slf4j;
requires transitive jetty.websocket.api;
requires transitive jakarta.websocket;
requires transitive org.eclipse.jetty.websocket.core.client;
exports org.eclipse.jetty.ee10.websocket.jakarta.common;

7
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/common/ClientEndpointConfigWrapper.java
View File

@ -14,6 +14,7 @@
package org.eclipse.jetty.ee10.websocket.jakarta.common;
import java.util.List;
import javax.net.ssl.SSLContext;
import jakarta.websocket.ClientEndpointConfig;
import jakarta.websocket.Extension;
@ -54,4 +55,10 @@ public class ClientEndpointConfigWrapper extends EndpointConfigWrapper implement
{
return _endpointConfig.getConfigurator();
}
@Override
public SSLContext getSSLContext()
{
return _endpointConfig.getSSLContext();
}
}

4
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml
View File

@ -28,8 +28,8 @@
<artifactId>jetty-ee10-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

17
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
View File

@ -12,14 +12,15 @@ client
ee10-annotations
[lib]
lib/websocket-core-common-${jetty.version}.jar
lib/websocket-core-client-${jetty.version}.jar
lib/websocket-core-server-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
lib/websocket/jetty-jakarta-websocket-api-2.0.0.jar
lib/websocket/jetty-ee10-websocket-jakarta-client-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-jakarta-common-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-jakarta-server-${jetty.version}.jar
lib/ee10-websocket/websocket-core-common-${jetty.version}.jar
lib/ee10-websocket/websocket-core-client-${jetty.version}.jar
lib/ee10-websocket/websocket-core-server-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
lib/ee10-websocket/jakarta.websocket-client-api-2.1.0.jar
lib/ee10-websocket/jakarta.websocket-api-2.1.0.jar
lib/ee10-websocket/jetty-ee10-websocket-jakarta-client-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jakarta-common-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jakarta-server-${jetty.version}.jar
[jpms]
# The implementation needs to access method handles in

4
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml
View File

@ -32,8 +32,8 @@
<artifactId>jetty-http-tools</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

10
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod
View File

@ -14,11 +14,11 @@ client
ee10-annotations
[lib]
lib/jetty-websocket-core-common-${jetty.version}.jar
lib/jetty-websocket-core-client-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-jetty-api-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-jetty-common-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-jetty-client-${jetty.version}.jar
lib/ee10-websocket/jetty-websocket-core-common-${jetty.version}.jar
lib/ee10-websocket/jetty-websocket-core-client-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jetty-api-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jetty-common-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jetty-client-${jetty.version}.jar
[jpms]
# The implementation needs to access method handles in

4
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml
View File

@ -28,8 +28,8 @@
<artifactId>jetty-ee10-websocket-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>

12
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/ee10-websocket-jetty.mod
View File

@ -11,12 +11,12 @@ ee10
ee10-annotations
[lib]
lib/websocket/jetty-ee10-websocket-core-common-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-core-server-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-jetty-api-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-jetty-common-${jetty.version}.jar
lib/websocket/jetty-ee10-websocket-jetty-server-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-core-common-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-core-server-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jetty-api-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jetty-common-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jetty-server-${jetty.version}.jar
[jpms]
# The implementation needs to access method handles in

2
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/module-info.java
View File

@ -13,7 +13,7 @@
module org.eclipse.jetty.ee10.websocket.jetty.server
{
requires jetty.servlet.api;
requires jakarta.servlet;
requires org.eclipse.jetty.websocket.core.server;
requires org.eclipse.jetty.ee10.websocket.jetty.common;
requires org.eclipse.jetty.ee10.websocket.servlet;

81
jetty-ee10/pom.xml
View File

@ -13,34 +13,32 @@
<packaging>pom</packaging>
<properties>
<!-- FIXME we need a separate property for this one -->
<jetty.servlet.api.version>6.0.0-SNAPSHOT</jetty.servlet.api.version>
<!-- TODO: Remove these javax.* entries? -->
<javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version>
<javax.security.auth.message.version>1.0.0.v201108011116</javax.security.auth.message.version>
<javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
<jakarta.activation.api.version>2.0.1</jakarta.activation.api.version>
<jakarta.annotation.api.version>2.0.0</jakarta.annotation.api.version>
<jakarta.authentication.api.version>2.0.0</jakarta.authentication.api.version>
<jakarta.el.api.version>4.0.0</jakarta.el.api.version>
<jakarta.enterprise.cdi.api.version>3.0.0</jakarta.enterprise.cdi.api.version>
<jakarta.inject.api.version>2.0.0</jakarta.inject.api.version>
<jakarta.interceptor.api.version>2.0.0</jakarta.interceptor.api.version>
<jakarta.mail.api.version>2.0.1</jakarta.mail.api.version>
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
<jakarta.servlet.api.version>5.0.0</jakarta.servlet.api.version>
<jakarta.servlet.jsp.api.version>3.0.0</jakarta.servlet.jsp.api.version>
<jakarta.servlet.jsp.jstl.api.version>2.0.0</jakarta.servlet.jsp.jstl.api.version>
<jakarta.servlet.jsp.jstl.impl.version>2.0.0</jakarta.servlet.jsp.jstl.impl.version> <!-- TODO: remove? -->
<jakarta.ws.rs.api.version>3.0.0</jakarta.ws.rs.api.version>
<jakarta.xml.bind.api.version>3.0.1</jakarta.xml.bind.api.version>
<jakarta.xml.bind.impl.version>3.0.2</jakarta.xml.bind.impl.version>
<jakarta.xml.ws.api.version>3.0.1</jakarta.xml.ws.api.version>
<jakarta.xml.jaxws.impl.version>3.0.2</jakarta.xml.jaxws.impl.version>
<jakarta.websocket.api.version>2.0.0</jakarta.websocket.api.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.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>
<jakarta.inject.api.version>2.0.1</jakarta.inject.api.version>
<jakarta.interceptor.api.version>2.1.0</jakarta.interceptor.api.version>
<jakarta.mail.api.version>2.1.0</jakarta.mail.api.version>
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
<jakarta.servlet.jsp.api.version>3.1.0</jakarta.servlet.jsp.api.version>
<jakarta.servlet.jsp.jstl.api.version>3.0.0</jakarta.servlet.jsp.jstl.api.version>
<jakarta.servlet.jsp.jstl.impl.version>3.0.0</jakarta.servlet.jsp.jstl.impl.version> <!-- TODO: remove? -->
<jakarta.ws.rs.api.version>3.1.0</jakarta.ws.rs.api.version>
<jakarta.xml.bind.api.version>4.0.0</jakarta.xml.bind.api.version>
<jakarta.xml.bind.impl.version>4.0.0</jakarta.xml.bind.impl.version>
<jakarta.xml.ws.api.version>4.0.0</jakarta.xml.ws.api.version>
<jakarta.xml.jaxws.impl.version>4.0.0-M4</jakarta.xml.jaxws.impl.version>
<jakarta.websocket.api.version>2.1.0</jakarta.websocket.api.version>
<jsp.impl.version>10.1.0-M16</jsp.impl.version>
<sonar.skip>true</sonar.skip>
</properties>
@ -71,6 +69,7 @@
<module>jetty-examples</module>
<module>jetty-ee10-bom</module>
<module>test-ee10-sessions</module>
<module>jetty-ee10-home</module>
</modules>
<dependencyManagement>
@ -260,9 +259,14 @@
</dependency>
<!-- Jakarta EE10 Dependencies -->
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<version>${jetty.servlet.api.version}</version>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<version>${jsp.impl.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<version>${jsp.impl.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
@ -360,23 +364,18 @@
<version>${jakarta.xml.ws.api.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId>
<version>${jakarta.servlet.jsp.jstl.impl.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</exclusion>
</exclusions>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<version>${jakarta.websocket.api.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<version>${jakarta.websocket.api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>${jakarta.websocket.api.version}</version>
</dependency>
<dependency>

5
jetty-ee10/test-ee10-sessions/pom.xml
View File

@ -29,6 +29,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>test-ee10-sessions-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

4
jetty-ee10/test-ee10-sessions/test-ee10-sessions-common/pom.xml
View File

@ -14,8 +14,8 @@
</properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

189
jetty-ee8/jetty-ee8-bom/pom.xml Normal file
View File

@ -0,0 +1,189 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8</artifactId>
<version>12.0.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee8-bom</artifactId>
<name>EE8 :: Jetty :: BOM</name>
<description>Jetty EE8 APIs BOM artifact</description>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten.maven.plugin.version}</version>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<flattenedPomFilename>flattened-pom.xml</flattenedPomFilename>
<flattenMode>bom</flattenMode>
<updatePomFile>true</updatePomFile>
<pomElements>
<build>remove</build>
<properties>remove</properties>
</pomElements>
</configuration>
<executions>
<execution>
<id>flatten</id>
<goals>
<goal>flatten</goal>
</goals>
<phase>process-resources</phase>
</execution>
<execution>
<id>flatten-clean</id>
<goals>
<goal>clean</goal>
</goals>
<phase>clean</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>12.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Jetty EE 9 Dependencies -->
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-apache-jsp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-cdi</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-glassfish-jstl</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-jaas</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-jaspi</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-jspc-maven-plugin</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-maven-plugin</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-openid</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-plus</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-proxy</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-quickstart</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-nested</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-servlet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-servlets</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-webapp</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jakarta-client</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jakarta-common</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jakarta-server</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jetty-api</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jetty-client</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jetty-common</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jetty-server</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-servlet</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
</project>

1
jetty-ee8/pom.xml
View File

@ -32,6 +32,7 @@
<module>jetty-ee8-jaas</module>
<module>jetty-ee8-plus</module>
<module>jetty-ee8-annotations</module>
<module>jetty-ee8-bom</module>
</modules>
<build>

5
jetty-ee9/jetty-ee9-annotations/src/main/config/modules/annotations.mod → jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod
View File

@ -3,8 +3,11 @@
[description]
Enables Annotation scanning for deployed web applications.
[environment]
ee9
[depend]
plus
ee9-plus
[lib]
lib/jetty-ee9-annotations-${jetty.version}.jar

11
jetty-ee9/jetty-ee9-bom/pom.xml
View File

@ -50,6 +50,7 @@
<dependencyManagement>
<dependencies>
<!-- FIXME to review it is not sure to work -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
@ -78,16 +79,19 @@
<artifactId>jetty-ee9-glassfish-jstl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-jaas</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-jaspi</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
<!-- <artifactId>jetty-ee9-jspc-maven-plugin</artifactId>-->
@ -143,11 +147,7 @@
<artifactId>jetty-ee9-webapp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>test-ee9-sessions-common</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9.websocket</groupId>-->
<!-- <artifactId>jetty-ee9-websocket-jakarta-client</artifactId>-->
@ -189,6 +189,7 @@
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- Jakarta EE 9 Dependencies -->
<!-- FIXME to review it is not sure to be a good idea to have this in the bom -->
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>

605
jetty-ee9/jetty-ee9-home/pom.xml Normal file
View File

@ -0,0 +1,605 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9</artifactId>
<version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ee9-home</artifactId>
<name>EE9 :: Jetty :: Home Assembly</name>
<packaging>pom</packaging>
<properties>
<assembly-directory>${basedir}/target/jetty-ee9-home</assembly-directory>
<source-assembly-directory>${basedir}/target/jetty-ee9-home-sources</source-assembly-directory>
<spotbugs.skip>true</spotbugs.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-config-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>
org.eclipse.jetty.ee9, org.eclipse.jetty.ee9.demos
</includeGroupIds>
<excludeArtifactIds></excludeArtifactIds>
<classifier>config</classifier>
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
<excludes>META-INF/**,webapps/**,start.d/**,start.ini</excludes>
<outputDirectory>${assembly-directory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-ee9-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee9.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee9-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-ee9-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee9.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee9-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-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/ee9-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-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/ee9-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>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-ee9-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/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>
<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/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>
</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>
<outputDirectory>${source-assembly-directory}/lib/ee9-apache-jsp</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-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-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>
<outputDirectory>${assembly-directory}/lib/ee9-apache-jsp</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-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/ee9-glassfish-jstl</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-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/ee9-glassfish-jstl</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-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/ee9-jaspi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-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/ee9-jaspi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee9-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee9</includeGroupIds>
<excludeArtifactIds>websocket-core-client,websocket-core-common,websocket-core-server</excludeArtifactIds>
<excludeGroupIds>org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket</excludeGroupIds>
<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>
<includeTypes>jar</includeTypes>
<excludeGroupIds>org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket</excludeGroupIds>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>binary</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/jetty-source-assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</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>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-servlets</artifactId>
</dependency>
<!-- <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>
</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>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-annotations</artifactId>
</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>
<!-- Demo ee9 Apps -->
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-mock-resources</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9.demos</groupId>-->
<!-- <artifactId>jetty-ee9-demo-jetty-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>javax.el</groupId>-->
<!-- <artifactId>el-api</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-jaas-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-jndi-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-spec-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-async-rest-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee9.demos</groupId>-->
<!-- <artifactId>jetty-ee9-demo-proxy-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-simple-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-jsp-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
</dependencies>
</project>

20
jetty-ee9/jetty-ee9-home/src/main/assembly/jetty-assembly.xml Normal file
View File

@ -0,0 +1,20 @@
<assembly>
<id>binary-assembly</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${assembly-directory}</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>**/META-INF/**</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>

17
jetty-ee9/jetty-ee9-home/src/main/assembly/jetty-source-assembly.xml Normal file
View File

@ -0,0 +1,17 @@
<assembly>
<id>sources</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${source-assembly-directory}</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
</assembly>

4
jetty-ee9/jetty-ee9-plus/pom.xml
View File

@ -41,6 +41,10 @@
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>

5
jetty-ee9/jetty-ee9-plus/src/main/config/modules/plus.mod → jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
View File

@ -1,5 +1,8 @@
[description]
Enables Servlet 3.1 resource injection.
Enables Servlet 3.1 resource injection.
[environment]
ee9
[depend]
server

21
jetty-ee9/pom.xml
View File

@ -25,11 +25,11 @@
<jakarta.annotation.api.version>2.0.0</jakarta.annotation.api.version>
<jakarta.authentication.api.version>2.0.0</jakarta.authentication.api.version>
<jakarta.el.api.version>4.0.0</jakarta.el.api.version>
<jakarta.enterprise.cdi.api.version>3.0.0</jakarta.enterprise.cdi.api.version>
<jakarta.inject.api.version>2.0.0</jakarta.inject.api.version>
<jakarta.interceptor.api.version>2.0.0</jakarta.interceptor.api.version>
<jakarta.enterprise.cdi.api.version>3.0.1</jakarta.enterprise.cdi.api.version>
<jakarta.inject.api.version>2.0.1</jakarta.inject.api.version>
<jakarta.interceptor.api.version>2.0.1</jakarta.interceptor.api.version>
<jakarta.mail.api.version>2.0.1</jakarta.mail.api.version>
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.servlet.api.version>5.0.0</jakarta.servlet.api.version>
<jakarta.servlet.jsp.api.version>3.0.0</jakarta.servlet.jsp.api.version>
<jakarta.servlet.jsp.jstl.api.version>2.0.0</jakarta.servlet.jsp.jstl.api.version>
@ -40,7 +40,7 @@
<jakarta.xml.ws.api.version>3.0.1</jakarta.xml.ws.api.version>
<jakarta.xml.jaxws.impl.version>3.0.2</jakarta.xml.jaxws.impl.version>
<jakarta.websocket.api.version>2.0.0</jakarta.websocket.api.version>
<jsp.impl.version>10.0.14</jsp.impl.version>
<sonar.skip>true</sonar.skip>
</properties>
@ -71,6 +71,7 @@
<!-- <module>jetty-ee9-tests</module>-->
<module>jetty-ee9-bom</module>
<module>test-ee9-sessions</module>
<module>jetty-ee9-home</module>
</modules>
<dependencyManagement>
@ -270,6 +271,16 @@
<version>${project.version}</version>
</dependency>
<!-- Jakarta EE 9 Dependencies -->
<dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<version>${jsp.impl.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<version>${jsp.impl.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>

5
jetty-ee9/test-ee9-sessions/pom.xml
View File

@ -29,6 +29,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>test-ee9-sessions-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

634
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.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.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
</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.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.ee9,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
</excludeGroupIds>
<excludeArtifactIds>
apache-jsp,glassfish-jstl,jetty-start
@ -187,54 +187,53 @@
</configuration>
</execution>
<execution>
<id>copy-lib-websocket-core-deps</id>
<id>copy-lib-ee10-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee10.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
<outputDirectory>${assembly-directory}/lib/ee10-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-websocket-core-src-deps</id>
<id>copy-lib-ee10-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee10.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/core/websocket</outputDirectory>
<outputDirectory>${source-assembly-directory}/lib/ee10-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-ee-websocket-deps</id>
<id>copy-ee10-lib-jakarta-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.toolchain,org.eclipse.jetty.ee9.websocket,org.eclipse.jetty.ee10.websocket</includeGroupIds>
<excludeArtifactIds>jetty-jakarta-servlet-api,jetty-schemas,jetty-test-helper</excludeArtifactIds>
<includeGroupIds>jakarta.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
<outputDirectory>${assembly-directory}/lib/ee10-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-ee-websocket-src-deps</id>
<id>copy-ee10-lib-jakarta-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.toolchain,org.eclipse.jetty.ee10.websocket</includeGroupIds>
<includeGroupIds>jakarta.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/websocket</outputDirectory>
<outputDirectory>${source-assembly-directory}/lib/ee10-websocket</outputDirectory>
</configuration>
</execution>
<execution>
@ -246,10 +245,10 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
@ -270,10 +269,10 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<!-- FIXME MUST BE A PROPERTY -->
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
@ -373,12 +372,31 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.eclipse.jetty.orbit,org.ow2.asm</includeGroupIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<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>
@ -386,74 +404,176 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.eclipse.jetty.orbit,org.ow2.asm</includeGroupIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<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>
<!-- TODO: ee9 annotations -->
<execution>
<id>copy-ee10-apache-jsp-deps</id>
<id>copy-ee10-annotations-src-deps-jakarta-annotation</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
<goal>copy</goal>
</goals>
<configuration>
<includeGroupIds>
org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt
</includeGroupIds>
<includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<prependGroupId>true</prependGroupId>
<outputDirectory>${assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
<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-apache-jsp-src-deps</id>
<id>copy-ee9-annotations-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>
org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt
</includeGroupIds>
<includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<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-glassfish-jstl-deps</id>
<id>copy-ee10-jsp-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
<goal>copy</goal>
</goals>
<configuration>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
<prependGroupId>true</prependGroupId>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee10-glassfish-jstl</outputDirectory>
<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-glassfish-jstl-src-deps</id>
<id>copy-ee10-jstl-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
<goal>copy</goal>
</goals>
<configuration>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
<prependGroupId>true</prependGroupId>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<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>
@ -483,7 +603,6 @@
</configuration>
</execution>
<!-- TODO: ee9 jaspi -->
<execution>
<id>copy-ee9-deps</id>
<phase>generate-resources</phase>
@ -493,7 +612,7 @@
<configuration>
<includeGroupIds>org.eclipse.jetty.ee9</includeGroupIds>
<excludeGroupIds>org.eclipse.jetty.ee9.demos</excludeGroupIds>
<!-- <includeArtifactIds></includeArtifactIds>-->
<!-- <includeArtifactIds></includeArtifactIds>-->
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
@ -506,14 +625,13 @@
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee9</includeGroupIds>
<!-- <includeArtifactIds></includeArtifactIds>-->
<!-- <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>
@ -522,8 +640,8 @@
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee10</includeGroupIds>
<!-- <includeArtifactIds></includeArtifactIds>-->
<excludeGroupIds>org.eclipse.jetty.ee10.demos</excludeGroupIds>
<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>
@ -536,14 +654,36 @@
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee10</includeGroupIds>
<!-- <includeArtifactIds></includeArtifactIds>-->
<includeTypes>jar</includeTypes>
<excludeGroupIds>org.eclipse.jetty.ee10.demos</excludeGroupIds>
<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>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-home</artifactId>
<version>${project.version}</version>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-home</artifactId>
<version>${project.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>unpack-config-deps</id>
<phase>generate-resources</phase>
@ -552,7 +692,7 @@
</goals>
<configuration>
<includeGroupIds>
org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.ee9.demos, org.eclipse.jetty.ee10.demos
org.eclipse.jetty, org.eclipse.jetty.websocket
</includeGroupIds>
<excludeArtifactIds>jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation</excludeArtifactIds>
<classifier>config</classifier>
@ -659,6 +799,19 @@
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api</exclude>
<!--
we need to exclude some libraries which are different depending on ee8/ee9/ee10
enforcer is running at ee10/ee9/ee8 home level
-->
<exclude>jakarta.servlet:jakarta.servlet-api</exclude>
<exclude>jakarta.servlet.jsp:jakarta.servlet.jsp-api</exclude>
<exclude>jakarta.enterprise:jakarta.enterprise.cdi-api</exclude>
<exclude>jakarta.mail:jakarta.mail-api</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>jakarta.authentication:jakarta.authentication-api</exclude>
<exclude>jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api</exclude>
<exclude>org.glassfish.web:jakarta.servlet.jsp.jstl</exclude>
<exclude>org.mortbay.jasper:apache-jsp</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
@ -689,22 +842,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>
@ -742,86 +895,88 @@
<artifactId>jetty-start</artifactId>
<classifier>shaded</classifier>
<version>${project.version}</version>
</dependency>
</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>
</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.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.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>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-home</artifactId>
<version>${project.version}</version>
<optional>true</optional>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-annotations</artifactId>
<artifactId>jetty-ee9-home</artifactId>
<version>${project.version}</version>
<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>-->
<!-- <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>
@ -919,7 +1074,7 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<optional>true</optional>
</dependency>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
@ -993,170 +1148,55 @@
<artifactId>jetty-nosql</artifactId>
<optional>true</optional>
</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-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>
<optional>true</optional>
</dependency>
<!-- Demo EE10 Apps -->
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-mock-resources</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-jetty-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-jaas-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-jndi-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-spec-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-async-rest-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-proxy-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-simple-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>ee10-demo-jsp-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<!-- Demo EE9 Apps -->
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-mock-resources</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<!-- dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-jetty-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
</exclusions>
</dependency -->
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-jaas-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-jndi-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-spec-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-async-rest-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<!-- dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>ee9-demo-proxy-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency -->
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-simple-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.demos</groupId>
<artifactId>jetty-ee9-demo-jsp-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
</dependencies>
</project>

11
pom.xml
View File

@ -69,7 +69,6 @@
<jnr-unixsocket.version>0.38.17</jnr-unixsocket.version>
<json-simple.version>1.1.1</json-simple.version>
<json-smart.version>2.4.7</json-smart.version>
<jsp.impl.version>10.0.10</jsp.impl.version>
<junit.version>5.8.2</junit.version>
<kerb-simplekdc.version>2.0.2</kerb-simplekdc.version>
<log4j2.version>2.17.2</log4j2.version>
@ -1539,21 +1538,11 @@
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<version>${jsp.impl.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty.quiche</groupId>
<artifactId>jetty-quiche-native</artifactId>
<version>${jetty-quiche-native.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<version>${jsp.impl.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<!-- older artifact location, some of our transitive deps still use this coordinate -->