Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into kie-issues#1694
Browse files Browse the repository at this point in the history
  • Loading branch information
yesamer committed Dec 17, 2024
2 parents 8eebccb + 37d7322 commit 223e14d
Show file tree
Hide file tree
Showing 20 changed files with 145 additions and 116 deletions.
3 changes: 3 additions & 0 deletions packages/dmn-editor/src/diagram/nodes/NodeStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export interface DmnFontStyle {
family?: string;
size?: number;
color: string;
fill: string;
}

export interface Color {
Expand Down Expand Up @@ -169,6 +170,7 @@ export function getDmnFontStyle(args: {
family: args.isEnabled ? args.dmnStyle?.["@_fontFamily"] : undefined,
size: args.isEnabled ? args.dmnStyle?.["@_fontSize"] : undefined,
color: fontColor,
fill: fontColor,
};
}

Expand All @@ -189,6 +191,7 @@ export function getFontCssProperties(dmnFontStyle?: DmnFontStyle): React.CSSProp
textDecoration,
fontSize: dmnFontStyle?.size ?? "16px",
color: dmnFontStyle?.color ?? "black",
fill: dmnFontStyle?.fill ?? "black",
lineHeight: "1.5em", // This needs to be em `em` otherwise `@visx/text` breaks when generating the SVG.
};
}
Expand Down
2 changes: 1 addition & 1 deletion packages/kie-editors-dev-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"rimraf": "^3.0.2",
"sanitize-filename-ts": "^1.0.2",
"typescript": "^5.5.3",
"vscode-extension-tester": "^8.8.0",
"vscode-extension-tester": "^8.10.0",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/maven-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<version.codehaus.flatten.plugin>1.6.0</version.codehaus.flatten.plugin>

<!-- Apache KIE -->
<version.org.kie.kogito>999-20241016-SNAPSHOT</version.org.kie.kogito>
<version.org.kie.kogito>999-20241208-SNAPSHOT</version.org.kie.kogito>

<!-- Quarkus -->
<version.quarkus>3.8.6</version.quarkus>
Expand Down
2 changes: 1 addition & 1 deletion packages/root-env/env/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module.exports = composeEnv([], {
},
/* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
KOGITO_RUNTIME_version: {
default: "999-20241016-SNAPSHOT",
default: "999-20241208-SNAPSHOT",
description: "Kogito version to be used on dependency declaration.",
},
/* (end) */
Expand Down
2 changes: 1 addition & 1 deletion packages/serverless-workflow-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"sanitize-filename-ts": "^1.0.2",
"selenium-webdriver": "^4.27.0",
"typescript": "^5.5.3",
"vscode-extension-tester": "^8.8.0",
"vscode-extension-tester": "^8.10.0",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ postgreSQLPersistenceExtensions:
version: 3.8.6
- groupId: org.kie
artifactId: kie-addons-quarkus-persistence-jdbc
version: 999-20241016-SNAPSHOT
version: 999-20241208-SNAPSHOT
# If true, the workflow deployments will be configured to send accumulated workflow status change events to the Data
# Index Service reducing the number of produced events. Set to false to send individual events.
kogitoEventsGrouping: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestInitializeControllersCfgAt_ValidFile(t *testing.T) {
assert.Equal(t, GAV{
GroupId: "org.kie",
ArtifactId: "kie-addons-quarkus-persistence-jdbc",
Version: "999-20241016-SNAPSHOT",
Version: "999-20241208-SNAPSHOT",
}, postgresExtensions[2])
assert.True(t, cfg.KogitoEventsGrouping)
assert.True(t, cfg.KogitoEventsGroupingBinary)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ postgreSQLPersistenceExtensions:
version: 3.8.6
- groupId: org.kie
artifactId: kie-addons-quarkus-persistence-jdbc
version: 999-20241016-SNAPSHOT
version: 999-20241208-SNAPSHOT
kogitoEventsGrouping: true
kogitoEventsGroupingBinary: true
kogitoEventsGroupingCompress: false
2 changes: 1 addition & 1 deletion packages/sonataflow-operator/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28172,7 +28172,7 @@ data:
version: 3.8.6
- groupId: org.kie
artifactId: kie-addons-quarkus-persistence-jdbc
version: 999-20241016-SNAPSHOT
version: 999-20241208-SNAPSHOT
# If true, the workflow deployments will be configured to send accumulated workflow status change events to the Data
# Index Service reducing the number of produced events. Set to false to send individual events.
kogitoEventsGrouping: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
template:
buildArgs:
- name: QUARKUS_EXTENSION
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241016-SNAPSHOT
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241208-SNAPSHOT
config:
strategyOptions:
KanikoBuildCacheEnabled: "true"
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
buildArgs:
- name: QUARKUS_EXTENSION
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241016-SNAPSHOT
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241208-SNAPSHOT
config:
strategyOptions:
KanikoBuildCacheEnabled: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
buildArgs:
- name: QUARKUS_EXTENSIONS
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241016-SNAPSHOT
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241208-SNAPSHOT
services:
dataIndex:
enabled: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
buildArgs:
- name: QUARKUS_EXTENSION
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241016-SNAPSHOT
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241208-SNAPSHOT
config:
strategyOptions:
KanikoBuildCacheEnabled: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
buildArgs:
- name: QUARKUS_EXTENSION
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241016-SNAPSHOT
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241208-SNAPSHOT
config:
strategyOptions:
KanikoBuildCacheEnabled: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
buildArgs:
- name: QUARKUS_EXTENSION
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241016-SNAPSHOT
value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20241208-SNAPSHOT
config:
strategyOptions:
KanikoBuildCacheEnabled: "true"
Expand Down
4 changes: 2 additions & 2 deletions packages/vscode-extension-common-test-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
"mocha": "^10.6.0",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"vscode-extension-tester": "^8.8.0"
"vscode-extension-tester": "^8.10.0"
},
"peerDependencies": {
"mocha": "^10.6.0",
"vscode-extension-tester": "^8.8.0"
"vscode-extension-tester": "^8.10.0"
}
}
2 changes: 1 addition & 1 deletion packages/vscode-extension-dashbuilder-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"sanitize-filename-ts": "^1.0.2",
"selenium-webdriver": "^4.27.0",
"typescript": "^5.5.3",
"vscode-extension-tester": "^8.8.0",
"vscode-extension-tester": "^8.10.0",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/yard-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"sanitize-filename-ts": "^1.0.2",
"selenium-webdriver": "^4.27.0",
"typescript": "^5.5.3",
"vscode-extension-tester": "^8.8.0",
"vscode-extension-tester": "^8.10.0",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
Expand Down
Loading

0 comments on commit 223e14d

Please sign in to comment.