Repository navigation
Merge #6151 from 4.0 into 4.1 - #6155
Merged
Merged
Conversation
Each IT module unpacked and booted its own GlassFish. Lease a running slot from glassfish-pool-maven-plugin instead, so test/ can build with -TN. Sequential stays the default: the other server profiles still use fixed ports. Run the ITs as a separate CI step with -T2. The test modules have no reactor dependency on impl, so a parallel root build could start them before impl is installed. Skip the per-module aggregate SBOM in test/: the modules are test fixtures and the aggregator mojo serializes parallel builds. Build on JDK 17 in CI: the pool's container classes target Java 17. maven.compiler.release stays 11. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Run GlassFish ITs on a shared server pool
On 4.1 and 5.0, glassfish is the managed server for the perf bench and glassfish-pool is the default. Use the same names on 4.0. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
On 4.1 the default glassfish profile also served the perf bench, which needs a server of its own and glassfish.maxHeapSize. Keep that setup as the glassfish profile, now selected explicitly like the other servers. The pool becomes the default glassfish-pool profile, on GlassFish 8 with the EE 11 client, and rejects -Dperf=true. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upmerge of #6151 and the profile rename a267338 from 4.0 into 4.1. Opened as a PR to watch CI before it lands on
main.Differences from 4.0
On 4.1 the default GlassFish profile also serves the perf bench. The bench needs a server of its own and an aligned heap (
glassfish.maxHeapSize), which the pool does not offer. So there are two profiles:glassfish-poolis the default and is used by a plainmvn verifyand by CI. It runs on GlassFish 8.0.4 with the EE 11 client.glassfishis the managed server, unchanged from the previous default profile. It is now selected explicitly, like-Pwildflyand-Ptomcat.glassfish-poolrejects-Dperf=true, because a bench on the pool would run with a different heap than on the other servers. The error says to name a server.test/perf/README.mdandtest/perf/Jenkinsfileare updated to these names.CI stays on JDK 21 and uses the two-step build with
-T2from 4.0.Verification
On JDK 21, with
implunit tests passing:-T2on the pool:issue6130andissue6131pass.-Dperf=truewithout a server fails at validate.-Dperf=true -PglassfishrunsPerfBenchITwith-Xmx1g.-Dperf=true -Ptomcatpasses validate.-P '!glassfish-pool'starts no pool.Please merge with a merge commit, not a squash, so that 4.0 stays an ancestor of
main.🤖 Generated with Claude Opus 5.5