SRVLOGIC-633: Main sync with manual conflict resolution using "ours" #129
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
…ithout preceding white-space (apache#5698)
* Add missing `@Test` annotation * Fix a typo in method name
apache#5751) * [incubator-kie-drools#5743] Update Developer_Notes.md to be community-friendly * Update drools-drl/drools-drl-parser/Developer_Notes.md Co-authored-by: Jiří Locker <[email protected]> * Update drools-drl/drools-drl-parser/Developer_Notes.md Co-authored-by: Jiří Locker <[email protected]> * - Add Design notes --------- Co-authored-by: Jiří Locker <[email protected]>
apache#5767) * [incubator-kie-drools#5705] [new-parser] no viable alternative after contains operator * - Add comment * Update drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java Co-authored-by: Jiří Locker <[email protected]> * Update drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java Co-authored-by: Jiří Locker <[email protected]> * Update drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java Co-authored-by: Jiří Locker <[email protected]> * Update drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java Co-authored-by: Jiří Locker <[email protected]> * - add javadoc to ParserHelper.isPluggableEvaluator --------- Co-authored-by: Jiří Locker <[email protected]>
…d name is a drl keyword (apache#5783)
As in `String(this == "x")`.
…en (apache#5790) * [incubator-kie-drools#5706] Grouped accessors for nested objects broken * Update drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java Co-authored-by: Jiří Locker <[email protected]> * Update drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java Co-authored-by: Jiří Locker <[email protected]> --------- Co-authored-by: Jiří Locker <[email protected]>
apache#5793) * [incubator-kie-drools#5708] [new-parser] function definition causes an error * - enhance getTextPreservingWhitespace to avoid string manipulation
* LHS patterns can have annotations * LHS pattern annotations can contain chunks
…om new) in a query (apache#5795)
* [incubator-kie-drools#5711] Broken OOPath expressions * accept mixing OOPath and standard constraint
…pache#5812) * Improve no viable alternative example * Complete support for built-in operators * Enable soundslike test * Remove obsolete comment Co-authored-by: Toshiya Kobayashi <[email protected]> --------- Co-authored-by: Toshiya Kobayashi <[email protected]>
* Allow semicolon after type declaration end * Allow DRL keywords to be used as field names in type declarations
…che#5827) * [incubator-kie-drools-5798] [new-parser] Ensure Descr properties * [incubator-kie-issues#5798] Proposal * minor fix --------- Co-authored-by: Gabriele-Cardosi <[email protected]>
apache#5831) * [incubator-kie-drools-5716] [new-parser] mismatched input 'if'/'do' (support named consequences) * Update drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLLexer.g4 Co-authored-by: Jiří Locker <[email protected]> * Update drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java Co-authored-by: Jiří Locker <[email protected]> * resolve duplicate difinition --------- Co-authored-by: Jiří Locker <[email protected]>
…ex 0 out of bounds for length 0 (apache#6413) * Fixing index out of bound and Required input not foubd issues * Fixing review comments * Fixing review comments * Adding license header to test dmn files * unit tests * Fixing review comments. adding check to verify source and target classes * removing unused dmn files
Updates the configuration so the repository builds and runs on both Java 21 and Java 17.
…eclared type (apache#6414) * [incubator-kie-drools-6037] exec-model doesn't populate metadata of declared type - WIP : test case only * WIP: class level annotation * field level annotation * Update drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/declaredtype/DescrTypeDefinition.java Co-authored-by: Copilot <[email protected]> * little refactor. Do not add metadata when UnknownKeysInAnnotation --------- Co-authored-by: Copilot <[email protected]>
…signment (apache#6406) * [incubator-kie-issue#2018] fix transitive import * [incubator-kie-issue#2018] fix transitive import * [incubator-kie-issue#2018] fix transitive import * [incubator-kie-issue#2018] fix transitive import test cases * [incubator-kie-issue#2018] fix transitive import test cases * [incubator-kie-issue#2018] wip * [incubator-kie-issues#2018] WIP * [incubator-kie-issues#2018] WIP * Changed dependency key to namespace.name. * Move the test files into DMN test resources jar. * [incubator-kie-issue#2018] wip * [incubator-kie-issue#2018] Fix testcases * [incubator-kie-issue#2018] Fix testcases * [incubator-kie-issue#2018] Code cleanup * [incubator-kie-issue#2018] Code cleanup * [incubator-kie-issue#2018] Test case updates * [incubator-kie-issue#2018] Test case updates * [incubator-kie-issue#2018] Code cleanup * [incubator-kie-issues#2018] Small refactoring --------- Co-authored-by: athira <[email protected]> Co-authored-by: Gabriele-Cardosi <[email protected]> Co-authored-by: Tibor Zimányi <[email protected]>
…d imported Elements (apache#6425) * Bug fix - Decision Services doesn't work with unnamed imported Elements * Code Refactoring and Junits * Unit test for inputQualifiedNamePrefix method * Fixing review comments * Fixing review comments * Change Request --------- Co-authored-by: ChinchuAjith <[email protected]>
…es with inherited decisions (apache#6426) * [incubator-kie-issues#2064] Fixing usage of duplicated Input Data nodes with inherited decisions * [incubator-kie-issues#2064] Missing headers --------- Co-authored-by: Gabriele-Cardosi <[email protected]>
…cutor (apache#6424) * [incubator-kie-issue#2062] code changes for strict/lenient error handling * [incubator-kie-issue#2062] update license header * [incubator-kie-issue#2062] fix review comment --------- Co-authored-by: athira <[email protected]>
…ort name and the inputName is same (apache#6427) * [incubator-kie-issues#2065] WIP - more analysis, refactoring and unit test needed * [incubator-kie-issues#2065] WIP - Split DMNRuntimeImpl with DMNRuntimeUtils. Extend test cases with clashing complex type * [incubator-kie-issues#2065] Refactoring. Extending test coverage * [incubator-kie-issues#2065] Fix as per PR suggestion --------- Co-authored-by: Gabriele-Cardosi <[email protected]>
…ools Build on Semeru JDK 21 (apache#6429) * Upgrading Archunit Maven plugin to 4.0.2 * Added JDK-specific ArchUnit plugin profiles for Java 17 and Java 21. * Added JDK-specific ArchUnit plugin profiles for Java 17 and Java 21. * Fixing review comments
…e' property in Temporal Types (apache#6432) * [incubator-kie-issue#2074] fix compilation error while using value property * [incubator-kie-issue#2074] code cleanup * [incubator-kie-issue#2074] Update testcase * [incubator-kie-issue#2074] Update testcase * [incubator-kie-issue#2074] Update testcase * [incubator-kie-issue#2074] Update testcase --------- Co-authored-by: athira <[email protected]>
apache#6437) * [incubator-kie-drools-6436] Review SetEvaluatorsDefinition and MatchesEvaluatorsDefinition * fix verifier rules
* Cleanup of segment memories * Fixed order of parameters
* First set of removals * More removals for getKnowledgeBase * Inlined method and removed parameter * Partial revert - maybe we have issues with serialization
…ge (apache#6443) * [incubator-kie-issues#2083] Fix correct overrides of expressionLanguage * [incubator-kie-issues#2083] Split test --------- Co-authored-by: Gabriele-Cardosi <[email protected]>
apache#6419) * [incubator-kie-drools-6410] Multiple rules in an activation group can fire for matches with multiple conditions * add comment * cleanup
apache#6430) * [incubator-kie-drools-6420] modify or update in DRL causing rules with eval condition to fire even when pattern constraints are not matching - Test case only * - Add more tests - Revert disablePropertyReactivity (DROOLS-7255), so JoinNode before Eval is back to property reactive, considering it's relatively consistent. See PR 6430 discussion * comment
…ode (apache#6446) * [incubator-kie-issues#2084] Updating decisionresult status on strictMode * [incubator-kie-issues#2084] Cleanup --------- Co-authored-by: Gabriele-Cardosi <[email protected]>
apache#6447) * [incubator-kie-drools-6421] Rules in agenda group with auto-focus may not fire immediately (or at all) after activation - Insert case * cleanup
* Removing ReteEvaluator from mvel * Removed deps of core from drools-mvel * More cleanups
|
This is nice, do you intend to do the same for the other repos? |
Yes, finishing for the kogito-apps only |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
27 participants
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.
JIRA https://issues.redhat.com/browse/SRVLOGIC-633
Important: ❗
Please use merge pull request, not squash to have the commits on
mainand do a backup ofmainbranch.Note:
This PR brings upstream commits without changing the codebase using:
This is to reconcile the history with upstream, without changing anything in our codebase.
The SHA in the command is the last upstream commit already synced.
Test sync action on my fork: https://github.com/fantonangeli/incubator-kie-drools/actions/runs/18345473950
Auto generated sync PR from the GHA: fantonangeli#2
Description:
As part of the jira and the PR the CI needs a merge with a manual resolve of conflicts to be able to run successfully.
This PR is basically a merge from upstream/main with manual conflict resolution and exclusion of: .ci .github .asf.yaml.
Please double-check if the resolution went well.
I also suggest to copy/backup the main branch if we want to merge this PR.