FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP #376

paulrutter · 2025-01-20T12:58:58Z

1.1.0-SNAPSHOT
Use jetty 12.1.0-alpha1
Add org.eclipse.jetty.compression.* to exports
Add dependency on jetty-compression-gzip (not sure if this is required, maybe only for the client) and jetty-compression-common

This branch is based on EE11 (servlet API 6.1).

- 1.1.0-SNAPSHOT - Use jetty 12.1.0-alpha1 - Add `org.eclipse.jetty.compression.*` to exports - Add dependency on jetty-compression-gzip (not sure if this is required, maybe only for the client) and jetty-compression-common

- Fix samples

- Move to EE11 - Skip baselining to prevent errors in the baseline phase because of changed API's in 6.1.0

- Pass local maven repo to be able to get to the snapshot version of the servlet-api bundle

- Use snapshot version

- Build servlet-api, as it's used in the Jetty bundles

paulrutter · 2025-01-20T21:05:15Z

@cziegeler i did a first attempt on getting the http.jetty12 bundle to using Jetty 12.1.0 (servlet API 6.1).

Once it's GA we can revisit and check the open ends (like the servlet-api bundle failing on the baseline phase, we might need to remove version 5.0 and 6.0 from this bundle to get this resolved, as the servlet API actually changed in 6.1).

- Update README.md

- Update wrappers to implement new methods for servlet-api 6.1. This will break backwards compatbility though

cziegeler · 2025-01-21T00:42:57Z

Thanks, thats great.
Your changes to the servlet-api bundle look good - we always include the latest version (6.1 in this case) and export it as all earlier versions (5 and 6 in this case). While this is not 100% correct, it is usually good enough as the versions are compatible and code is not compiled against this bundle - it is just used at runtime.
There is of course the exception of servlet 6 which is not fully compatible to servlet 5 - due to removed methods -but we have that problem already today.

# Conflicts: # http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java # http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/FelixJettyWebSocketServlet.java # http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServletAlternative.java

# Conflicts: # http/itest/pom.xml # http/jetty/pom.xml # http/jetty12/pom.xml # http/samples/whiteboard/pom.xml

- Fix samples

…0.10

…#375) Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.3.12 to 1.3.15. - [Commits](qos-ch/logback@v_1.3.12...v_1.3.15) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.3.12 to 1.3.15. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](qos-ch/logback@v_1.3.12...v_1.3.15) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps org.apache.felix:org.apache.felix.webconsole from 4.0.0 to 4.9.10. --- updated-dependencies: - dependency-name: org.apache.felix:org.apache.felix.webconsole dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

- Use wrappers snapshot in jetty bundle

- build wrappers before jetty bundles, so the jetty12 can depend on latest snapshot versions. - jetty11 bundle still needs to rely on previous snapshot version until after the release is done.

- Upgrade to 12.0.18 and 11.0.25

Bumps org.apache.felix:org.apache.felix.webconsole from 4.9.0 to 4.9.10. --- updated-dependencies: - dependency-name: org.apache.felix:org.apache.felix.webconsole dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>

…1.32

…1.0.26

- update to 12.1.0.alpha2

# Conflicts: # http/jetty12/pom.xml # http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java # http/pom.xml # http/samples/whiteboard/pom.xml # http/wrappers/pom.xml

- update to latest snapshot for jetty bundle

# Conflicts: # .github/workflows/maven-ci.yml # http/base/pom.xml # http/itest/pom.xml # http/jetty/pom.xml # http/jetty12/pom.xml # http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java # http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java # http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java # http/samples/whiteboard/pom.xml # http/servlet-api/pom.xml # http/wrappers/pom.xml # http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletResponseWrapper.java

- revert unneeded changes now 6.1.0 already contains the 6.1 changes of the servlet api

paulrutter · 2025-05-26T09:13:48Z

Updated to 12.1.0.beta0

- Fix version

- Fix merge - Move to EE11 for ErrorHandler - Use try with resources

- Move to EE11 for new tests - Simplify HTTP client migration

- Organize imports

- Call start - Handle java.nio.channels.AsynchronousCloseException with a FIXME, might be a Jetty bug?

- Fix FIXME, handle async with future

- Reset FIXME, AsynchronousCloseException still happens

# Conflicts: # http/base/pom.xml # http/itest/pom.xml # http/jetty12/pom.xml # http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java # http/samples/whiteboard/pom.xml

paulrutter · 2025-06-20T09:45:33Z

Moved to 12.1.0.beta1

paulrutter added 6 commits January 20, 2025 13:58

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

dc8282d

- 1.1.0-SNAPSHOT - Use jetty 12.1.0-alpha1 - Add `org.eclipse.jetty.compression.*` to exports - Add dependency on jetty-compression-gzip (not sure if this is required, maybe only for the client) and jetty-compression-common

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

1ba9b64

- Fix samples

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

e98e1cf

- Move to EE11 - Skip baselining to prevent errors in the baseline phase because of changed API's in 6.1.0

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

720e395

- Pass local maven repo to be able to get to the snapshot version of the servlet-api bundle

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

ba7ee7d

- Use snapshot version

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

973bf30

- Build servlet-api, as it's used in the Jetty bundles

paulrutter added 2 commits January 20, 2025 22:08

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

00a3c42

- Update README.md

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

eb61dc7

- Update wrappers to implement new methods for servlet-api 6.1. This will break backwards compatbility though

paulrutter and others added 20 commits January 22, 2025 09:01

Fix merge

7bca9f8

