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 May 7, 2024
2 parents 756bf14 + 6411106 commit 475354a
Show file tree
Hide file tree
Showing 1,800 changed files with 173,477 additions and 49,739 deletions.
26 changes: 25 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,19 @@ packages/kie-sandbox-fs/coverage
packages/kie-sandbox-fs/junit
packages/kie-sandbox-fs/*-0.0.0-development.tgz

# kogito-serverless-operator
# These files are generated by Cekit, we can ignore the operator-sdk ones.
packages/kogito-serverless-operator/bundle.Dockerfile
packages/kogito-serverless-operator/Dockerfile
# Test binary, built with `go test -c`
packages/kogito-serverless-operator/**/*.test
# Output of the go coverage tool, specifically when used with LiteIDE
packages/kogito-serverless-operator/**/*.out
# Build
packages/kogito-serverless-operator/bin/
packages/kogito-serverless-operator/target/
packages/kogito-serverless-operator/e2e-test-report.xml

#angular
**/.angular

Expand Down Expand Up @@ -279,5 +292,16 @@ packages/bpmn-marshaller/**/ts-gen
packages/dmn-marshaller/**/ts-gen
packages/scesim-marshaller/**/ts-gen

# kogito-sf-{builder|devmode}-image: excluding module build folders
!packages/kogito-swf-common/resources/**/build
!packages/kogito-swf-builder/resources/**/build
!packages/kogito-swf-devmode/resources/**/build
!packages/kogito-swf-common/test-resources/
!packages/kogito-swf-builder/test-resources/
!packages/kogito-swf-devmode/test-resources/

__pycache__
packages/python-venv/venv

# devbox
.devbox
.devbox
13 changes: 7 additions & 6 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,24 @@
"kubernetes-helm": "3.13.3",
"gnumake": "4.4.1",
"go": "1.21.8",
"python": "3.12.2",
"operator-sdk": "1.34.1",
"kubebuilder": "3.14.0"
"python": "3.12.2"
},
"env": {
"PLAYWRIGHT_BROWSERS_PATH": "0",
"PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS": "true",
"DEVBOX_COREPACK_ENABLED": "true",
"GOFLAGS": "-modcacherw",
"GOPATH": "$DEVBOX_PROJECT_ROOT/.devbox/gopkgs",
"PATH": "$PATH:$DEVBOX_PROJECT_ROOT/.devbox/gopkgs/bin"
"PATH": "$DEVBOX_PROJECT_ROOT/.devbox/gopkgs/bin:$PATH"
},
"shell": {
"init_hook": [". $VENV_DIR/bin/activate"],
"init_hook": [
". $VENV_DIR/bin/activate",
"[[ $OSTYPE == 'darwin'* ]] && export PATH=$(echo $PATH | tr ':' '\n' | grep -vi 'xcode\\|clang\\|cctools' | paste -sd ':' -)"
],
"scripts": {
"versions": [
"java --version && mvn -v && node -v && pnpm -v && go version && helm version && make -v && python --version && pip --version"
"java --version && mvn -v && node -v && pnpm -v && go version && helm version && make -v && python3 --version && pip3 --version"
]
}
}
Expand Down
96 changes: 0 additions & 96 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -141,54 +141,6 @@
}
}
},
"[email protected]": {
"last_modified": "2024-03-22T07:26:23-04:00",
"resolved": "github:NixOS/nixpkgs/a3ed7406349a9335cb4c2a71369b697cecd9d351#kubebuilder",
"source": "devbox-search",
"version": "3.14.0",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/hdggigkq5ibqvk3ksmq7cwlyn1l2gdsv-kubebuilder-3.14.0",
"default": true
}
],
"store_path": "/nix/store/hdggigkq5ibqvk3ksmq7cwlyn1l2gdsv-kubebuilder-3.14.0"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/7ykpi9d6jd4zhxs5c6lfbb9p5kgm5m3p-kubebuilder-3.14.0",
"default": true
}
],
"store_path": "/nix/store/7ykpi9d6jd4zhxs5c6lfbb9p5kgm5m3p-kubebuilder-3.14.0"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/jpqwxd42bcfkxljy0pkqagbnpifdxvpx-kubebuilder-3.14.0",
"default": true
}
],
"store_path": "/nix/store/jpqwxd42bcfkxljy0pkqagbnpifdxvpx-kubebuilder-3.14.0"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/c492irdhgzr6wbl6zggn5bw23dlgxb9r-kubebuilder-3.14.0",
"default": true
}
],
"store_path": "/nix/store/c492irdhgzr6wbl6zggn5bw23dlgxb9r-kubebuilder-3.14.0"
}
}
},
"[email protected]": {
"last_modified": "2024-01-27T14:55:31Z",
"resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#kubernetes-helm",
Expand Down Expand Up @@ -350,54 +302,6 @@
}
}
},
"[email protected]": {
"last_modified": "2024-03-22T07:26:23-04:00",
"resolved": "github:NixOS/nixpkgs/a3ed7406349a9335cb4c2a71369b697cecd9d351#operator-sdk",
"source": "devbox-search",
"version": "1.34.1",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/39bndv1fk8rrdi1a0xlfaw5qhgylnzkk-operator-sdk-1.34.1",
"default": true
}
],
"store_path": "/nix/store/39bndv1fk8rrdi1a0xlfaw5qhgylnzkk-operator-sdk-1.34.1"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/n9ln3a2whzwp0x2ik3rxh10wn7ra85r5-operator-sdk-1.34.1",
"default": true
}
],
"store_path": "/nix/store/n9ln3a2whzwp0x2ik3rxh10wn7ra85r5-operator-sdk-1.34.1"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/y0vi2nvhsgakbvlmbhdpsqdnl83l8q65-operator-sdk-1.34.1",
"default": true
}
],
"store_path": "/nix/store/y0vi2nvhsgakbvlmbhdpsqdnl83l8q65-operator-sdk-1.34.1"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/h607xcilqpwsc0mna9bc6yilj4v3q4y3-operator-sdk-1.34.1",
"default": true
}
],
"store_path": "/nix/store/h607xcilqpwsc0mna9bc6yilj4v3q4y3-operator-sdk-1.34.1"
}
}
},
"[email protected]": {
"last_modified": "2024-03-22T11:26:23Z",
"plugin_version": "0.0.3",
Expand Down
6 changes: 3 additions & 3 deletions examples/commit-message-validation-service/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ require (
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions examples/commit-message-validation-service/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,19 @@ golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUu
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
Expand Down
Loading

0 comments on commit 475354a

Please sign in to comment.