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

Update all deps to ee11 versions

This commit is contained in:
Jan Bartel 2024-05-01 11:27:43 +10:00
parent 61223e82b5
commit da5eee7434
10 changed files with 108 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,8 +62,6 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override
public String registerConfigProvider(String className, Map properties, String layer, String appContext, String description)
{
checkPermission();
String key = getKey(layer, appContext);
AuthConfigProvider configProvider = createConfigProvider(className, properties);
DefaultRegistrationContext context = new DefaultRegistrationContext(configProvider, layer, appContext, description, true);
@ -76,8 +74,6 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override
public String registerConfigProvider(AuthConfigProvider provider, String layer, String appContext, String description)
{
checkPermission();
String key = getKey(layer, appContext);
DefaultRegistrationContext context = new DefaultRegistrationContext(provider, layer, appContext, description, false);
DefaultRegistrationContext oldContext = _registrations.put(key, context);
@ -89,8 +85,6 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override
public boolean removeRegistration(String registrationID)
{
checkPermission();
DefaultRegistrationContext registrationContext = _registrations.remove(registrationID);
if (registrationContext == null)
return false;
@ -116,8 +110,6 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override
public String[] detachListener(RegistrationListener listener, String layer, String appContext)
{
checkPermission();
List<String> registrationIds = new ArrayList<>();
for (DefaultRegistrationContext registration : _registrations.values())
{
@ -153,16 +145,9 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override
public void refresh()
{
checkPermission();
// TODO: maybe we should re-construct providers created from classname.
}
private static void checkPermission()
{
SecurityUtils.checkPermission(new SecurityPermission(PROVIDER_REGISTRATION_PERMISSION_NAME));
}
private static String getKey(String layer, String appContext)
{
return layer + "/" + appContext;

36
jetty-ee11/jetty-ee11-osgi/jetty-ee11-osgi-boot-jsp/pom.xml
View File

@ -62,13 +62,13 @@
com.sun.el.lang;resolution:=optional,
com.sun.el.parser;resolution:=optional,
com.sun.el.util;resolution:=optional,
jakarta.el;version="[5.0,6.0)",
jakarta.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))",
jakarta.servlet.resources;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))",
jakarta.servlet.jsp.resources;version="[$(version;==;${jakarta.servlet.jsp.api.version}),$(version;+;${jakarta.servlet.jsp.api.version}))",
jakarta.servlet.jsp;version="[$(version;==;${jakarta.servlet.jsp.api.version}),$(version;+;${jakarta.servlet.jsp.api.version}))",
jakarta.servlet.jsp.el;version="[$(version;==;${jakarta.servlet.jsp.api.version}),$(version;+;${jakarta.servlet.jsp.api.version}))",
jakarta.servlet.jsp.tagext;version="[$(version;==;${jakarta.servlet.jsp.api.version}),$(version;+;${jakarta.servlet.jsp.api.version}))",
jakarta.el;version="[6.0,7.0)",
jakarta.servlet;version="[$(version;==;${servletApi.osgiVersion}),$(version;+;${servletApi.osgiVersion}))",
jakarta.servlet.resources;version="[$(version;==;${servletApi.osgiVersion}),$(version;+;${servletApi.osgiVersion}))",
jakarta.servlet.jsp.resources;version="[$(version;==;${jspApi.osgiVersion}),$(version;+;${jspApi.osgiVersion}))",
jakarta.servlet.jsp;version="[$(version;==;${jspApi.osgiVersion}),$(version;+;${jspApi.osgiVersion}))",
jakarta.servlet.jsp.el;version="[$(version;==;${jspApi.osgiVersion}),$(version;+;${jspApi.osgiVersion}))",
jakarta.servlet.jsp.tagext;version="[$(version;==;${jspApi.osgiVersion}),$(version;+;${jspApi.osgiVersion}))",
jakarta.servlet.jsp.jstl.core;version="2.0";resolution:=optional,
jakarta.servlet.jsp.jstl.fmt;version="2.0";resolution:=optional,
jakarta.servlet.jsp.jstl.sql;version="2.0";resolution:=optional,
@ -137,11 +137,33 @@
<goal>parse-version</goal>
</goals>
<phase>validate</phase>
<configuration>
<versionString>${jakarta.servlet.jsp.api.version}</versionString>
<propertyPrefix>jspApi</propertyPrefix>
</configuration>
</execution>
<execution>
<id>set-jsp-impl-version</id>
<goals>
<goal>parse-version</goal>
</goals>
<phase>validate</phase>
<configuration>
<versionString>${jsp.impl.version}</versionString>
<propertyPrefix>jspImpl</propertyPrefix>
</configuration>
</execution>
<execution>
<id>set-servlet-api-version</id>
<goals>
<goal>parse-version</goal>
</goals>
<phase>validate</phase>
<configuration>
<versionString>${jakarta.servlet.api.version}</versionString>
<propertyPrefix>servletApi</propertyPrefix>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

22
jetty-ee11/jetty-ee11-osgi/jetty-ee11-osgi-boot/pom.xml
View File

@ -74,8 +74,8 @@
jakarta.mail.internet;version="2.0";resolution:=optional,
jakarta.mail.search;version="2.0";resolution:=optional,
jakarta.mail.util;version="2.0";resolution:=optional,
jakarta.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))",
jakarta.servlet.http;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))",
jakarta.servlet;version="[$(version;==;${servletApi.osgiVersion}),$(version;+;${servletApi.osgiVersion}))",
jakarta.servlet.http;version="[$(version;==;${servletApi.osgiVersion}),$(version;+;${servletApi.osgiVersion}))",
jakarta.transaction;version="2.0.0";resolution:=optional,
jakarta.transaction.xa;version="2.0.0";resolution:=optional,
org.objectweb.asm;version="$(version;=;${asm.version})";resolution:=optional,
@ -97,6 +97,7 @@
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@ -118,6 +119,23 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>set-servlet-api-version</id>
<goals>
<goal>parse-version</goal>
</goals>
<phase>validate</phase>
<configuration>
<versionString>${jakarta.servlet.api.version}</versionString>
<propertyPrefix>servletApi</propertyPrefix>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

