-
Notifications
You must be signed in to change notification settings - Fork 162
Merge 8.0 in master #25841
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merge 8.0 in master #25841
+52,978
−38,277
Conversation
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
…n master Signed-off-by: David Matějček <[email protected]>
Signed-off-by: David Matějček <[email protected]>
Testing 8.0 branch + reenabled tests
# Conflicts: # appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/acc/agent/ACCAgentClassLoader.java # appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCClassLoader.java # appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/JWSACCClassLoader.java # appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ProviderContainerContractInfoImpl.java # appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientServerApplication.java # appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java # appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorClassLoader.java # appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/EjbJarHandler.java # appserver/web/war-util/src/main/java/org/glassfish/web/loader/ServletContainerInitializerUtil.java # appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java
- plus some small formatting improvements Signed-off-by: David Matějček <[email protected]>
- Updated ubuntu images ask user for approval now. Signed-off-by: David Matějček <[email protected]>
Merge of current master to 8.0
Handle covariant return types in TypeUtil.sameMethodSignature
Integrate Expressly 6.0.0
Add data api
Update versions in pom
Add manifest for jakarta data api jar
Appclient, CDI, validation, Faces, Servlet, JSP
Add missing EE 11 schemas
Initial rough integration of JNoSQL Jakarta Data
Added ClassScanner bridge to Types into during deployment. Temporarily added NoSQL metadata provider classes from jnosql reflection module, to fix deployment errors. Still some issues after an app is deployed - AbstractBean, defined in not in a bean archive. While this works in Java SE. I added code that registers JNoSQL modules as bean archives, so that CDI.current() in AbstracBean works. Still getting some exceptions when calling a repository method.
- Removed unnecessary ServerModuleCdiRegistry. Define all CDI beans in a CDI extension instead
Add support for getting the current deployment context from the thread context. Implemented GlassFish-specific ClassScanner via GlassFish's Types instance retrieved from the current deployment context.
…ments - integrate new snapshot of JNoSQL to support multiple entity managers - refactor the CDI extension - Add @repository as bean-defining annotation as mandated by the Data spec - support injecting EMs by @nAmed with persistence unit name
Mark CDI container as a dependency of Config container. Fix loading of dependencies - load dependencies first, not after. Fixes Error occurred during deployment: Exception while loading the app : CDI deployment failure: WELD-001408: Unsatisfied dependencies for type Optional<String> with qualifiers @ConfigProperty - caused because Config container couldn't register CDI extension because Weld container was starting later
…jection Start CDI container before MP Config container
Merge main into 8.0
Update poms and add exclusions for EE 12 versions
Fixes for MP Config
Weld is an optional dependency of config - if no CDI, config won't register a CDI extension
It's now legal to have no provider for a required deployer dependency if it's optional
Before the app deployments were being created in ./${project.build.directory}/deployments, and not in ./target/deployments.
I copied arquillian.xml to each TCK runner - it's not clean to depend on files outside of the project directory.
Fix mp config cdi injection
Some finetuning for closing jar and when undeploying
Update documentation building for 8.x
Add MVC TCK and a patch for Krazo
Add copy class command for Krazo jar
Contributor
|
I would like to merge #25816 first, I would have to create a new PR to 7.x otherwise. It requires to release Faces TCK 4.0.4. |
Signed-off-by: David Matějček <[email protected]>
Contributor
|
I had to fix conflicts - that means using 8.0 state, because Faces TCK in master uses newer changes of older version. |
dmatej
approved these changes
Dec 17, 2025
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.
No description provided.