Skip to content

Another merge of 4.x to 5.0#6104

Merged
dmatej merged 27 commits into
eclipse-ee4j:4.xfrom
dmatej:sync4to5
Jul 21, 2026
Merged

Another merge of 4.x to 5.0#6104
dmatej merged 27 commits into
eclipse-ee4j:4.xfrom
dmatej:sync4to5

Conversation

@dmatej

@dmatej dmatej commented Jul 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Local build:

mvn clean install
...
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  32:46 min
[INFO] Finished at: 2026-07-20T11:10:51+02:00
[INFO] ------------------------------------------------------------------------
dmatej@dmatej-tux:~/work/repo/git/jersey$ mvn -version
Apache Maven 3.9.16 (2bdd9fddda4b155ebf8000e807eb73fd829a51d5)
Maven home: /home/dmatej/work/apache-maven-3.9.16
Java version: 25, vendor: Eclipse Adoptium, runtime: /usr/lib/jvm/jdk-25+36
Default locale: en_US, platform encoding: UTF-8
OS name: "linux", version: "6.17.0-122035-tuxedo", arch: "amd64", family: "unix"

senivam and others added 27 commits February 2, 2026 14:28
@senivam @arjantijms
Exclude jersey-constants from the release test
dae0420 
Signed-off-by: Maxim Nesen <senivam@gmail.com>
@arjantijms
Merge pull request eclipse-ee4j#6072 from arjantijms/5.0
a602249 
[5.0] Exclude jersey-constants from the release test
@arjantijms
Update deps to EE12 and fix code for it
98e5b16
@arjantijms
2.0.0 parent and hibernate-validator-cdi patch
2163d16
@arjantijms
Correct copyright
c5ab544
@arjantijms
Fix copyright failure
46e2526
@arjantijms
Adjust validate job for copyright fix
8d3d9f2
@arjantijms
For JDK 25, adjust InjectingConstraintValidatorFactory
c953351
@arjantijms
Try to remove duplicate for dependency-convergences
3386d19
@arjantijms
Try again to fix dependency convergence
41d2134
@arjantijms
Update moxy
5b09df3
@arjantijms
Merge pull request eclipse-ee4j#6076 from arjantijms/5_0_fix_for_ee12…
86eb521 
…_dependencies

Update deps to EE12 and fix code for it
@arjantijms
Skip publishing patched modules
d249ae4
@arjantijms
Merge pull request eclipse-ee4j#6077 from arjantijms/5.0
6266683 
Skip publishing patched modules
@arjantijms
Update several versions
b9ba299
@arjantijms
try to align asm versions to some degree
6f3c83b
@arjantijms
Use jdk 21 for validate
a6f2396
@arjantijms
Merge pull request eclipse-ee4j#6079 from arjantijms/50_new_versions
6aa7d3b 
Update several versions
@dmatej
Updated Grizzly dependencies - fixed jpms
2335811 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Updated servlet api to 6.2.0-M2
6aeaab1 
- M1 depended on snapshot parent

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Updated Jakarta EL to M2
445f129 
- M1 depended on snapshot parent

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Merge pull request eclipse-ee4j#6093 from dmatej/fix-grizzly-dependen…
1b4247c 
…cies

Updated Grizzly dependencies - fixed jpms
@dmatej
Fixed schemaLocation for poms
30e5a7d 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Merge pull request eclipse-ee4j#6092 from dmatej/fixed-poms-5
a276a3a 
Fixed schemaLocation for poms for 5.0
@dmatej
Merge remote-tracking branch 'eclipse/4.x' into sync5
4a6cfa0 
* eclipse/4.x:
  Fixed schemaLocation for poms
  resolve null @context in Spring-proxied Jersey resources (eclipse-ee4j#6080)
  Exclude jersey-constants from the release test
  Removed ReaderWriter::readAllBytes (eclipse-ee4j#6070)
  Fix memory leak (eclipse-ee4j#6075)
  InputStream.nullInputStream() and Reader.nullWriter() is more efficient than new ByteInputStream(new byte[0]) and new Reader(...(new byte[0]));
@dmatej
Merge pull request eclipse-ee4j#6095 from dmatej/sync5
79b60d4 
Merge of 4.0 changes to 5.0
@dmatej
Merge remote-tracking branch 'eclipse/4.x' into 5.0
b37401b 
# By David Matějček (8) and others
# Via GitHub (6) and David Matějček (2)
* eclipse/4.x:
  Updated HK2 from a milestone to 4.0.1
  Removed supplier from log
  Added test from PR eclipse-ee4j#6086
  Removed redundant surefire plugin without a version from helidon3-client
  Removed CompletedAsyncContextListener which redundantly completed processing
  Added logging of the redundant completition
  New test for AsyncContextDelegateProviderImpl
  Bump org.assertj:assertj-core from 3.21.0 to 3.27.7
  Issue 6036; Media - Jackson3
  Fixed schemaLocation for poms
  Fix memory leak (eclipse-ee4j#6075)

# Conflicts:
#	NOTICE.md
#	etc/config/copyright-exclude
#	pom.xml
@dmatej dmatej added this to the 5.0.0 milestone Jul 20, 2026
@dmatej
dmatej marked this pull request as ready for review July 20, 2026 10:40
@dmatej
dmatej requested a review from a team July 20, 2026 10:40
@mkarg

mkarg commented Jul 20, 2026

Copy link
Copy Markdown
Member

IIUC then you simply merge 4.x into 5.0, right? In that case, I am +1.

As 5.0 is a development branch, maybe it is simpler to rebase it on 4.x? 🤔

@dmatej

dmatej commented Jul 20, 2026

Copy link
Copy Markdown
Contributor Author

IIUC then you simply merge 4.x into 5.0, right? In that case, I am +1.

As 5.0 is a development branch, maybe it is simpler to rebase it on 4.x? 🤔

Rebases are bit dangerous with shared branches, first you cut out all PRs, because rebase reapplies commits. All commits change ids, so also links to them would be lost. Merges are safer and more consistent.

When we would keep this from time to time, we resolve conflicts, fix some differences, we can have less work with backports. However 2.x and 3.0 are already more problematic, I don't plan to spend my time with these branches.

Also, sometimes conflicts point on some problems to resolve.

@dmatej
dmatej merged commit 947f12b into eclipse-ee4j:4.x Jul 21, 2026
6 checks passed
@dmatej
dmatej deleted the sync4to5 branch July 21, 2026 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arjantijms arjantijms arjantijms approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@dmatej @mkarg @arjantijms @senivam