Merge branch 'master' into feature/FELIX-6750-Jetty-12.1.0-tryout

7a85962

# Conflicts: # http/itest/pom.xml # http/jetty/pom.xml # http/jetty12/pom.xml # http/samples/whiteboard/pom.xml

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP

437c40f

- Fix samples

Merge branch 'master' into feature/FELIX-6750-Jetty-12.1.0-tryout

a279027

Upgrade to Alpha2

e2090d2

FELIX-6751 : Use proper encoding for service filter

1197c48

[maven-release-plugin] prepare release org.apache.felix.webconsole-5.…

49e4232

…0.10

[maven-release-plugin] prepare for next development iteration

0dba53c

Add webconsole to CI pipeline

49a5178

FELIX-6752 : System information throws java.lang.ClassCastException

738ff8f

FELIX-6753 : Use only plugin path for redirect/form submit

d3397d0

Update pom.xml

c35385a

Update AbstractJettyTestSupport.java

5289a52

FELIX-6755 : Support Jakarta Servlet 6

bd5a37f

Syntax error fix for default filter (#381)

9d0f8c5

FELIX-6755 : Create filter directly

e348a1b

paulrutter and others added 19 commits March 19, 2025 08:13

[maven-release-plugin] prepare for next development iteration

5888846

FELIX-6756 Cookie name "Path" is a reserved token

55e8b11

- Use wrappers snapshot in jetty bundle

FELIX-6756 Cookie name "Path" is a reserved token

2245639

- build wrappers before jetty bundles, so the jetty12 can depend on latest snapshot versions. - jetty11 bundle still needs to rely on previous snapshot version until after the release is done.

Update README.md

68b2dda

FELIX-6758 Update to Jetty 12.0.18 / 11.0.25

ef80790

- Upgrade to 12.0.18 and 11.0.25

[maven-release-plugin] prepare release org.apache.felix.http.jetty-5.…

ffca48a

…1.32

[maven-release-plugin] prepare for next development iteration

0c5e990

[maven-release-plugin] prepare release org.apache.felix.http.jetty12-…

296118e

…1.0.26

[maven-release-plugin] prepare for next development iteration

d886012

FELIX-6750-Jetty-12.1.0-tryout

72078f8

- update to 12.1.0.alpha2

Merge branch 'master' into feature/FELIX-6750-Jetty-12.1.0-tryout

3b6145a

# Conflicts: # http/jetty12/pom.xml # http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java # http/pom.xml # http/samples/whiteboard/pom.xml # http/wrappers/pom.xml

FELIX-6750-Jetty-12.1.0-tryout

35918d8

- update to latest snapshot for jetty bundle

FELIX-6750-Jetty-12.1.0-tryout

2c33bad

- revert unneeded changes now 6.1.0 already contains the 6.1 changes of the servlet api

FELIX-6750-Jetty-12.1.0-tryout

25360cd

- revert unneeded changes now 6.1.0 already contains the 6.1 changes of the servlet api

FELIX-6750-Jetty-12.1.0-tryout

093cfbb

- revert unneeded changes now 6.1.0 already contains the 6.1 changes of the servlet api

FELIX-6750-Jetty-12.1.0-tryout

8b297ce

- revert unneeded changes now 6.1.0 already contains the 6.1 changes of the servlet api

FELIX-6750-Jetty-12.1.0-tryout

d0d0cfc

- revert unneeded changes now 6.1.0 already contains the 6.1 changes of the servlet api

paulrutter added 9 commits May 26, 2025 11:36

FELIX-6750-Jetty-12.1.0-tryout

8e47a8f

- Fix version

FELIX-6750-Jetty-12.1.0-tryout

416202c

- Fix merge - Move to EE11 for ErrorHandler - Use try with resources

FELIX-6750-Jetty-12.1.0-tryout

9963f64

- Move to EE11 for new tests - Simplify HTTP client migration

FELIX-6750-Jetty-12.1.0-tryout

a790174

- Organize imports

FELIX-6750-Jetty-12.1.0-tryout

1dccc80

- Call start - Handle java.nio.channels.AsynchronousCloseException with a FIXME, might be a Jetty bug?

FELIX-6750-Jetty-12.1.0-tryout

8719de5

- Fix FIXME, handle async with future

FELIX-6750-Jetty-12.1.0-tryout

dc7b988

- Reset FIXME, AsynchronousCloseException still happens

Move to 12.1.0.beta1

51cbc8e

Merge branch 'master' into feature/FELIX-6750-Jetty-12.1.0-tryout

8fe1c3c

# Conflicts: # http/base/pom.xml # http/itest/pom.xml # http/jetty12/pom.xml # http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java # http/samples/whiteboard/pom.xml

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP #376

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP #376

Uh oh!

paulrutter commented Jan 20, 2025 •

edited

Loading

Uh oh!

paulrutter commented Jan 20, 2025

Uh oh!

cziegeler commented Jan 21, 2025

Uh oh!

paulrutter commented May 26, 2025

Uh oh!

paulrutter commented Jun 20, 2025

Uh oh!

Uh oh!

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP #376

Are you sure you want to change the base?

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP #376

Uh oh!

Conversation

paulrutter commented Jan 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

paulrutter commented Jan 20, 2025

Uh oh!

cziegeler commented Jan 21, 2025

Uh oh!

paulrutter commented May 26, 2025

Uh oh!

paulrutter commented Jun 20, 2025

Uh oh!

Uh oh!

paulrutter commented Jan 20, 2025 •

edited

Loading