From 30b88cffe22d9e9c9c7e19fab7294e54e83f43ad Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 24 Dec 2024 09:45:38 +0000 Subject: [PATCH 1/3] Raise project to 12.0.0-SNAPSHOT --- dmn-decision-table-demo/.project | 3 +-- dmn-decision-table-demo/.settings/.jsdtscope | 12 ---------- .../.settings/ch.ivyteam.ivy.designer.prefs | 5 ++-- .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- ....eclipse.wst.common.project.facet.core.xml | 14 +++++------ ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - dmn-decision-table-demo/config/variables.yaml | 3 ++- .../supplements/rule/beans/demos/Data.d.json | 19 +++++++++++++++ .../rule/beans/demos/Data.ivyClass | 6 ----- .../rule/beans/demos/Person.d.json | 19 +++++++++++++++ .../rule/beans/demos/Person.ivyClass | 6 ----- .../GatherPersonData.rddescriptor | 24 ------------------- .../GatherPersonDataData.d.json | 11 +++++++++ .../GatherPersonDataData.ivyClass | 4 ---- .../GatherPersonDataProcess.p.json | 2 +- .../TaxesDialog/TaxesDialog.rddescriptor | 24 ------------------- .../demos/TaxesDialog/TaxesDialogData.d.json | 11 +++++++++ .../TaxesDialog/TaxesDialogData.ivyClass | 4 ---- .../TaxesDialog/TaxesDialogProcess.p.json | 2 +- 20 files changed, 76 insertions(+), 101 deletions(-) delete mode 100644 dmn-decision-table-demo/.settings/.jsdtscope delete mode 100644 dmn-decision-table-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 dmn-decision-table-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Data.d.json delete mode 100644 dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Data.ivyClass create mode 100644 dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Person.d.json delete mode 100644 dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Person.ivyClass delete mode 100644 dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonData.rddescriptor create mode 100644 dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataData.d.json delete mode 100644 dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataData.ivyClass delete mode 100644 dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialog.rddescriptor create mode 100644 dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogData.d.json delete mode 100644 dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogData.ivyClass diff --git a/dmn-decision-table-demo/.project b/dmn-decision-table-demo/.project index 18d071b..88e6724 100644 --- a/dmn-decision-table-demo/.project +++ b/dmn-decision-table-demo/.project @@ -49,6 +49,5 @@ org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/dmn-decision-table-demo/.settings/.jsdtscope b/dmn-decision-table-demo/.settings/.jsdtscope deleted file mode 100644 index ca71ce1..0000000 --- a/dmn-decision-table-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dmn-decision-table-demo/.settings/ch.ivyteam.ivy.designer.prefs b/dmn-decision-table-demo/.settings/ch.ivyteam.ivy.designer.prefs index 354db7f..293e99b 100644 --- a/dmn-decision-table-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/dmn-decision-table-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.ivy.supplements.rule.beans.demos.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.ivy.supplements.rule.beans.demos ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 -eclipse.preferences.version=1 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 +eclipse.preferences.version=1 \ No newline at end of file diff --git a/dmn-decision-table-demo/.settings/org.eclipse.jdt.core.prefs b/dmn-decision-table-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/dmn-decision-table-demo/.settings/org.eclipse.jdt.core.prefs +++ b/dmn-decision-table-demo/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/dmn-decision-table-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/dmn-decision-table-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 6ca8142..f9d4879 100644 --- a/dmn-decision-table-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/dmn-decision-table-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - - - - - - - + + + + + + \ No newline at end of file diff --git a/dmn-decision-table-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/dmn-decision-table-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/dmn-decision-table-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/dmn-decision-table-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/dmn-decision-table-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/dmn-decision-table-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/dmn-decision-table-demo/config/variables.yaml b/dmn-decision-table-demo/config/variables.yaml index 6ff84af..40bc904 100644 --- a/dmn-decision-table-demo/config/variables.yaml +++ b/dmn-decision-table-demo/config/variables.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json # == Variables == # # You can define here your project Variables. @@ -5,4 +6,4 @@ # please add a 'variables.yaml' in the sub directory '_'. # Variables: - #myVariable: value \ No newline at end of file +#myVariable: value diff --git a/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Data.d.json b/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Data.d.json new file mode 100644 index 0000000..9d1f4ee --- /dev/null +++ b/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Data.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.ivy.supplements.rule.beans.demos", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "person", + "type" : "com.axonivy.ivy.supplements.rule.beans.demos.Person" + }, { + "name" : "yearlyIncomeDollars", + "type" : "Number" + }, { + "name" : "isGoldMember", + "type" : "Boolean" + }, { + "name" : "taxrate", + "type" : "Number" + } ] +} \ No newline at end of file diff --git a/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Data.ivyClass b/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Data.ivyClass deleted file mode 100644 index 7d914fb..0000000 --- a/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Data.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -Data #class -com.axonivy.ivy.supplements.rule.beans.demos #namespace -person com.axonivy.ivy.supplements.rule.beans.demos.Person #field -yearlyIncomeDollars Number #field -isGoldMember Boolean #field -taxrate Number #field diff --git a/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Person.d.json b/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Person.d.json new file mode 100644 index 0000000..2f4403c --- /dev/null +++ b/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Person.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Person", + "namespace" : "com.axonivy.ivy.supplements.rule.beans.demos", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "firstname", + "type" : "String" + }, { + "name" : "lastname", + "type" : "String" + }, { + "name" : "age", + "type" : "Number" + }, { + "name" : "gender", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Person.ivyClass b/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Person.ivyClass deleted file mode 100644 index 50d9c2a..0000000 --- a/dmn-decision-table-demo/dataclasses/com/axonivy/ivy/supplements/rule/beans/demos/Person.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -Person #class -com.axonivy.ivy.supplements.rule.beans.demos #namespace -firstname String #field -lastname String #field -age Number #field -gender String #field diff --git a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonData.rddescriptor b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonData.rddescriptor deleted file mode 100644 index 19944df..0000000 --- a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonData.rddescriptor +++ /dev/null @@ -1,24 +0,0 @@ - - - true - - guid - 15C82B0728058728 - true - - - version - 1 - true - - - binary - false - true - - - viewTechnology - JSF - true - - diff --git a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataData.d.json b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataData.d.json new file mode 100644 index 0000000..39cd370 --- /dev/null +++ b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "GatherPersonDataData", + "namespace" : "com.axonivy.ivy.supplements.rule.beans.demos.GatherPersonData", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "data", + "type" : "com.axonivy.ivy.supplements.rule.beans.demos.Data", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataData.ivyClass b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataData.ivyClass deleted file mode 100644 index 500d9ec..0000000 --- a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -GatherPersonDataData #class -com.axonivy.ivy.supplements.rule.beans.demos.GatherPersonData #namespace -data com.axonivy.ivy.supplements.rule.beans.demos.Data #field -data PERSISTENT #fieldModifier diff --git a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataProcess.p.json b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataProcess.p.json index 5653bf0..005ded0 100644 --- a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataProcess.p.json +++ b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/GatherPersonData/GatherPersonDataProcess.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "15C82B07277A094A", "kind" : "HTML_DIALOG", "config" : { diff --git a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialog.rddescriptor b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialog.rddescriptor deleted file mode 100644 index a8866c6..0000000 --- a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialog.rddescriptor +++ /dev/null @@ -1,24 +0,0 @@ - - - true - - guid - 15C82BA28D073999 - true - - - version - 1 - true - - - binary - false - true - - - viewTechnology - JSF - true - - diff --git a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogData.d.json b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogData.d.json new file mode 100644 index 0000000..f09ce00 --- /dev/null +++ b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "TaxesDialogData", + "namespace" : "com.axonivy.ivy.supplements.rule.beans.demos.TaxesDialog", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "data", + "type" : "com.axonivy.ivy.supplements.rule.beans.demos.Data", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogData.ivyClass b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogData.ivyClass deleted file mode 100644 index d170afb..0000000 --- a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -TaxesDialogData #class -com.axonivy.ivy.supplements.rule.beans.demos.TaxesDialog #namespace -data com.axonivy.ivy.supplements.rule.beans.demos.Data #field -data PERSISTENT #fieldModifier diff --git a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogProcess.p.json b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogProcess.p.json index 3922352..75e6fb1 100644 --- a/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogProcess.p.json +++ b/dmn-decision-table-demo/src_hd/com/axonivy/ivy/supplements/rule/beans/demos/TaxesDialog/TaxesDialogProcess.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "15C82BA28CB7DA31", "kind" : "HTML_DIALOG", "config" : { From ecf052edf44a45c23298f2eef9fcc8fab417adcd Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 24 Dec 2024 09:53:27 +0000 Subject: [PATCH 2/3] Update maven version to 12.0.0-SNAPSHOT --- dmn-decision-table-demo/pom.xml | 4 ++-- dmn-decision-table-product/pom.xml | 2 +- dmn-decision-table/pom.xml | 8 ++++---- pom.xml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dmn-decision-table-demo/pom.xml b/dmn-decision-table-demo/pom.xml index 85768f3..57b0093 100644 --- a/dmn-decision-table-demo/pom.xml +++ b/dmn-decision-table-demo/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.dmn.decisiontable dmn-decision-table-demo - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT iar - 11.3.0 + 12.0.0 diff --git a/dmn-decision-table-product/pom.xml b/dmn-decision-table-product/pom.xml index b7718d6..59b4f70 100644 --- a/dmn-decision-table-product/pom.xml +++ b/dmn-decision-table-product/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.dmn.decisiontable dmn-decision-table-product - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT pom diff --git a/dmn-decision-table/pom.xml b/dmn-decision-table/pom.xml index 622c17f..2e18a26 100644 --- a/dmn-decision-table/pom.xml +++ b/dmn-decision-table/pom.xml @@ -3,7 +3,7 @@ com.axonivy.dmn.decisiontable dmn-decision-table - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT eclipse-plugin @@ -26,7 +26,7 @@ org.camunda.bpm.dmn camunda-engine-dmn-bom - 7.6.0 + 7.23.0-alpha2 pom import @@ -41,13 +41,13 @@ junit junit - 4.13.1 + 4.13.2 test org.assertj assertj-core - 3.8.0 + 3.27.0 test diff --git a/pom.xml b/pom.xml index 0890e45..666696e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.axonivy.dmn.decisiontable dmn-decision-table-modules - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT pom From bc6efb461485a73a78c93ef314b46f4259ee6b18 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 24 Dec 2024 09:53:27 +0000 Subject: [PATCH 3/3] Update workflow actions to v5 --- .github/workflows/ci.yml | 2 +- .github/workflows/dev.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bd08fc..391f177 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,6 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5 with: javaVersion: 21 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index d47eff5..b911cb6 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,6 +8,6 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5 with: mvnArgs: '-Dp2.repo=nightly' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e173dd..8312702 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,6 @@ on: workflow_dispatch jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5 with: javaVersion: 21