Skip to content
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

Sync main branch with main-apache branch #1

Merged
merged 41 commits into from
Dec 15, 2023
Merged

Sync main branch with main-apache branch #1

merged 41 commits into from
Dec 15, 2023

Conversation

rgdoliveira
Copy link
Member

@rgdoliveira rgdoliveira commented Dec 13, 2023

Related PRs:

Thank you for submitting this pull request

NOTE!: Double check the target branch for this PR.
The default is main so it will target Drools 8 / Kogito.
If this PR is not strictly related to drools and kogito project in drools.git, it should probably target 7.xas a branch

Ports If a forward-port or a backport is needed, paste the forward port PR here

link

JIRA: (please edit the JIRA link if it exists)

link

referenced Pull Requests: (please edit the URLs of referenced pullrequests if they exist)

  • paste the link(s) from GitHub here
  • link 2
  • link 3 etc.
How to replicate CI configuration locally?

Build Chain tool does "simple" maven build(s), the builds are just Maven commands, but because the repositories relates and depends on each other and any change in API or class method could affect several of those repositories there is a need to use build-chain tool to handle cross repository builds and be sure that we always use latest version of the code for each repository.

build-chain tool is a build tool which can be used on command line locally or in Github Actions workflow(s), in case you need to change multiple repositories and send multiple dependent pull requests related with a change you can easily reproduce the same build by executing it on Github hosted environment or locally in your development environment. See local execution details to get more information about it.

How to retest this PR or trigger a specific build:
  • for pull request checks
    Please add comment: Jenkins retest this

  • for a specific pull request check
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] tests

  • for a full downstream build

    • for jenkins job: please add comment: Jenkins run fdb
    • for github actions job: add the label run_fdb
  • a compile downstream build please add comment: Jenkins run cdb

  • an upstream build please add comment: Jenkins run upstream

  • for quarkus branch checks
    Run checks against Quarkus current used branch
    Please add comment: Jenkins run quarkus-branch

  • for a quarkus branch specific check
    Run checks against Quarkus current used branch
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] quarkus-branch

  • for quarkus main checks
    Run checks against Quarkus main branch
    Please add comment: Jenkins run quarkus-main

  • for a specific quarkus main check
    Run checks against Quarkus main branch
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] quarkus-main

  • for quarkus lts checks
    Run checks against Quarkus lts branch
    Please add comment: Jenkins run quarkus-lts

  • for a specific quarkus lts check
    Run checks against Quarkus lts branch
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] quarkus-lts

  • for native checks
    Run native checks
    Please add comment: Jenkins run native

  • for a specific native check
    Run native checks
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] native

  • for native lts checks
    Run native checks against quarkus lts branch
    Please add comment: Jenkins run native-lts

  • for a specific native lts check
    Run native checks against quarkus lts branch
    Please add comment: Jenkins (re)run [drools|kogito-runtimes|kogito-apps|kogito-examples] native-lts

How to backport a pull request to a different branch?

In order to automatically create a backporting pull request please add one or more labels having the following format backport-<branch-name>, where <branch-name> is the name of the branch where the pull request must be backported to (e.g., backport-7.67.x to backport the original PR to the 7.67.x branch).

NOTE: backporting is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.

Once the original pull request is successfully merged, the automated action will create one backporting pull request per each label (with the previous format) that has been added.

If something goes wrong, the author will be notified and at this point a manual backporting is needed.

NOTE: this automated backporting is triggered whenever a pull request on main branch is labeled or closed, but both conditions must be satisfied to get the new PR created.

baldimir and others added 30 commits December 13, 2023 13:10
…che#5530)

* Align with Apache parent bom.

* Fix JavaDoc generation to original state.

* Add changes requested in PR review.
* Fix javadoc, sources and distribution generation.

* Remove duplicate javadoc plugin declaration.

* Fix alphanetworkcompiler Java module name.
… Drools (apache#5548)

* [DROOLS-7555] move automatic rest endpoints generation from Kogito to Drools

* wip
* updateObjectTypesList() improvements

* use isEmpty with findAny
apache#5553)

* Update repositories and other small changes to Apache

* Add missing mailing list configuration.
…itive type (apache#5567)

* Tests

* All tests passing

* Add integration tests.

* Revert "Add integration tests."

This reverts commit 98b9637.

---------

Co-authored-by: Tibor Zimányi <[email protected]>
Co-authored-by: Mario Fusco <[email protected]>
…odule (apache#5569)

* Fixed order of imports

* Fixed more checkstyle issues
…he#5576)

* [DROOLS-7584] process completely all facts inserted before halt

* fix imports order

* fix testModifyWithFromSudoku to meet halt() (#22)

---------

Co-authored-by: Toshiya Kobayashi <[email protected]>
…er module (apache#5574)

* Fixed imports

* Replaced tabs with spaces

* Fixed issues with missing braces

* fixed last class

* Reverted changes for generated files.

* Ignored warnings from generated files
* [KIE-686] fix peer update propagation for FromNode

* Update drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/UnexpectedLoopTest.java

Co-authored-by: Toshiya Kobayashi <[email protected]>

---------

Co-authored-by: Toshiya Kobayashi <[email protected]>
* Added better gradle compatibility to  AppPaths

* Updated headers to Apache

* Updated findBuildTool method to better identify gradle

* Reverted findBuildTool changes
mariofusco and others added 11 commits December 13, 2023 13:16
…sion .drl.yaml to be a native drools resource type (apache#5592)

* [KIE-724] allow to write rules in yaml format making files with extension .drl.yaml to be a native drools resource type

* add missing header
- additional fix in maven-compiler-plugin
…pache#5594)

- Introduced DeleteSpecificFactAction for retract_fact
- Add a test case
apache#5618)

* [KIE-748] drools executable-model fails with BigDecimal coercion for method arguments

* refactor
…pache#5620)

* Use UTF-8 when handling files and file content.

* Fix memory compiler to use UTF-8

* Fix QueryGenerator to use UTF-8.

* Revert selected fixes.
Copy link
Member

@ricardozanini ricardozanini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mariofusco @lucamolteni this is our tentative to keep a production branch aligned with upstream (ASF). We have brought everything but the ci changes since we will have our own process.

@ricardozanini
Copy link
Member

@rgdoliveira maybe we should take a look at the failed CI?

@rgdoliveira
Copy link
Member Author

rgdoliveira commented Dec 13, 2023

@ricardozanini I can be wrong, but the jobs that failed are using build-chain and it is probably trying to use branch main_merged for the build but in kiegroup/drools repository this branch doesn't exist, it exists just in kiegroup/drools-test.

So IMHO, we can ignore those failures until this repository become the official one and the current one is renamed and archived.

@rgdoliveira rgdoliveira merged commit 626f346 into main Dec 15, 2023
8 of 10 checks passed
@rgdoliveira rgdoliveira deleted the main_merged branch December 15, 2023 17:04
rgdoliveira pushed a commit that referenced this pull request Oct 25, 2024
…it5 - #1 (apache#6137)

* Initial test migration

* Migrated more unit tests

* Migrated more unit tests

* Fixed test

* More tests migrated to junit5

* Fixed test
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.