FELIX-6750 Update Felix HTTP to Jetty 12.1.9 by paulrutter · Pull Request #376 · apache/felix-dev

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

Updates Felix HTTP to Jetty 12.1.9 (release notes).

org.apache.felix.http.jetty12 bumped to 1.2.0-SNAPSHOT
Migrated to Jetty EE11 (servlet API 6.1)
Added org.eclipse.jetty.compression.* to exports
Added dependencies on jetty-compression-gzip and jetty-compression-common

- 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] <support@github.com> 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] <support@github.com> 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…s in 12.1.0 (4f69f68) with java 21 and 23

paulrutter · 2025-08-20T12:48:10Z

@cziegeler now 12.1.0 is out, #376 (comment) might become something to look into. It has been intermittent between beta versions. In the final version, it's again an issue.

cziegeler · 2025-08-20T13:17:46Z

maybe we just wait for 12.1.1 :)

- Use 1.2.0-SNAPSHOT now 1.1.0 will be released soon on master

- Move to 12.1.1

- Fix itest dep

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

# Conflicts: # http/jetty12/pom.xml

- Move to 12.1.3

- Use 1.2.0 snapshot

- move to 12.1.4

enapps-enorman · 2026-05-21T20:44:09Z

Can we revisit these changes now? Jetty is up to 12.1.9 now.

paulrutter · 2026-05-21T21:06:29Z

Yeah this one should indeed be revisited soon.

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

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

paulrutter · 2026-05-22T13:26:17Z

Can we revisit these changes now? Jetty is up to 12.1.9 now.

I have just updated it to 12.1.9.
If that succeeds, next up would be to discuss how to get this into the jetty12 bundle.
What i'm not sure about yet is if 12.1.9 is entirely backwards compatible with EE10, and thus, if the jetty12 bundle could safely move to 12.1.x or that we need to maintain two branches with 12.0.x and 12.1.x.

I guess it depends on how supportive we want to be; do we want to keep maintaining a EE10 version (i would assume so), while also offering a EE11 version? Or just a EE11 version when we increase jetty12 to 1.2.0, and keep maintaining a EE10 version in a jetty12 1.1.x branch?

@cziegeler any ideas on this?

…ranges Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

cziegeler · 2026-05-23T13:23:57Z

I think we can go with just a EE11 version, if our community demands to support a EE10 version we can still create a branch at that point in time.

paulrutter · 2026-05-23T20:49:09Z

I think we can go with just a EE11 version, if our community demands to support a EE10 version we can still create a branch at that point in time.

Right, makes sense. So, shall we land this as 2.0.0 to signal the EE11 change? I personally still require EE10, so will probably keep maintaining a 1.1.x branch then for EE10.

cziegeler · 2026-05-25T11:46:31Z

yes, 2.0.0 for EE11 sounds like a good idea

paulrutter · 2026-05-26T07:00:55Z

Alright, i will take care of releasing this somewhere in the coming few weeks.

…E11 and update maven-bundle-plugin to 6.0.2 - jetty12 bundle: 1.2.0-SNAPSHOT -> 2.0.0-SNAPSHOT (EE11 line) - README: EE11 version range -> 2.x - maven-bundle-plugin: 6.0.0 -> 6.0.2 in jetty12, samples/whiteboard, servlet-api, wrappers Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

…L in past tense Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

paulrutter · 2026-05-26T07:17:06Z

@cziegeler i you could do a review of the PR, i will start the release process this week.

cziegeler

Lgtm, thanks!

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

Add try/catch again, which was no longer needed in beta2, but again i…

042f507

…s in 12.1.0 (4f69f68) with java 21 and 23

paulrutter added 9 commits August 22, 2025 11:27

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

66d7408

FELIX-6750-Jetty-12.1.0-tryout

fbfe1f2

- Use 1.2.0-SNAPSHOT now 1.1.0 will be released soon on master

FELIX-6750-Jetty-12.1.0-tryout

2090f50

- Move to 12.1.1

FELIX-6750-Jetty-12.1.0-tryout

c28f6d7

- Fix itest dep

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

481d735

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

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

cf9976a

# Conflicts: # http/jetty12/pom.xml

FELIX-6750-Jetty-12.1.0-tryout

326986e

- Move to 12.1.3

FELIX-6750-Jetty-12.1.0-tryout

a4ebf51

- Use 1.2.0 snapshot

FELIX-6750-Jetty-12.1.0-tryout

b6f624b

- move to 12.1.4

paulrutter and others added 2 commits May 22, 2026 15:23

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

f4f41e9

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

FELIX-6750-Jetty-12.1.0-tryout - Move to 12.1.9

603ed70

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

paulrutter changed the title ~~FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP~~ FELIX-6750 Update Felix HTTP to Jetty 12.1.9 May 22, 2026

FELIX-6750-Jetty-12.1.0-tryout - Update README for EE10/EE11 version …

6aa0c27

…ranges Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

paulrutter marked this pull request as ready for review May 22, 2026 14:07

paulrutter and others added 2 commits May 26, 2026 09:13

FELIX-6750-Jetty-12.1.0-tryout - Update README to reflect Jetty 11 Eo…

8a1c990

…L in past tense Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

paulrutter requested a review from cziegeler May 26, 2026 07:47

cziegeler approved these changes May 26, 2026

View reviewed changes

paulrutter merged commit ed1a72a into master May 28, 2026
3 checks passed

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 Aug 20, 2025

Uh oh!

cziegeler commented Aug 20, 2025

Uh oh!

enapps-enorman commented May 21, 2026

Uh oh!

paulrutter commented May 21, 2026

Uh oh!

paulrutter commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cziegeler commented May 23, 2026

Uh oh!

paulrutter commented May 23, 2026

Uh oh!

cziegeler commented May 25, 2026

Uh oh!

paulrutter commented May 26, 2026

Uh oh!

paulrutter commented May 26, 2026

Uh oh!

cziegeler left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

paulrutter commented Jan 20, 2025 •

edited

Loading

paulrutter commented May 22, 2026 •

edited

Loading