Skip to content

Commit

Permalink
Merge main-apache and exclude white-listed changes from the merge
Browse files Browse the repository at this point in the history
  • Loading branch information
fantonangeli committed Oct 3, 2024
2 parents 562a596 + e82369e commit 91f88ed
Show file tree
Hide file tree
Showing 485 changed files with 9,447 additions and 1,810 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,20 @@ packages/scesim-marshaller/**/ts-gen
!packages/sonataflow-builder-image/test-resources/
!packages/sonataflow-devmode-image/test-resources/

# kogito-images: excluding test-resources
!packages/kogito-data-index-ephemeral-image/test-resources/
!packages/kogito-data-index-postgresql-image/test-resources/
!packages/kogito-jobs-service-ephemeral-image/test-resources/
!packages/kogito-jobs-service-postgresql-image/test-resources/
!packages/kogito-jobs-service-allinone-image/test-resources/
!packages/kogito-jit-runner-image/test-resources/

__pycache__
packages/python-venv/venv

# devbox
.devbox

# turbo
.turbo
turbo.json
10 changes: 10 additions & 0 deletions .syncpackrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
"@kie-tools/uniforms-patternfly-codegen",
"@kie-tools/yaml-language-server"
]
},
{
"dependencies": ["react", "react-dom"],
"policy": "sameRange"
},
{
"label": "Use workspace protocol when developing local packages",
"dependencies": ["$LOCAL"],
"dependencyTypes": ["prod", "dev"],
"pinVersion": "workspace:*"
}
]
}
2 changes: 1 addition & 1 deletion KOGITO_UPGRADE_PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ You can find an example of the Quarkus upgrade in [this PR](https://github.com/a

# Upgrading Kogito

In the root directory, run `pnpm update-kogito-version-to --maven [version] --images-tag [tag]`.
In the root directory, run `pnpm update-kogito-version-to --maven [version]`.

Of course, a new Kogito version may lead to incompatibilities in the code and with other dependencies. In such a case, an investigation and evetually a fix is required to complete the process.

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ To build and test all packages of the Apache KIE Tools project, you're going to
- Python `3.12` _(To install, follow these instructions: https://www.python.org/downloads/)_
- Helm `3.13.3` _(To install, follow these instructions: https://helm.sh/docs/intro/install/)_
- Make
- xmllint _(To install, follow these instructions: https://www.baeldung.com/linux/xmllint)_
- bash `5.x` _(On Linux or Nix you should be fine. On macOS, follow these instructions to use zsh: https://support.apple.com/102360)_

> **ℹ️ NOTE**
>
Expand Down
6 changes: 4 additions & 2 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@
"kubernetes-helm": "3.13.3",
"gnumake": "4.4.1",
"go": "1.21.9",
"python": "3.12.2"
"python": "3.12.2",
"libxml2": "2.13.3"
},
"env": {
"PLAYWRIGHT_BROWSERS_PATH": "0",
"PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS": "true",
"DEVBOX_COREPACK_ENABLED": "true",
"GOFLAGS": "-modcacherw",
"GOPATH": "$DEVBOX_PROJECT_ROOT/.devbox/gopkgs",
"PATH": "$DEVBOX_PROJECT_ROOT/.devbox/gopkgs/bin:$PATH"
"PNPM_HOME": "$DEVBOX_PROJECT_ROOT/.devbox/pnpm-store",
"PATH": "$DEVBOX_PROJECT_ROOT/.devbox/gopkgs/bin:$DEVBOX_PROJECT_ROOT/.devbox/pnpm-store:$PATH"
},
"shell": {
"init_hook": [
Expand Down
106 changes: 105 additions & 1 deletion devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,110 @@
}
}
},
"[email protected]": {
"last_modified": "2024-09-12T11:58:09Z",
"resolved": "github:NixOS/nixpkgs/280db3decab4cbeb22a4599bd472229ab74d25e1#libxml2",
"source": "devbox-search",
"version": "2.13.3",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "bin",
"path": "/nix/store/7gi1kd2mz9jc8ya4lkqhlv9vklc5qr2j-libxml2-2.13.3-bin",
"default": true
},
{
"name": "dev",
"path": "/nix/store/mnij865rdzrrnxqmhj4s0abmd1xx771v-libxml2-2.13.3-dev"
},
{
"name": "devdoc",
"path": "/nix/store/80bkizndgvrqiq42ig681irxswsf4kxv-libxml2-2.13.3-devdoc"
},
{
"name": "out",
"path": "/nix/store/sr8lnkgivqcd06113nsk5p3jz2xcx7rp-libxml2-2.13.3"
}
],
"store_path": "/nix/store/7gi1kd2mz9jc8ya4lkqhlv9vklc5qr2j-libxml2-2.13.3-bin"
},
"aarch64-linux": {
"outputs": [
{
"name": "bin",
"path": "/nix/store/gxpp5r2nbs3s0n5rw0jbnm1k5lhxrx13-libxml2-2.13.3-bin",
"default": true
},
{
"name": "devdoc",
"path": "/nix/store/0qnymx6l3c7998yscwvr1q64iz447hfc-libxml2-2.13.3-devdoc"
},
{
"name": "out",
"path": "/nix/store/da857dg9ip02lkci5nicgvkzf419jzc7-libxml2-2.13.3"
},
{
"name": "py",
"path": "/nix/store/qfpnqradhvhicl1hm70w7891bk95lkad-libxml2-2.13.3-py"
},
{
"name": "dev",
"path": "/nix/store/dph7mh2dhl8sl4i44wlgnmsrwdlcv0bc-libxml2-2.13.3-dev"
}
],
"store_path": "/nix/store/gxpp5r2nbs3s0n5rw0jbnm1k5lhxrx13-libxml2-2.13.3-bin"
},
"x86_64-darwin": {
"outputs": [
{
"name": "bin",
"path": "/nix/store/gg4x2l8wy3lkd94bxpl0z7gnn9pa365i-libxml2-2.13.3-bin",
"default": true
},
{
"name": "dev",
"path": "/nix/store/pzakdvnmm99gic3mqyg8375b08dvkqxm-libxml2-2.13.3-dev"
},
{
"name": "devdoc",
"path": "/nix/store/xa27lhlrc2ya3i67g7nz53g64l3wqvjw-libxml2-2.13.3-devdoc"
},
{
"name": "out",
"path": "/nix/store/ac73mddfvraxgvd816r9h57df35mm6gd-libxml2-2.13.3"
}
],
"store_path": "/nix/store/gg4x2l8wy3lkd94bxpl0z7gnn9pa365i-libxml2-2.13.3-bin"
},
"x86_64-linux": {
"outputs": [
{
"name": "bin",
"path": "/nix/store/2y4a178s4w60v4m8749xhaawf8ga7cw5-libxml2-2.13.3-bin",
"default": true
},
{
"name": "dev",
"path": "/nix/store/v40g7q9zix1ycpyara08brd50m00471n-libxml2-2.13.3-dev"
},
{
"name": "devdoc",
"path": "/nix/store/cs49b70qkgygx0wxcl04dpy1d1g5vb91-libxml2-2.13.3-devdoc"
},
{
"name": "out",
"path": "/nix/store/nr8mh99sfsb1gw1b1qmrwhzmxbhj84j7-libxml2-2.13.3"
},
{
"name": "py",
"path": "/nix/store/p17nrcsmvb0q7b9g6347imljapbfcsb1-libxml2-2.13.3-py"
}
],
"store_path": "/nix/store/2y4a178s4w60v4m8749xhaawf8ga7cw5-libxml2-2.13.3-bin"
}
}
},
"[email protected]": {
"last_modified": "2024-03-22T11:26:23Z",
"resolved": "github:NixOS/nixpkgs/a3ed7406349a9335cb4c2a71369b697cecd9d351#maven",
Expand Down Expand Up @@ -304,7 +408,7 @@
},
"[email protected]": {
"last_modified": "2024-03-22T11:26:23Z",
"plugin_version": "0.0.3",
"plugin_version": "0.0.4",
"resolved": "github:NixOS/nixpkgs/a3ed7406349a9335cb4c2a71369b697cecd9d351#python312",
"source": "devbox-search",
"version": "3.12.2",
Expand Down
8 changes: 5 additions & 3 deletions examples/base64png-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
"@kie-tools-core/patternfly-base": "workspace:*",
"@kie-tools-core/workspace": "workspace:*",
"@patternfly/react-core": "^4.276.6",
"@patternfly/react-icons": "^4.93.6",
"react": "^17.0.2",
"react-dom": "^17.0.2"
"@patternfly/react-icons": "^4.93.6"
},
"devDependencies": {
"@kie-tools/root-env": "workspace:*",
Expand All @@ -40,5 +38,9 @@
"copyfiles": "^2.4.1",
"rimraf": "^3.0.2",
"typescript": "^5.5.3"
},
"peerDependencies": {
"react": ">=17.0.2 <19.0.0",
"react-dom": ">=17.0.2 <19.0.0"
}
}
18 changes: 9 additions & 9 deletions examples/jbpm-compact-architecture-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ This example showcases a basic implementation of the **Hiring** process that dri
interviews until he gets hired.

