Skip to content

Merge of 7.0.26 to 7.x - #26131

Merged
dmatej merged 91 commits into
7.xfrom
backport7x
Jul 1, 2026
Merged

Merge of 7.0.26 to 7.x#26131
dmatej merged 91 commits into
7.xfrom
backport7x

Conversation

@dmatej

@dmatej dmatej commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Merged remaining changes made for 7.0.26 in preparation of 7.1.1.
Summary of changes:

Note

  • As it is a merge, it should be quite easy to continue with merges from 7.0 in the future.

pzygielo and others added 30 commits May 22, 2025 21:48
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- When using the format method the final string will be very probably larger
  than original template.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- removed redundant this for methods
- simplified iterations with nullchecks

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- `sshd re-exec requires execution with an absolute path` error message
- See https://www.openssh.com/releasenotes.html
- I did not find the cause of this change in behavior, just old explanations

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- ACCStartupContext mixes asenv with JVM options
- ACCStartupContext's original code used AS_DERBY_INSTALL instead of
  com.sun.aas.derbyRoot property, which should be preferred in StartupContext.
- com.sun.aas.derbyRoot was moved from SystemPropertyConstants to BootstrapKeys
  - It is not so easy to move these constants, but we should clean this mess
  - Original constant made deprecated, is used just in ASenvPropertyReader

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Individual steps moved to methods

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Introduced org.glassfish.connectors.dbVendorMappingRoot system property
- DriverLoader is a singleton now
- Improved resource management
- Reduced copy and paste

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
… property

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- The Install root is resolved from the StartupContext, however it is not
  mandatory.
- AppServerStartupTest intentionally does not depend on KernelJUnitExtension,
  I did not notice that when I made previous changes
- KernelJUnitExtension should not set any System properties
- HK2JUnit5Extension uses own ServerEnvironmentImpl extension which provides
  the preconfigured StartupContext and not null.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Using generated free port numbers
- Try to stop and delete even unreachable instances

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
… GH CI

* Local result: 68500 vs 47.
* Random GH CI result before changes:
  * 230000 vs 130000 (criteria: second must be less than 33%)
* Change
  * Reduced duplication
  * Increased measurement time from 200 to 500 ms.
  * Increased warmup time from 50 to 100 ms.
  * Reduced measurement time of the first execution from 50 to 20ms.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
in case of rollback. Add unit test to test variants of
a rollback situation (transaction null vs nonXAResource null, and
enlisted versus unenlisted).
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- It sometimes lost records which were still waiting to be added while the
  buffer was already shutting down. Now records waiting to be processed will
  be processed.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- all GlassFish classloaders are parallelCapable and have names
- OSGi bootstrap classloading - classloader is a parameter

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
They were returned only on the first call of the getExtensions() method, subsequent calls return only extensions loaded from classpath
- today we experienced weird issue with GitHub Actions, create-domain
  command failed because the port 7676 was not free. However the issue
  vanished through the day, so I decided to keep the list of open ports here.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Added toString methods to get better error description
- Refactored CustomTokenClient - split to private methods
- Fixed condition: while (usedPorts.contains(port) || !NetUtils.isPortFree(port))
  - originally if the port WAS NOT used, the iteration continued.
  - now if it is already used (was already was checked, order is not always
    ascending), we skip it
  - the condition was moved just to basePort usage; original last if branch
    was never successful (usedPorts was always empty).
- The port validation is done in CreateDomainCommand class.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
dmatej and others added 17 commits June 20, 2026 03:16
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Updated version
- Checks extended to more file types including pom.xml
- Fixed checkstyle issues

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- partially synced with 7.x branch, partially to latest

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- partially synced with 7.x branch, partially to latest

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Synchronization with later branches 7.x and main
- Now we keep just last two builds and artifacts (if some PR would become
  unstable, can change it for a while)
- Added cleanup of the workspace
- Added pruning of stashes if the build succeeded as we will not rerun the
  build again very probably

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej dmatej added this to the 7.1.1 milestone Jun 29, 2026
@dmatej
dmatej force-pushed the backport7x branch 2 times, most recently from b7c9968 to a939566 Compare June 30, 2026 20:19
@dmatej dmatej linked an issue Jun 30, 2026 that may be closed by this pull request
35 tasks
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
dmatej requested review from a team and OndroMih July 1, 2026 09:57
@dmatej
dmatej marked this pull request as ready for review July 1, 2026 09:57
@dmatej
dmatej merged commit 3ee4995 into 7.x Jul 1, 2026
6 checks passed
@dmatej
dmatej deleted the backport7x branch July 1, 2026 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Backports for GlassFish 7.1.1

7 participants