FISH-10738 Revert #7032 (FISH-10049) and #7097 (FISH-10286) #7245
+643
−1,323
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.
Description
Reverts #7032 and #7097, as they break the CDI TCK
A Jenkins misconfiguration had the build show as passing, but upon inspection of the logs there are 29 failures.
Important Info
Blockers
None
Testing
New tests
None
Testing Performed
Ran the CDI TCK, passes
Testing Environment
Jenkins
Documentation
N/A
Notes for Reviewers
None