This quickstart project shows a simple example user task orchestration including the use of DMN decisions to
generate the candidate offer and tºimers to skip User Tasks.
generate the candidate offer and timers to skip User Tasks.

This example also demonstrates how to configure the whole _Kogito_ environment using the new _Compact Architecture_ that
enable simplifying the communication among _Kogito_ services removing the need of events (Kafka/HTTP) between them. This can
be achieved using the following _Quarkus_ addons:

- `kogito-addons-quarkus-data-index-persistence-postgresql`: enables the _Kogito Runtime_ persisting directly into the
- `kogito-addons-quarkus-data-index-postgresql`: enables the _Kogito Runtime_ persisting directly into the
_Data-Index_ database.
- `kogito-addons-quarkus-jobs`: enables collocating the _Jobs Service_ inside the _Kogito Runtime_.

Expand Down Expand Up @@ -321,7 +321,8 @@ Candidate Jon Snow don't meet the requirements for the position but we'll keep i

### Using Keycloak as Authentication Server

In this Quickstart we'll be using [Keycloak](https://www.keycloak.org/) as _Authentication Server_. It will be started as a part of the project _Infrastructure Services_, you can check the configuration on the project [docker-compose.yml](docker-compose/docker-compose.yml) in [docker-compose](docker-compose) folder.
In this Quickstart we'll be using [Keycloak](https://www.keycloak.org/) as _Authentication Server_ for _Kogito Task Console_. It will be started
as a part of the project _Infrastructure Services_, you can check the configuration on the project [docker-compose.yml](docker-compose/docker-compose.yml) in [docker-compose](docker-compose) folder.

