From 5f57f14460afb6287495da6009ae3a3a685f11ee Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Fri, 13 Dec 2024 08:39:04 -0500 Subject: [PATCH 1/7] NO-ISSUE: fix issue when using image digest in Operator Makefile (#2804) --- packages/sonataflow-operator/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/sonataflow-operator/Makefile b/packages/sonataflow-operator/Makefile index fe3cdd9eeb6..1aafc812e07 100644 --- a/packages/sonataflow-operator/Makefile +++ b/packages/sonataflow-operator/Makefile @@ -64,13 +64,15 @@ BUILDER ?= docker # USE_IMAGE_DIGESTS defines if images are resolved via tags or digests # You can enable this value if you would like to use SHA Based Digests # To enable set flag to true +IMG_TAG_SEP = : USE_IMAGE_DIGESTS ?= false ifeq ($(USE_IMAGE_DIGESTS), true) BUNDLE_GEN_FLAGS += --use-image-digests + IMG_TAG_SEP = @ endif # Image URL to use all building/pushing image targets -IMG ?= $(IMAGE_TAG_BASE):$(IMAGE_TAG) +IMG ?= $(IMAGE_TAG_BASE)$(IMG_TAG_SEP)$(IMAGE_TAG) # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.26 From ed78bdbf3a6ccebb8c704c8dc39b4d3380194148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luiz=20Jo=C3=A3o=20Motta?= Date: Sun, 15 Dec 2024 11:59:52 -0300 Subject: [PATCH 2/7] NO-ISSUE: Disable AppArmor allowing unpriviledge user namespace to fix VS Code E2E tests (#2808) --- .github/actions/setup-env/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index d10f0cd9138..ba701e7e763 100644 --- a/.github/actions/setup-env/action.yml +++ b/.github/actions/setup-env/action.yml @@ -246,6 +246,11 @@ runs: libxml2-utils > /dev/null 2>&1 fi + - name: "Allow unprivileged user namespace (Ubuntu Only)" + if: runner.os == 'Linux' + shell: bash + run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 + - name: "Update bash for macOS (macOS Only)" shell: bash if: runner.os == 'macOS' From 5527e78780f45212d6c963b6d97c2d2e9b918a7d Mon Sep 17 00:00:00 2001 From: Tiago Bento <1584568+tiagobento@users.noreply.github.com> Date: Sun, 15 Dec 2024 22:26:53 -0300 Subject: [PATCH 3/7] kie-issues#1690: Apache KIE trademark character missing on Extended Services VS Code Extension's name (#2810) --- packages/extended-services-java/pom.xml | 2 +- .../extended-services-vscode-extension/package.json | 12 ++++++------ .../src/Validator.ts | 2 +- .../src/configurations/Configuration.ts | 2 +- .../src/extension/extension-browser.ts | 6 +++--- .../src/extension/extension-main.ts | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/extended-services-java/pom.xml b/packages/extended-services-java/pom.xml index 2b9f30df4c4..b8b17ac6bc9 100644 --- a/packages/extended-services-java/pom.xml +++ b/packages/extended-services-java/pom.xml @@ -33,7 +33,7 @@ org.kie.tools extended-services-java - KIE Tools :: KIE Sandbox :: Extended Services Quarkus app + KIE Tools :: Extended Services Quarkus app Quarkus-based application that wraps Kogito JIT Executor for consumption as a KIE Sandbox backend. diff --git a/packages/extended-services-vscode-extension/package.json b/packages/extended-services-vscode-extension/package.json index 824e46cb458..78bda18b814 100644 --- a/packages/extended-services-vscode-extension/package.json +++ b/packages/extended-services-vscode-extension/package.json @@ -53,7 +53,7 @@ "engines": { "vscode": "^1.67.0" }, - "displayName": "Apache KIE Extended Services", + "displayName": "Apache KIE™ Extended Services", "categories": [ "Other" ], @@ -62,13 +62,13 @@ { "category": "Extended-Services", "command": "extended-services-vscode-extension.startExtendedServices", - "title": "Connect Apache KIE Extended-Services", + "title": "Connect Apache KIE™ Extended Services", "when": "extended-services-vscode-extension.connected" }, { "category": "Extended-Services", "command": "extended-services-vscode-extension.stopExtendedServices", - "title": "Disconnect Apache KIE Extended-Services" + "title": "Disconnect Apache KIE™ Extended Services" } ], "configuration": { @@ -94,7 +94,7 @@ "type": "string" } }, - "title": "Apache KIE Extended Services" + "title": "Apache KIE™ Extended Services" }, "icons": { "extended-services-connected": { @@ -102,14 +102,14 @@ "fontCharacter": "\\E000", "fontPath": "./static/extended-services-font.woff" }, - "description": "Connected to the Apache KIE Extended-Services" + "description": "Connected to the Apache KIE™ Extended Services" }, "extended-services-disconnected": { "default": { "fontCharacter": "\\E001", "fontPath": "./static/extended-services-font.woff" }, - "description": "Apache KIE Extended-Services are Disconnected" + "description": "Apache KIE™ Extended Services are Disconnected" } }, "languages": [ diff --git a/packages/extended-services-vscode-extension/src/Validator.ts b/packages/extended-services-vscode-extension/src/Validator.ts index 501a8440d07..40f8cf1e055 100644 --- a/packages/extended-services-vscode-extension/src/Validator.ts +++ b/packages/extended-services-vscode-extension/src/Validator.ts @@ -22,7 +22,7 @@ import * as validationRequests from "./requests/ValidationRequests"; import * as validationResponse from "./requests/ValidationResponse"; import * as vscode from "vscode"; -const source: string = "Apache KIE Extended Services"; +const source: string = "Apache KIE™ Extended Services"; function createBPMNDiagnostics(validationResponses: validationResponse.BPMNValidationResponse[]): vscode.Diagnostic[] { return validationResponses.map((validationResponse) => { diff --git a/packages/extended-services-vscode-extension/src/configurations/Configuration.ts b/packages/extended-services-vscode-extension/src/configurations/Configuration.ts index 5beb698fa88..2b322895afa 100644 --- a/packages/extended-services-vscode-extension/src/configurations/Configuration.ts +++ b/packages/extended-services-vscode-extension/src/configurations/Configuration.ts @@ -57,7 +57,7 @@ function fetchConnectionHeartbeatIntervalinSecs(): number { function fetchExtendedServicesURL(): URL { const extendedServicesURL = vscode.workspace.getConfiguration().get(extendedServicesURLID); if (!extendedServicesURL) { - throw new Error("Extended Services URL configuration not found"); + throw new Error("URL configuration not found"); } try { diff --git a/packages/extended-services-vscode-extension/src/extension/extension-browser.ts b/packages/extended-services-vscode-extension/src/extension/extension-browser.ts index eee98f3ea0a..955d7967426 100644 --- a/packages/extended-services-vscode-extension/src/extension/extension-browser.ts +++ b/packages/extended-services-vscode-extension/src/extension/extension-browser.ts @@ -59,7 +59,7 @@ function initializeVSCodeElements() { statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 100); statusBarItem.text = "$(extended-services-disconnected)"; - statusBarItem.tooltip = "Apache KIE Extended Services are not connected. \n" + "Click to connect."; + statusBarItem.tooltip = "Apache KIE™ Extended Services is not connected. \n" + "Click to connect."; statusBarItem.command = startExtendedServicesCommandUID; statusBarItem.hide(); @@ -171,7 +171,7 @@ export function activate(context: vscode.ExtensionContext) { if (configuration) { validate(configuration); statusBarItem.text = "$(extended-services-connected)"; - statusBarItem.tooltip = "Apache KIE Extended Services are connected. Click to disconnect."; + statusBarItem.tooltip = "Apache KIE™ Extended Services is connected. Click to disconnect."; statusBarItem.command = stopExtendedServicesCommandUID; } }); @@ -184,7 +184,7 @@ export function activate(context: vscode.ExtensionContext) { connection.subscribeDisconnected(() => { vscode.commands.executeCommand("setContext", connectedEnablementUID, false); statusBarItem.text = "$(extended-services-disconnected)"; - statusBarItem.tooltip = "Apache KIE Extended Services are not connected. Click to connect."; + statusBarItem.tooltip = "Apache KIE™ Extended Services is not connected. Click to connect."; statusBarItem.command = startExtendedServicesCommandUID; diagnosticCollection.clear(); }); diff --git a/packages/extended-services-vscode-extension/src/extension/extension-main.ts b/packages/extended-services-vscode-extension/src/extension/extension-main.ts index ea25c14f787..560feb974e9 100644 --- a/packages/extended-services-vscode-extension/src/extension/extension-main.ts +++ b/packages/extended-services-vscode-extension/src/extension/extension-main.ts @@ -217,7 +217,7 @@ export function activate(context: vscode.ExtensionContext) { if (configuration) { validate(configuration); statusBarItem.text = "$(extended-services-connected)"; - statusBarItem.tooltip = "Apache KIE Extended Services are connected. Click to disconnect."; + statusBarItem.tooltip = "Apache KIE™ Extended Services are connected. Click to disconnect."; statusBarItem.command = stopExtendedServicesCommandUID; } }); @@ -230,7 +230,7 @@ export function activate(context: vscode.ExtensionContext) { connection.subscribeDisconnected(() => { vscode.commands.executeCommand("setContext", connectedEnablementUID, false); statusBarItem.text = "$(extended-services-disconnected)"; - statusBarItem.tooltip = "Apache KIE Extended Services are not connected. Click to connect."; + statusBarItem.tooltip = "Apache KIE™ Extended Services are not connected. Click to connect."; statusBarItem.command = startExtendedServicesCommandUID; diagnosticCollection.clear(); }); From 0cad81a818622eb32d3f780e78ac4b4116ec5fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luiz=20Jo=C3=A3o=20Motta?= Date: Mon, 16 Dec 2024 03:47:22 -0300 Subject: [PATCH 4/7] NO-ISSUE: Bump up `selenium-webdriver` to 4.27.0 (#2807) --- .../package.json | 4 +- .../chrome-extension-test-helper/package.json | 4 +- .../package.json | 4 +- .../package.json | 4 +- .../package.json | 4 +- packages/yard-vscode-extension/package.json | 4 +- pnpm-lock.yaml | 131 ++++++------------ 7 files changed, 56 insertions(+), 99 deletions(-) diff --git a/packages/chrome-extension-pack-kogito-kie-editors/package.json b/packages/chrome-extension-pack-kogito-kie-editors/package.json index 49f5a28e0eb..e036da5c991 100644 --- a/packages/chrome-extension-pack-kogito-kie-editors/package.json +++ b/packages/chrome-extension-pack-kogito-kie-editors/package.json @@ -44,7 +44,7 @@ "@types/chrome": "^0.0.193", "@types/jest": "^29.5.12", "@types/jest-when": "^3.5.5", - "@types/selenium-webdriver": "^4.1.20", + "@types/selenium-webdriver": "^4.1.27", "chai": "^4.3.10", "copy-webpack-plugin": "^11.0.0", "jest": "^29.7.0", @@ -53,7 +53,7 @@ "jest-when": "^3.6.0", "process": "^0.11.10", "rimraf": "^3.0.2", - "selenium-webdriver": "^4.15.0", + "selenium-webdriver": "^4.27.0", "start-server-and-test": "^2.0.3", "ts-jest": "^29.1.5", "typescript": "^5.5.3", diff --git a/packages/chrome-extension-test-helper/package.json b/packages/chrome-extension-test-helper/package.json index 0d8e1b5841f..f5fbea1110f 100644 --- a/packages/chrome-extension-test-helper/package.json +++ b/packages/chrome-extension-test-helper/package.json @@ -20,10 +20,10 @@ "devDependencies": { "@kie-tools/tsconfig": "workspace:*", "@types/chai": "^4.3.6", - "@types/selenium-webdriver": "^4.1.20", + "@types/selenium-webdriver": "^4.1.27", "chai": "^4.3.10", "rimraf": "^3.0.2", - "selenium-webdriver": "^4.15.0", + "selenium-webdriver": "^4.27.0", "typescript": "^5.5.3" } } diff --git a/packages/serverless-workflow-vscode-extension/package.json b/packages/serverless-workflow-vscode-extension/package.json index 22d25c03228..863ed845dcd 100644 --- a/packages/serverless-workflow-vscode-extension/package.json +++ b/packages/serverless-workflow-vscode-extension/package.json @@ -61,7 +61,7 @@ "@types/chai": "^4.3.6", "@types/fs-extra": "^11.0.1", "@types/mocha": "^10.0.7", - "@types/selenium-webdriver": "^4.1.20", + "@types/selenium-webdriver": "^4.1.27", "@types/vscode": "1.67.0", "@vscode/test-electron": "^2.3.6", "@vscode/test-web": "^0.0.30", @@ -77,7 +77,7 @@ "process": "^0.11.10", "rimraf": "^3.0.2", "sanitize-filename-ts": "^1.0.2", - "selenium-webdriver": "^4.15.0", + "selenium-webdriver": "^4.27.0", "typescript": "^5.5.3", "vscode-extension-tester": "^8.8.0", "webpack": "^5.94.0", diff --git a/packages/vscode-extension-common-test-helpers/package.json b/packages/vscode-extension-common-test-helpers/package.json index 576eb4451f2..34df4d75c03 100644 --- a/packages/vscode-extension-common-test-helpers/package.json +++ b/packages/vscode-extension-common-test-helpers/package.json @@ -23,7 +23,7 @@ "chai": "^4.3.10", "fs-extra": "^11.1.1", "sanitize-filename-ts": "^1.0.2", - "selenium-webdriver": "^4.15.0" + "selenium-webdriver": "^4.27.0" }, "devDependencies": { "@kie-tools/tsconfig": "workspace:*", @@ -31,7 +31,7 @@ "@types/fs-extra": "^11.0.1", "@types/mocha": "^10.0.7", "@types/node": "^20.14.2", - "@types/selenium-webdriver": "^4.1.20", + "@types/selenium-webdriver": "^4.1.27", "mocha": "^10.6.0", "rimraf": "^3.0.2", "typescript": "^5.5.3", diff --git a/packages/vscode-extension-dashbuilder-editor/package.json b/packages/vscode-extension-dashbuilder-editor/package.json index ac939c34eef..e1bd23e6f5d 100644 --- a/packages/vscode-extension-dashbuilder-editor/package.json +++ b/packages/vscode-extension-dashbuilder-editor/package.json @@ -52,7 +52,7 @@ "@types/fs-extra": "^11.0.1", "@types/mocha": "^10.0.7", "@types/react": "^17.0.6", - "@types/selenium-webdriver": "^4.1.20", + "@types/selenium-webdriver": "^4.1.27", "@types/vscode": "1.67.0", "@vscode/test-web": "^0.0.30", "@vscode/vsce": "^2.22.0", @@ -66,7 +66,7 @@ "process": "^0.11.10", "rimraf": "^3.0.2", "sanitize-filename-ts": "^1.0.2", - "selenium-webdriver": "^4.15.0", + "selenium-webdriver": "^4.27.0", "typescript": "^5.5.3", "vscode-extension-tester": "^8.8.0", "webpack": "^5.94.0", diff --git a/packages/yard-vscode-extension/package.json b/packages/yard-vscode-extension/package.json index ab377802792..89aaac38b79 100644 --- a/packages/yard-vscode-extension/package.json +++ b/packages/yard-vscode-extension/package.json @@ -54,7 +54,7 @@ "@types/chai": "^4.3.6", "@types/fs-extra": "^11.0.1", "@types/mocha": "^10.0.7", - "@types/selenium-webdriver": "^4.1.20", + "@types/selenium-webdriver": "^4.1.27", "@types/vscode": "1.67.0", "@vscode/test-electron": "^2.3.6", "@vscode/test-web": "^0.0.30", @@ -69,7 +69,7 @@ "process": "^0.11.10", "rimraf": "^3.0.2", "sanitize-filename-ts": "^1.0.2", - "selenium-webdriver": "^4.15.0", + "selenium-webdriver": "^4.27.0", "typescript": "^5.5.3", "vscode-extension-tester": "^8.8.0", "webpack": "^5.94.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 202936059b5..1a27596a21b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2238,8 +2238,8 @@ importers: specifier: ^3.5.5 version: 3.5.5 '@types/selenium-webdriver': - specifier: ^4.1.20 - version: 4.1.20 + specifier: ^4.1.27 + version: 4.1.27 chai: specifier: ^4.3.10 version: 4.3.10 @@ -2265,8 +2265,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 selenium-webdriver: - specifier: ^4.15.0 - version: 4.15.0(patch_hash=lbqefch5nrzt5atgrk2dnw5phe) + specifier: ^4.27.0 + version: 4.27.0 start-server-and-test: specifier: ^2.0.3 version: 2.0.3 @@ -2430,8 +2430,8 @@ importers: specifier: ^4.3.6 version: 4.3.7 '@types/selenium-webdriver': - specifier: ^4.1.20 - version: 4.1.20 + specifier: ^4.1.27 + version: 4.1.27 chai: specifier: ^4.3.10 version: 4.3.10 @@ -2439,8 +2439,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 selenium-webdriver: - specifier: ^4.15.0 - version: 4.15.0(patch_hash=lbqefch5nrzt5atgrk2dnw5phe) + specifier: ^4.27.0 + version: 4.27.0 typescript: specifier: ^5.5.3 version: 5.5.3 @@ -11867,8 +11867,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/selenium-webdriver': - specifier: ^4.1.20 - version: 4.1.20 + specifier: ^4.1.27 + version: 4.1.27 '@types/vscode': specifier: 1.67.0 version: 1.67.0 @@ -11915,8 +11915,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 selenium-webdriver: - specifier: ^4.15.0 - version: 4.15.0(patch_hash=lbqefch5nrzt5atgrk2dnw5phe) + specifier: ^4.27.0 + version: 4.27.0 typescript: specifier: ^5.5.3 version: 5.5.3 @@ -13306,8 +13306,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 selenium-webdriver: - specifier: ^4.15.0 - version: 4.15.0(patch_hash=lbqefch5nrzt5atgrk2dnw5phe) + specifier: ^4.27.0 + version: 4.27.0 devDependencies: '@kie-tools/tsconfig': specifier: workspace:* @@ -13325,8 +13325,8 @@ importers: specifier: ^20.14.2 version: 20.14.2 '@types/selenium-webdriver': - specifier: ^4.1.20 - version: 4.1.20 + specifier: ^4.1.27 + version: 4.1.27 mocha: specifier: ^10.6.0 version: 10.6.0 @@ -13410,8 +13410,8 @@ importers: specifier: ^17.0.6 version: 17.0.21 '@types/selenium-webdriver': - specifier: ^4.1.20 - version: 4.1.20 + specifier: ^4.1.27 + version: 4.1.27 '@types/vscode': specifier: 1.67.0 version: 1.67.0 @@ -13452,8 +13452,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 selenium-webdriver: - specifier: ^4.15.0 - version: 4.15.0(patch_hash=lbqefch5nrzt5atgrk2dnw5phe) + specifier: ^4.27.0 + version: 4.27.0 typescript: specifier: ^5.5.3 version: 5.5.3 @@ -14267,8 +14267,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/selenium-webdriver': - specifier: ^4.1.20 - version: 4.1.20 + specifier: ^4.1.27 + version: 4.1.27 '@types/vscode': specifier: 1.67.0 version: 1.67.0 @@ -14312,8 +14312,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 selenium-webdriver: - specifier: ^4.15.0 - version: 4.15.0(patch_hash=lbqefch5nrzt5atgrk2dnw5phe) + specifier: ^4.27.0 + version: 4.27.0 typescript: specifier: ^5.5.3 version: 5.5.3 @@ -17118,8 +17118,8 @@ packages: '@base2/pretty-print-object@1.0.1': resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==} - '@bazel/runfiles@5.8.1': - resolution: {integrity: sha512-NDdfpdQ6rZlylgv++iMn5FkObC/QlBQvipinGLSOguTYpRywmieOyJ29XHvUilspwTFSILWpoE9CqMGkHXug1g==} + '@bazel/runfiles@6.3.1': + resolution: {integrity: sha512-1uLNT5NZsUVIGS4syuHwTzZ8HycMPyr6POA3FCE4GbMtc4rhoJk8aZKtNIRthJYfL+iioppi+rTfH3olMPr9nA==} '@bcoe/v8-coverage@0.2.3': resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} @@ -20429,11 +20429,8 @@ packages: '@types/scheduler@0.16.1': resolution: {integrity: sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==} - '@types/selenium-webdriver@4.1.20': - resolution: {integrity: sha512-WxzARWDZVTbXlJgwYGhNoiV4OuHDabctSQmK5V88LqjW9TJiLETcknxRZ2xB1toecQnu0T2jt1pPXnSYkaWYiw==} - - '@types/selenium-webdriver@4.1.26': - resolution: {integrity: sha512-PUgqsyNffal0eAU0bzGlh37MJo558aporAPZoKqBeB/pF7zhKl1S3zqza0GpwFqgoigNxWhEIJzru75eeYco/w==} + '@types/selenium-webdriver@4.1.27': + resolution: {integrity: sha512-ALqsj8D7Swb6MnBQuAQ58J3KC3yh6fLGtAmpBmnZX8j+0kmP7NaLt56CuzBw2W2bXPrvHFTgn8iekOQFUKXEQA==} '@types/semver@6.2.3': resolution: {integrity: sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A==} @@ -29071,12 +29068,8 @@ packages: select-hose@2.0.0: resolution: {integrity: sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==} - selenium-webdriver@4.15.0: - resolution: {integrity: sha512-BNG1bq+KWiBGHcJ/wULi0eKY0yaDqFIbEmtbsYJmfaEghdCkXBsx1akgOorhNwjBipOr0uwpvNXqT6/nzl+zjg==} - engines: {node: '>= 14.20.0'} - - selenium-webdriver@4.25.0: - resolution: {integrity: sha512-zl9IX93caOT8wbcCpZzAkEtYa+hNgJ4C5GUN8uhpzggqRLvsg1asfKi0p1uNZC8buYVvsBZbx8S+9MjVAjs4oA==} + selenium-webdriver@4.27.0: + resolution: {integrity: sha512-LkTJrNz5socxpPnWPODQ2bQ65eYx9JK+DQMYNihpTjMCqHwgWGYQnQTCAAche2W3ZP87alA+1zYPvgS8tHNzMQ==} engines: {node: '>= 14.21.0'} selfsigned@2.4.1: @@ -31100,18 +31093,6 @@ packages: utf-8-validate: optional: true - ws@8.14.2: - resolution: {integrity: sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: '>=5.0.2' - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - ws@8.18.0: resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} engines: {node: '>=10.0.0'} @@ -31433,7 +31414,7 @@ snapshots: dependencies: '@ampproject/remapping': 2.3.0 '@angular-devkit/architect': 0.1801.3(chokidar@3.6.0) - '@angular-devkit/build-webpack': 0.1801.3(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.92.1(esbuild@0.21.5)))(webpack@5.92.1(esbuild@0.21.5)) + '@angular-devkit/build-webpack': 0.1801.3(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0))(webpack@5.92.1(esbuild@0.21.5)) '@angular-devkit/core': 18.1.3(chokidar@3.6.0) '@angular/build': 18.1.3(@angular/compiler-cli@18.1.3(@angular/compiler@18.1.3(@angular/core@18.1.3(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.3))(@types/node@22.5.2)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.38)(stylus@0.59.0)(terser@5.29.2)(typescript@5.5.3) '@angular/compiler-cli': 18.1.3(@angular/compiler@18.1.3(@angular/core@18.1.3(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.3) @@ -31519,15 +31500,6 @@ snapshots: - utf-8-validate - webpack-cli - '@angular-devkit/build-webpack@0.1801.3(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.92.1(esbuild@0.21.5)))(webpack@5.92.1(esbuild@0.21.5))': - dependencies: - '@angular-devkit/architect': 0.1801.3(chokidar@3.6.0) - rxjs: 7.8.1 - webpack: 5.92.1(esbuild@0.21.5) - webpack-dev-server: 5.0.4(webpack@5.92.1(esbuild@0.21.5)) - transitivePeerDependencies: - - chokidar - '@angular-devkit/build-webpack@0.1801.3(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0))(webpack@5.92.1(esbuild@0.21.5))': dependencies: '@angular-devkit/architect': 0.1801.3(chokidar@3.6.0) @@ -37691,7 +37663,7 @@ snapshots: '@base2/pretty-print-object@1.0.1': {} - '@bazel/runfiles@5.8.1': {} + '@bazel/runfiles@6.3.1': {} '@bcoe/v8-coverage@0.2.3': {} @@ -40821,18 +40793,18 @@ snapshots: call-me-maybe: 1.0.2 openapi-types: 7.2.3 - '@redhat-developer/locators@1.6.0(@redhat-developer/page-objects@1.6.0(selenium-webdriver@4.25.0)(typescript@5.5.3))(selenium-webdriver@4.25.0)': + '@redhat-developer/locators@1.6.0(@redhat-developer/page-objects@1.6.0(selenium-webdriver@4.27.0)(typescript@5.5.3))(selenium-webdriver@4.27.0)': dependencies: - '@redhat-developer/page-objects': 1.6.0(selenium-webdriver@4.25.0)(typescript@5.5.3) - selenium-webdriver: 4.25.0 + '@redhat-developer/page-objects': 1.6.0(selenium-webdriver@4.27.0)(typescript@5.5.3) + selenium-webdriver: 4.27.0 - '@redhat-developer/page-objects@1.6.0(selenium-webdriver@4.25.0)(typescript@5.5.3)': + '@redhat-developer/page-objects@1.6.0(selenium-webdriver@4.27.0)(typescript@5.5.3)': dependencies: clipboardy: 4.0.0 clone-deep: 4.0.1 compare-versions: 6.1.1 fs-extra: 11.2.0 - selenium-webdriver: 4.25.0 + selenium-webdriver: 4.27.0 type-fest: 4.26.1 typescript: 5.5.3 @@ -43715,11 +43687,7 @@ snapshots: '@types/scheduler@0.16.1': {} - '@types/selenium-webdriver@4.1.20': - dependencies: - '@types/ws': 8.5.5 - - '@types/selenium-webdriver@4.1.26': + '@types/selenium-webdriver@4.1.27': dependencies: '@types/node': 20.14.13 '@types/ws': 8.5.12 @@ -55883,18 +55851,9 @@ snapshots: select-hose@2.0.0: {} - selenium-webdriver@4.15.0(patch_hash=lbqefch5nrzt5atgrk2dnw5phe): + selenium-webdriver@4.27.0: dependencies: - jszip: 3.10.1 - tmp: 0.2.1 - ws: 8.14.2 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - - selenium-webdriver@4.25.0: - dependencies: - '@bazel/runfiles': 5.8.1 + '@bazel/runfiles': 6.3.1 jszip: 3.10.1 tmp: 0.2.3 ws: 8.18.0 @@ -58332,9 +58291,9 @@ snapshots: vscode-extension-tester@8.8.0(mocha@10.6.0)(typescript@5.5.3): dependencies: - '@redhat-developer/locators': 1.6.0(@redhat-developer/page-objects@1.6.0(selenium-webdriver@4.25.0)(typescript@5.5.3))(selenium-webdriver@4.25.0) - '@redhat-developer/page-objects': 1.6.0(selenium-webdriver@4.25.0)(typescript@5.5.3) - '@types/selenium-webdriver': 4.1.26 + '@redhat-developer/locators': 1.6.0(@redhat-developer/page-objects@1.6.0(selenium-webdriver@4.27.0)(typescript@5.5.3))(selenium-webdriver@4.27.0) + '@redhat-developer/page-objects': 1.6.0(selenium-webdriver@4.27.0)(typescript@5.5.3) + '@types/selenium-webdriver': 4.1.27 '@vscode/vsce': 3.1.1 c8: 10.1.2 commander: 12.1.0 @@ -58347,7 +58306,7 @@ snapshots: js-yaml: 4.1.0 mocha: 10.6.0 sanitize-filename: 1.6.3 - selenium-webdriver: 4.25.0 + selenium-webdriver: 4.27.0 targz: 1.0.1 typescript: 5.5.3 unzipper: 0.12.3 @@ -59194,8 +59153,6 @@ snapshots: ws@8.13.0: {} - ws@8.14.2: {} - ws@8.18.0: {} ws@8.2.3: {} From 7777984a659ab4335cfbfd5d26ab885dc64fd42c Mon Sep 17 00:00:00 2001 From: Tiago Bento <1584568+tiagobento@users.noreply.github.com> Date: Mon, 16 Dec 2024 03:57:32 -0300 Subject: [PATCH 5/7] kie-issues#1715: Chrome Extension `Serverless Workflow Editor for GitHub` rendering a 404 page instead of the SWF Editor (#2809) --- .ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions index ed2060aaa9a..68d7504d541 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions +++ b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions @@ -45,7 +45,7 @@ pipeline { CHROME_EXTENSION__manifestFile = 'manifest.prod.json' CHROME_EXTENSION__onlineEditorUrl = 'https://apache.github.io/incubator-kie-kogito-online' SWF_CHROME_EXTENSION__routerTargetOrigin = 'https://apache.github.io' - SWF_CHROME_EXTENSION__routerRelativePath = "kogito-online/swf-chrome-extension/${params.RELEASE_VERSION}" + SWF_CHROME_EXTENSION__routerRelativePath = "incubator-kie-kogito-online/swf-chrome-extension/${params.RELEASE_VERSION}" SWF_CHROME_EXTENSION__manifestFile = 'manifest.prod.json' RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts" From 79b8d21e7d07f89c6c758b115ab8a5de6fc06982 Mon Sep 17 00:00:00 2001 From: Tiago Bento <1584568+tiagobento@users.noreply.github.com> Date: Mon, 16 Dec 2024 05:50:07 -0300 Subject: [PATCH 6/7] =?UTF-8?q?kie-issues#1716:=20Serverless=20Workflow=20?= =?UTF-8?q?VS=20Code=20Extension=20should=20have=20`Apache=20KIE=E2=84=A2`?= =?UTF-8?q?=20prefix=20instead=20of=20just=20`KIE`=20on=20its=20displayNam?= =?UTF-8?q?e=20(#2811)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/serverless-workflow-vscode-extension/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/serverless-workflow-vscode-extension/package.json b/packages/serverless-workflow-vscode-extension/package.json index 863ed845dcd..bf87c9e1b55 100644 --- a/packages/serverless-workflow-vscode-extension/package.json +++ b/packages/serverless-workflow-vscode-extension/package.json @@ -88,7 +88,7 @@ "engines": { "vscode": "^1.67.0" }, - "displayName": "KIE Serverless Workflow Editor", + "displayName": "Apache KIE™ Serverless Workflow Editor", "categories": [ "Other" ], From 3a08bbf671cda5f83e044b1109a9b1d6f3f2ca59 Mon Sep 17 00:00:00 2001 From: Alex Porcelli Date: Mon, 16 Dec 2024 04:46:05 -0500 Subject: [PATCH 7/7] LEGAL-691: replace CDDL code by Apache code from tomcat (#2799) --- .rat-excludes | 2 - LICENSE | 39 -------- .../annotation/processing/Generated.java | 94 +++++-------------- 3 files changed, 23 insertions(+), 112 deletions(-) diff --git a/.rat-excludes b/.rat-excludes index 01a2bc5759f..5b3703d6da0 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -1022,8 +1022,6 @@ Base64Util.java TimeUnit.java # packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/README.eclipse README.eclipse -# packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java -Generated.java # packages/stunner-editors/errai-common/src/main/resources/META-INF/ErraiApp.properties ErraiApp.properties # packages/stunner-editors/errai-common/src/test/resources/ErraiApp.properties diff --git a/LICENSE b/LICENSE index 0eaebabe635..b15ffa1d212 100644 --- a/LICENSE +++ b/LICENSE @@ -663,45 +663,6 @@ for packages/stunner-editors/errai-javax-enterprise/src/main/java/javax/enterpri Copyright 2010, Red Hat, Inc., and individual contributors Licensed under the Apache License, Version 2.0 ----------------------------------------------------------------------------------------------------------------------------------- -for packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java - -Copyright (c) 2005-2013 Oracle and/or its affiliates. All rights reserved. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common Development -and Distribution License("CDDL") (collectively, the "License"). You -may not use this file except in compliance with the License. You can -obtain a copy of the License at -https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html -or packager/legal/LICENSE.txt. See the License for the specific -language governing permissions and limitations under the License. - -When distributing the software, include this License Header Notice in each -file and include the License file at packager/legal/LICENSE.txt. - -GPL Classpath Exception: -Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the GPL Version 2 section of the License -file that accompanied this code. - -Modifications: -If applicable, add the following below the License Header, with the fields -enclosed by brackets [] replaced by your own identifying information: -"Portions Copyright [year] [name of copyright owner]" - -Contributor(s): -If you wish your version of this file to be governed by only the CDDL or -only the GPL Version 2, indicate your decision by adding "[Contributor] -elects to include this software in this distribution under the [CDDL or GPL -Version 2] license." If you don't indicate a single choice of license, a -recipient has the option to distribute your version of this file under -either the CDDL, the GPL Version 2 or to extend the choice of license to -its licensees as provided above. However, if you add GPL Version 2 code -and therefore, elected the GPL Version 2 license, then the option applies -only if the new code is made subject to such option by the copyright -holder. - --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- for packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/main/resources/org/uberfire/client/views/static/jquery-ui/jquery-ui.min.js packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/main/resources/org/uberfire/client/views/static/jquery-ui/jquery-ui.min.css diff --git a/packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java b/packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java index 56aa36f7114..54e1cf24575 100644 --- a/packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java +++ b/packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java @@ -1,98 +1,50 @@ /* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Copyright (c) 2005-2013 Oracle and/or its affiliates. All rights reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can - * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html - * or packager/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at packager/legal/LICENSE.txt. - * - * GPL Classpath Exception: - * Oracle designates this particular file as subject to the "Classpath" - * exception as provided by Oracle in the GPL Version 2 section of the License - * file that accompanied this code. - * - * Modifications: - * If applicable, add the following below the License Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyright [year] [name of copyright owner]" - * - * Contributor(s): - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package javax.annotation.processing; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.LOCAL_VARIABLE; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.SOURCE; - /** - * The Generated annotation is used to mark source code that has been generated. - * It can also be used to differentiate user written code from generated code - * in a single file. When used, the value element must have the name of the - * code generator. The recommended convention is to use the fully qualified - * name of the code generator in the value field . - *

For example: com.company.package.classname. - * The date element is used to indicate the date the source was generated. - * The date element must follow the ISO 8601 standard. For example the date - * element would have the following value 2001-07-04T12:08:56.235-0700 - * which represents 2001-07-04 12:08:56 local time in the U.S. Pacific - * Time time zone.

- *

The comment element is a place holder for any comments that the code - * generator may want to include in the generated code.

+ * Used to identify generated code. * * @since Common Annotations 1.0 */ - @Documented -@Retention(SOURCE) -@Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, - LOCAL_VARIABLE, PARAMETER}) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.LOCAL_VARIABLE, + ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE }) +@Retention(RetentionPolicy.SOURCE) public @interface Generated { /** - * The value element MUST have the name of the code generator. - * The recommended convention is to use the fully qualified name of the - * code generator. For example: com.acme.generator.CodeGen. + * @return The name of the code generator. It is recommended that the fully qualified name of the code generator is + * used. */ String[] value(); /** - * Date when the source was generated. + * @return The date the code was generated */ String date() default ""; /** - * A place holder for any comments that the code generator may want to - * include in the generated code. + * @return Additional comments (if any) related to the code generation */ String comments() default ""; -} - +} \ No newline at end of file