6
jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiResponse.java
View File

@ -172,6 +172,12 @@ public class ServletApiResponse implements HttpServletResponse
sendRedirect(HttpServletResponse.SC_MOVED_TEMPORARILY, location);
}
@Override
public void sendRedirect(String s, int i, boolean b) throws IOException
{
//TODO servlet6.1
}
/**
* Sends a response with one of the 300 series redirection codes.
*

5
jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletResponseHttpWrapper.java
View File

@ -71,6 +71,11 @@ public class ServletResponseHttpWrapper extends ServletResponseWrapper implement
{
}
@Override
public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException
{
}
@Override
public void setDateHeader(String name, long date)
{

7
jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/SessionHandler.java
View File

@ -284,6 +284,13 @@ public class SessionHandler extends AbstractSessionManager implements Handler.Si
_session = session;
}
@Override
public Accessor getAccessor()
{
//TODO servlet6.1
return null;
}
@Override
public ManagedSession getSession()
{

3
jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/ResponseHeadersTest.java
View File

@ -17,6 +17,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.net.URLDecoder;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import jakarta.servlet.ServletException;
@ -261,7 +262,7 @@ public class ResponseHeadersTest
// and should never have a `charset=` entry on the `Content-Type` response header
response.setContentType("application/json");
// attempt to indicate that there is truly no charset meant to be used in the response header
response.setCharacterEncoding(null);
response.setCharacterEncoding((Charset)null);
writer.println("{ \"what\": \"should this be?\" }");
}

3
jetty-ee11/jetty-ee11-tests/pom.xml
View File

@ -21,7 +21,8 @@
<module>jetty-ee11-test-felix-webapp</module>
<module>jetty-ee11-test-http2-webapp</module>
<module>jetty-ee11-test-integration</module>
<module>jetty-ee11-test-jersey</module>
<!-- module>jetty-ee11-test-jersey</module -->
<!-- jakarta.ws.rs.api 4.0.0-M2 pom broken -->
<module>jetty-ee11-test-jmx</module>
<module>jetty-ee11-test-jndi</module>
<module>jetty-ee11-test-log4j2-webapp</module>

50
jetty-ee11/pom.xml
View File

@ -40,32 +40,32 @@
<properties>
<jakarta.activation.api.version>2.1.3</jakarta.activation.api.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
<jakarta.authentication.api.version>3.0.0</jakarta.authentication.api.version>
<jakarta.el.api.version>5.0.1</jakarta.el.api.version>
<jakarta.enterprise.cdi.api.version>4.0.1</jakarta.enterprise.cdi.api.version>
<jakarta.enterprise.lang.model.version>4.0.1</jakarta.enterprise.lang.model.version>
<jakarta.annotation.api.version>3.0.0</jakarta.annotation.api.version>
<jakarta.authentication.api.version>3.1.0-M1</jakarta.authentication.api.version>
<jakarta.el.api.version>6.0.0</jakarta.el.api.version>
<jakarta.enterprise.cdi.api.version>4.1.0.RC1</jakarta.enterprise.cdi.api.version>
<jakarta.enterprise.lang.model.version>4.1.0.RC1</jakarta.enterprise.lang.model.version>
<jakarta.inject.api.version>2.0.1.MR</jakarta.inject.api.version>
<jakarta.interceptor.api.version>2.1.0</jakarta.interceptor.api.version>
<jakarta.interceptor.api.version>2.2.0</jakarta.interceptor.api.version>
<jakarta.mail.api.version>2.1.3</jakarta.mail.api.version>
<jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
<jakarta.servlet.jsp.api.version>3.1.1</jakarta.servlet.jsp.api.version>
<jakarta.servlet.api.version>6.1.0-M2</jakarta.servlet.api.version>
<jakarta.servlet.jsp.api.version>4.0.0-M2</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.1</jakarta.servlet.jsp.jstl.impl.version>
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.websocket.api.version>2.1.1</jakarta.websocket.api.version>
<jakarta.ws.rs.api.version>3.1.0</jakarta.ws.rs.api.version>
<jakarta.websocket.api.version>2.2.0-M1</jakarta.websocket.api.version>
<jakarta.ws.rs.api.version>4.0.0-M2</jakarta.ws.rs.api.version>
<jakarta.xml.bind.api.version>4.0.2</jakarta.xml.bind.api.version>
<jakarta.xml.bind.impl.version>4.0.5</jakarta.xml.bind.impl.version>
<jakarta.xml.jaxws.impl.version>4.0.2</jakarta.xml.jaxws.impl.version>
<jakarta.xml.ws.api.version>4.0.1</jakarta.xml.ws.api.version>
<jersey.version>3.1.5</jersey.version>
<jersey.version>4.0.0-M1</jersey.version>
<jsp.impl.version>10.1.16</jsp.impl.version>
<jsp.impl.version>11.0.0-SNAPSHOT</jsp.impl.version>
<mail.impl.version>2.0.1</mail.impl.version>
<sonar.skip>true</sonar.skip>
<weld.version>5.1.2.Final</weld.version>
<weld.version>6.0.0.Beta1</weld.version>
</properties>
<dependencyManagement>
@ -576,34 +576,34 @@
</ignoreVersions>
</rule>
<rule>
<!-- for ee11, we need to stay on 5.0.x of el spec -->
<!-- for ee11, we need to stay on 6.0.0 of el spec -->
<groupId>jakarta.el</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!5.0.).+</version>
<version>^(?!6.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee11, we need to stay on 4.0.x of cdi spec -->
<!-- for ee11, we need to stay on 4.1.x of cdi spec -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.0.).+</version>
<version>^(?!4.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee11, we need to stay on 4.0.x of enterprise lang spec -->
<!-- for ee11, we need to stay on 4.1.x of enterprise lang spec -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.0.).+</version>
<version>^(?!4.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
@ -619,13 +619,13 @@
</ignoreVersions>
</rule>
<rule>
<!-- for ee11, we need to stay on 2.1.x of interceptor spec -->
<!-- for ee11, we need to stay on 2.2.x of interceptor spec -->
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
<version>^(?!2.2.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
@ -652,13 +652,13 @@
</ignoreVersions>
</rule>
<rule>
<!-- for ee11, we need to stay on 3.1.x of jsp spec -->
<!-- for ee11, we need to stay on 4.0.x of jsp spec -->
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.1.).+</version>
<version>^(?!4.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
@ -696,13 +696,13 @@
</ignoreVersions>
</rule>
<rule>
<!-- for ee11, we need to stay on 2.1.x of websocket spec -->
<!-- for ee11, we need to stay on 2.2.x of websocket spec -->
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
<version>^(?!2.2.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>

21
jetty-home/pom.xml
View File

@ -125,12 +125,6 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-home</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-home</artifactId>
@ -138,8 +132,8 @@
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-home</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-home</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
@ -149,6 +143,12 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-home</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi-proxy</artifactId>
@ -565,7 +565,7 @@
<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/ee11
we need to exclude some libraries which are different depending on ee8/ee9/ee10/ee11
enforcer is running at ee11/ee10/ee9/ee8 home level
-->
<exclude>jakarta.servlet:jakarta.servlet-api</exclude>
@ -581,6 +581,9 @@
<exclude>jakarta.interceptor:jakarta.interceptor-api</exclude>
<exclude>jakarta.enterprise:jakarta.enterprise.cdi-api</exclude>
<exclude>jakarta.el:jakarta.el-api</exclude>
<exclude>jakarta.enterprise:jakarta.enterprise.lang-model</exclude>
<exclude>jakarta.websocket:jakarta.websocket-client-api</exclude>
<exclude>jakarta.websocket:jakarta.websocket-api</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>