It will install the _Kogito Realm_ that comes with a predefined set of users:

Expand All @@ -333,7 +334,7 @@ It will install the _Kogito Realm_ that comes with a predefined set of users:

Once Keycloak is started, you should be able to access your _Keycloak Server_ at [localhost:8480/auth](http://localhost:8480/auth) with _admin_ user.

> **_NOTE:_** This example uses keycloak authentication to enable security only in the consoles not in runtime.
> **_NOTE:_** This example uses keycloak authentication to enable security only in the _Kogito Task Console_ not for the Kogito Runtime.
### Using the Kogito Runtime Consoles to interact with the Hiring Process

Expand Down Expand Up @@ -370,10 +371,8 @@ In this guide we'll see how to use the _Kogito Management Console_ to view the s
Which indicates that a new process instance with id **064a6372-b5bb-4eff-a059-d7b24d4ac64a** has been started.

2. Now let's check the process instance state with the _Kogito Management Console_. To do so, in your browser navigate
to http://localhost:8280 and log in using any of the users specified in the [Using Keycloak as Authentication Server](#using-keycloak-as-authentication-server).

Once you are logged in, you should be redirected to the **Process Instances** page where you should be able to see
the started process instance in active state.
to http://localhost:8280 and you'll be redirected to the **Process Instances** page in the _Kogito Management Console_.
There where you should be able to see the started process instance in active state.

<div style="text-align:center;">
<figure>
Expand All @@ -382,7 +381,8 @@ In this guide we'll see how to use the _Kogito Management Console_ to view the s
</figure>
</div>

3. Click on the instance **id** to navigate into the _Process Details_ page. In there you'll be able to see different panels displaying relevant information about the instance state, such as the _Diagram_, _Timeline_, _Details_, _Variables_, _Jobs_...
3. Click on the instance **id** to navigate into the _Process Details_ page. In there you'll be able to see different panels
displaying relevant information about the instance state, such as the _Diagram_, _Timeline_, _Details_, _Variables_, _Jobs_...

<div style="text-align:center">
<figure>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ To allow a quick setup of all services required to run this demo, we provide a d

- Postgresql
- PgAdmin
- Kogito Example Service (Only available if the example has been compiled using the `container` mvn profile eg: `mvn cleanp package -Dcontainer`)
- Kogito Example Service (Only available if the example has been compiled using the `container` mvn profile eg: `mvn clean package -Dcontainer`)
- Kogito Management Console
- Kogito Task Console
- Keycloak

The docker compose template provides three profiles to enable starting only the set of services you want to use. The profiles are:

- **infra**: Starts only the minimal infrastructure to run the example (Postgresql, pgadmin, Kogito Data Index)
- **example**: Starts the services in _infra_ profile and the Kogito Example Service. Requires the example to be compiled using the `container` mvn profile eg: `mvn cleanp package -Dcontainer`.
- **full** (default): includes all the above and also starts the **Management Console**, **Task Console** and a **Keycloak** to handle the consoles authentication. Requires the example to be compiled using the `container` mvn profile eg: `mvn cleanp package -Dcontainer`.
- **example**: Starts the services in _infra_ profile and the Kogito Example Service. Requires the example to be compiled using the `container` mvn profile eg: `mvn clean package -Dcontainer`.
- **full** (default): includes all the above and also starts the **Management Console**, **Task Console** and a **Keycloak** to handle the consoles authentication. Requires the example to be compiled using the `container` mvn profile eg: `mvn clean package -Dcontainer`.

> NOTE: In order to use it, please ensure you have Docker Compose installed on your machine, otherwise follow the instructions available
> in [here](https://docs.docker.com/compose/install/).
Expand Down
6 changes: 0 additions & 6 deletions examples/jbpm-compact-architecture-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,6 @@
<artifactId>kogito-addons-quarkus-data-index-postgresql</artifactId>
</dependency>

<!-- Data Index Persistence -->
<dependency>
<groupId>org.kie</groupId>
<artifactId>kogito-addons-quarkus-data-index-persistence-postgresql</artifactId>
</dependency>

<!-- Jobs Service -->
<dependency>
<groupId>org.kie</groupId>
Expand Down
8 changes: 5 additions & 3 deletions examples/ping-pong-view-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
"dependencies": {
"@kie-tools-core/envelope": "workspace:*",
"@kie-tools-core/envelope-bus": "workspace:*",
"@kie-tools-examples/ping-pong-view": "workspace:*",
"react": "^17.0.2",
"react-dom": "^17.0.2"
"@kie-tools-examples/ping-pong-view": "workspace:*"
},
"devDependencies": {
"@kie-tools/root-env": "workspace:*",
Expand All @@ -37,5 +35,9 @@
"copyfiles": "^2.4.1",
"rimraf": "^3.0.2",
"typescript": "^5.5.3"
},
"peerDependencies": {
"react": ">=17.0.2 <19.0.0",
"react-dom": ">=17.0.2 <19.0.0"
}
}
8 changes: 5 additions & 3 deletions examples/ping-pong-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
},
"dependencies": {
"@kie-tools-core/envelope": "workspace:*",
"@kie-tools-core/envelope-bus": "workspace:*",
"react": "^17.0.2",
"react-dom": "^17.0.2"
"@kie-tools-core/envelope-bus": "workspace:*"
},
"devDependencies": {
"@kie-tools/root-env": "workspace:*",
Expand All @@ -32,5 +30,9 @@
"@types/react-dom": "^17.0.5",
"rimraf": "^3.0.2",
"typescript": "^5.5.3"
},
"peerDependencies": {
"react": ">=17.0.2 <19.0.0",
"react-dom": ">=17.0.2 <19.0.0"
}
}
8 changes: 5 additions & 3 deletions examples/todo-list-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
},
"dependencies": {
"@kie-tools-core/envelope": "workspace:*",
"@kie-tools-core/envelope-bus": "workspace:*",
"react": "^17.0.2",
"react-dom": "^17.0.2"
"@kie-tools-core/envelope-bus": "workspace:*"
},
"devDependencies": {
"@kie-tools/root-env": "workspace:*",
Expand All @@ -35,5 +33,9 @@
"copyfiles": "^2.4.1",
"rimraf": "^3.0.2",
"typescript": "^5.5.3"
},
"peerDependencies": {
"react": ">=17.0.2 <19.0.0",
"react-dom": ">=17.0.2 <19.0.0"
}
}
4 changes: 3 additions & 1 deletion examples/uniforms-patternfly/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"@kie-tools/uniforms-patternfly": "workspace:*",
"@patternfly/react-core": "^4.276.6",
"@patternfly/react-icons": "^4.93.6",
"ajv": "^6.12.6",
"ajv": "^8.17.1",
"ajv-draft-04": "^1.0.0",
"ajv-formats": "^3.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"simpl-schema": "^1.12.0",
Expand Down
Loading

0 comments on commit 91f88ed

Please sign in to comment.