From 49dbf4fa0ddbe260a68dca396ae7243128bb3476 Mon Sep 17 00:00:00 2001 From: akantcheff Date: Wed, 26 Nov 2025 15:13:33 +0100 Subject: [PATCH 1/3] Bonita '8.0.0' to '10.2.4' automated migration --- .gitignore | 7 +- .project | 2 +- app/.gitignore | 9 +- app/.project | 5 + app/MIGRATION_NOTES.adoc | 52 ++++++ app/applications/Procurement_application.xml | 4 +- app/diagrams/Create supplier-1.0.proc | 4 +- .../Init sample procurement data-1.0.proc | 4 +- app/diagrams/Procurement request-1.0.proc | 20 +-- .../{ACME.organization => ACME.xml} | 2 +- app/pom.xml | 163 +++++++++++++++--- .../_RD8ycRKuEeWPr7pxbi20Rg.conf | 2 +- .../_RehaYQhBEeWypMcgJpEEWg.conf | 2 +- .../_yBZV0RKsEeWPr7pxbi20Rg.conf | 2 +- app/profiles/default_profile.xml | 9 +- .../createSupplierForm/assets/css/style.css | 22 ++- .../createSupplierForm.json | 6 +- .../assets/css/style.css | 22 ++- .../initSampleProcurementDataForm.json | 6 +- .../assets/css/style.css | 22 ++- .../procurementCompleteQuotationForm.json | 6 +- .../assets/css/style.css | 22 ++- .../procurementRequestCreationForm.json | 6 +- .../assets/css/style.css | 22 ++- .../procurementRequestListing.json | 6 +- .../assets/css/style.css | 22 ++- .../procurementReviewQuotationsForm.json | 6 +- .../supplierListing/assets/css/style.css | 22 ++- .../supplierListing/supplierListing.json | 6 +- app/web_widgets/customAlert/customAlert.json | 6 +- .../customListTransferButtons.json | 6 +- bdm/dao-client/pom.xml | 5 + bdm/model/pom.xml | 11 ++ bdm/pom.xml | 23 +-- extensions/.project | 17 ++ extensions/pom.xml | 26 +++ pom.xml | 123 +++---------- 37 files changed, 490 insertions(+), 210 deletions(-) rename app/organizations/{ACME.organization => ACME.xml} (99%) create mode 100644 extensions/.project create mode 100644 extensions/pom.xml diff --git a/.gitignore b/.gitignore index 7313521..32d70b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + bin .classpath .settings @@ -5,4 +6,8 @@ target/ .flattened-pom.xml dependency-reduced-pom.xml pom.xml.versionsBackup -.idea \ No newline at end of file +.idea + + +node/ +node_modules/ \ No newline at end of file diff --git a/.project b/.project index 435683e..9db5bf7 100644 --- a/.project +++ b/.project @@ -1,7 +1,7 @@ procurement-example - 8.0.0 + 10.2.4 diff --git a/app/.gitignore b/app/.gitignore index 7ddb1f6..52cd4a6 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,20 +1,18 @@ + # Output of source code compilation. # For example Bonita includes helper Groovy classes such as BonitaUsers (with for example getProcessInstanceInitiator method). # Sources (e.g. BonitaUsers.groovy) are located in src-providedGroovy folder and build result (e.g. BonitaUsers.class) is located in bin folder. /bin # BDM jar generated from the BDM definition (bom.xml) -/lib/bdm-client-pojo.jar # You can also ignore in lib folder jar files related to connector provided by Bonita # Actually they are usefull for automated test done with Bonita BCD module as they will not be provided by this module (only the Studio does provided them) # Classpath configuration for Bonita Studio. Automatically generated. -.classpath # Project settings. Studio is able to create them with appropriate default value if needed. -.settings # Should be created by the Studio if needed. /META-INF @@ -48,7 +46,6 @@ /web_widgets/pb*/ # Ignore Maven target folder (can be used to build REST API extensions). -target/ # Gradle (can be used for example to build and package REST API extensions). @@ -71,11 +68,7 @@ target/ **/.idea/**/gradle.xml -bin -/template #/process_configurations -node/ -node_modules/ /web_fragments/.metadata /web_fragments/*/*.js !/web_widgets/*/*.ctrl.js \ No newline at end of file diff --git a/app/.project b/app/.project index 2eb1ac4..12c177f 100644 --- a/app/.project +++ b/app/.project @@ -33,5 +33,10 @@ 2 PARENT-1-PROJECT_LOC/bdm + + extensions + 2 + PARENT-1-PROJECT_LOC/extensions + diff --git a/app/MIGRATION_NOTES.adoc b/app/MIGRATION_NOTES.adoc index 8539fa2..bb6e73a 100644 --- a/app/MIGRATION_NOTES.adoc +++ b/app/MIGRATION_NOTES.adoc @@ -1,3 +1,55 @@ +== Migration notes (November 26, 2025 at 3:13:30 PM CET) + +=== Additions + +* Bonita Admin Application has been added in the project extensions. +* `javax.persistence:javax.persistence-api` provided dependency has been added to the BDM dao-client module. + +=== Updates + +* `.gitignore` file has been updated. +* `app/.gitignore` file has been updated. +* This project now depends on the Bonita project parent pom. This parent pom configures all the required plugins and dependencies versions for a given Bonita version. +* Rest API Extensions and Themes projects have been moved in the project layout to benefit from the Maven multi module approach. It means that files location inside the project have changed. It is a technical change and will not impact the design usage in Bonita Studio.New maven modules and their respective `pom.xml` files are *reserved for internal Studio use*. +* Project's extensions are now build in their own maven module. While it does not impact the design usage, this internal change allow the usage of a standard Maven build lifecycle. All extensions share the same `version` and `groupId` of the parent project. It is enforced by the format of the Bonita project and must not be changed. +* Application module build configuration has been updated to support Maven build. +* Bdm model module build configuration has been updated to support Maven build. +* Required Java version updated to `17`. Make sure that your third party dependencies are compliant with Java 17. +* Procurement_application.xml application descriptor has been migrated to the latest schema version. +* `default_profile.xml` profile xml schema version has been updated. + +=== Removals + +* `maven.compiler.release` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `maven-install-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `maven-jar-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `maven-source-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `bonita-project-maven-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `maven-shade-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `maven-compiler-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `build-helper-maven-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `maven-clean-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `project.reporting.outputEncoding` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `flatten-maven-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `bonita.runtime.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `project.build.sourceEncoding` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `maven-resources-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `maven-deploy-plugin.version` property has been removed from parent pom. This property is now inherited from the Bonita Project parent pom. +* `org.bonitasoft.runtime:bonita-runtime-bom` BOM has been removed from parent pom. This BOM is now inherited from the Bonita Project parent pom. +* `org.apache.maven.plugins:maven-install-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.apache.maven.plugins:maven-source-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.apache.maven.plugins:maven-compiler-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.apache.maven.plugins:maven-clean-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.apache.maven.plugins:maven-jar-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.apache.maven.plugins:maven-resources-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.apache.maven.plugins:maven-deploy-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.apache.maven.plugins:maven-shade-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.codehaus.mojo:flatten-maven-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.bonitasoft.maven:bonita-project-maven-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* `org.codehaus.mojo:build-helper-maven-plugin` plugin has been removed from parent pom. Its configuration is now inherited from the Bonita Project parent pom. +* Deprecated provided groovy classes `BonitaUsers`, `BonitaSql`, `BonitaXML` and `BonitaTypes` have been removed. +* The `flatten-maven-plugin` executions have been removed from the Bdm parent module. They are now inherited from the Bonita project parent. + == Migration notes (6 septembre 2023 à 15:14:10 CEST) === Updates diff --git a/app/applications/Procurement_application.xml b/app/applications/Procurement_application.xml index 5faa729..1da4c2c 100644 --- a/app/applications/Procurement_application.xml +++ b/app/applications/Procurement_application.xml @@ -1,6 +1,6 @@ - - + + Procurement This a procurement sample application. diff --git a/app/diagrams/Create supplier-1.0.proc b/app/diagrams/Create supplier-1.0.proc index 0aba2a2..ee70ef3 100644 --- a/app/diagrams/Create supplier-1.0.proc +++ b/app/diagrams/Create supplier-1.0.proc @@ -1,6 +1,6 @@ - - + + diff --git a/app/diagrams/Init sample procurement data-1.0.proc b/app/diagrams/Init sample procurement data-1.0.proc index 1549ad8..5149032 100644 --- a/app/diagrams/Init sample procurement data-1.0.proc +++ b/app/diagrams/Init sample procurement data-1.0.proc @@ -1,6 +1,6 @@ - - + + diff --git a/app/diagrams/Procurement request-1.0.proc b/app/diagrams/Procurement request-1.0.proc index 39c3098..ff15d9c 100644 --- a/app/diagrams/Procurement request-1.0.proc +++ b/app/diagrams/Procurement request-1.0.proc @@ -1,6 +1,6 @@ - - + + @@ -57,7 +57,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -659,7 +659,7 @@ - + @@ -794,7 +794,7 @@ - + diff --git a/app/organizations/ACME.organization b/app/organizations/ACME.xml similarity index 99% rename from app/organizations/ACME.organization rename to app/organizations/ACME.xml index b7682e3..9ab9c9a 100644 --- a/app/organizations/ACME.organization +++ b/app/organizations/ACME.xml @@ -1,5 +1,5 @@ - + William diff --git a/app/pom.xml b/app/pom.xml index e36103a..ff818f4 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -11,8 +11,8 @@ Official Procurement Living Application example for Bonita - org.bonitasoft.engine - bonita-common + com.bonitasoft.engine + bonita-common-sp provided @@ -102,47 +102,168 @@ ${project.version} provided + + com.bonitasoft.web.application + bonita-admin-application-sp + zip + application + compile + - maven-install-plugin - - true - - - - maven-jar-plugin - - true - + gmavenplus-plugin + org.codehaus.gmavenplus + + + bonita-project-properties + + execute + + + + generate-application-properties + + execute + + + + generate-classpath-assembly + + execute + + + - maven-deploy-plugin - - true - + bonita-project-maven-plugin + org.bonitasoft.maven + + + process-bonita-artifacts + + copy-provided-pages + business-archive + uid-page + merge-configuration + + + - org.codehaus.mojo build-helper-maven-plugin + org.codehaus.mojo - generate-sources + add-source-folder add-source - src-connectors - src-filters src-groovy - src-providedGroovy + ${project.build.directory}/generated-groovy-sources + + org.apache.maven.plugins + maven-assembly-plugin + + + application-archive + + single + + + + application-classpath + + single + + + + + + + bundle + + + + maven-dependency-plugin + + + prepare-bundle-enterprise + + unpack + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + + configure-bundle + + execute + + + + + + maven-assembly-plugin + + + bundle-archive-enterprise + + single + + + + + + + + + docker + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + + generate-docker-resources + + execute + + + + + + org.codehaus.mojo + exec-maven-plugin + + + build-image + + exec + + + + + + + + bonitasoft.jfrog.io/docker/bonita-subscription + + + diff --git a/app/process_configurations/_RD8ycRKuEeWPr7pxbi20Rg.conf b/app/process_configurations/_RD8ycRKuEeWPr7pxbi20Rg.conf index 129ff0a..85bb413 100644 --- a/app/process_configurations/_RD8ycRKuEeWPr7pxbi20Rg.conf +++ b/app/process_configurations/_RD8ycRKuEeWPr7pxbi20Rg.conf @@ -1,5 +1,5 @@ - + diff --git a/app/process_configurations/_RehaYQhBEeWypMcgJpEEWg.conf b/app/process_configurations/_RehaYQhBEeWypMcgJpEEWg.conf index 129ff0a..85bb413 100644 --- a/app/process_configurations/_RehaYQhBEeWypMcgJpEEWg.conf +++ b/app/process_configurations/_RehaYQhBEeWypMcgJpEEWg.conf @@ -1,5 +1,5 @@ - + diff --git a/app/process_configurations/_yBZV0RKsEeWPr7pxbi20Rg.conf b/app/process_configurations/_yBZV0RKsEeWPr7pxbi20Rg.conf index da8a633..09588e4 100644 --- a/app/process_configurations/_yBZV0RKsEeWPr7pxbi20Rg.conf +++ b/app/process_configurations/_yBZV0RKsEeWPr7pxbi20Rg.conf @@ -1,5 +1,5 @@ - + diff --git a/app/profiles/default_profile.xml b/app/profiles/default_profile.xml index 85f1dae..62653ba 100644 --- a/app/profiles/default_profile.xml +++ b/app/profiles/default_profile.xml @@ -1,6 +1,5 @@ - - - + + @@ -10,7 +9,7 @@ - + @@ -20,4 +19,4 @@ - + \ No newline at end of file diff --git a/app/web_page/createSupplierForm/assets/css/style.css b/app/web_page/createSupplierForm/assets/css/style.css index b46df17..392a8df 100644 --- a/app/web_page/createSupplierForm/assets/css/style.css +++ b/app/web_page/createSupplierForm/assets/css/style.css @@ -11,7 +11,8 @@ /* Set a red border to invalid input fields in forms */ input[type='text'].ng-invalid.ng-dirty, input[type='email'].ng-invalid.ng-dirty, -input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-dirty { +input[type='number'].ng-invalid.ng-dirty, input[type='url'].ng-invalid.ng-dirty, +input[type='password'].ng-invalid.ng-dirty { border-color: #C00; border-width: 1px; } @@ -35,3 +36,22 @@ input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-d z-index: 9999; } + + +.ngdialog.ngdialog-theme-default .ngdialog-content { + width: 700px; + box-shadow: 0 5px 15px rgba(0,0,0,0.5); + background: #fff; + padding: 0; +} + +.ngdialog.ngdialog-theme-default { + padding-top: 30px; +} + +@media screen and (max-width: 767px) { + .ngdialog.ngdialog-theme-default .ngdialog-content { + width: 75%; + } +} + diff --git a/app/web_page/createSupplierForm/createSupplierForm.json b/app/web_page/createSupplierForm/createSupplierForm.json index 278b09e..214f390 100644 --- a/app/web_page/createSupplierForm/createSupplierForm.json +++ b/app/web_page/createSupplierForm/createSupplierForm.json @@ -3,9 +3,9 @@ "name" : "createSupplierForm", "type" : "form", "uuid" : "b9f98a70-ae41-45bf-8f73-739fb9e45e2d", - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1694006048991, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166407628, "description" : "Page generated with Bonita UI designer", "rows" : [ [ diff --git a/app/web_page/initSampleProcurementDataForm/assets/css/style.css b/app/web_page/initSampleProcurementDataForm/assets/css/style.css index ebb7b54..5ee4314 100644 --- a/app/web_page/initSampleProcurementDataForm/assets/css/style.css +++ b/app/web_page/initSampleProcurementDataForm/assets/css/style.css @@ -11,7 +11,8 @@ /* Set a red border to invalid input fields in forms */ input[type='text'].ng-invalid.ng-dirty, input[type='email'].ng-invalid.ng-dirty, -input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-dirty { +input[type='number'].ng-invalid.ng-dirty, input[type='url'].ng-invalid.ng-dirty, +input[type='password'].ng-invalid.ng-dirty { border-color: #C00; border-width: 1px; } @@ -33,3 +34,22 @@ input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-d .modal-open .timepicker { z-index: 9999; } + + +.ngdialog.ngdialog-theme-default .ngdialog-content { + width: 700px; + box-shadow: 0 5px 15px rgba(0,0,0,0.5); + background: #fff; + padding: 0; +} + +.ngdialog.ngdialog-theme-default { + padding-top: 30px; +} + +@media screen and (max-width: 767px) { + .ngdialog.ngdialog-theme-default .ngdialog-content { + width: 75%; + } +} + diff --git a/app/web_page/initSampleProcurementDataForm/initSampleProcurementDataForm.json b/app/web_page/initSampleProcurementDataForm/initSampleProcurementDataForm.json index dfa4231..737d901 100644 --- a/app/web_page/initSampleProcurementDataForm/initSampleProcurementDataForm.json +++ b/app/web_page/initSampleProcurementDataForm/initSampleProcurementDataForm.json @@ -3,9 +3,9 @@ "name" : "initSampleProcurementDataForm", "type" : "form", "uuid" : "50c48546-9ce4-4d8f-9826-4d5b18847d0a", - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1694006049197, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166407703, "description" : "Page generated with Bonita UI designer", "rows" : [ [ diff --git a/app/web_page/procurementCompleteQuotationForm/assets/css/style.css b/app/web_page/procurementCompleteQuotationForm/assets/css/style.css index ebb7b54..5ee4314 100644 --- a/app/web_page/procurementCompleteQuotationForm/assets/css/style.css +++ b/app/web_page/procurementCompleteQuotationForm/assets/css/style.css @@ -11,7 +11,8 @@ /* Set a red border to invalid input fields in forms */ input[type='text'].ng-invalid.ng-dirty, input[type='email'].ng-invalid.ng-dirty, -input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-dirty { +input[type='number'].ng-invalid.ng-dirty, input[type='url'].ng-invalid.ng-dirty, +input[type='password'].ng-invalid.ng-dirty { border-color: #C00; border-width: 1px; } @@ -33,3 +34,22 @@ input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-d .modal-open .timepicker { z-index: 9999; } + + +.ngdialog.ngdialog-theme-default .ngdialog-content { + width: 700px; + box-shadow: 0 5px 15px rgba(0,0,0,0.5); + background: #fff; + padding: 0; +} + +.ngdialog.ngdialog-theme-default { + padding-top: 30px; +} + +@media screen and (max-width: 767px) { + .ngdialog.ngdialog-theme-default .ngdialog-content { + width: 75%; + } +} + diff --git a/app/web_page/procurementCompleteQuotationForm/procurementCompleteQuotationForm.json b/app/web_page/procurementCompleteQuotationForm/procurementCompleteQuotationForm.json index 933b2c7..093b9b1 100644 --- a/app/web_page/procurementCompleteQuotationForm/procurementCompleteQuotationForm.json +++ b/app/web_page/procurementCompleteQuotationForm/procurementCompleteQuotationForm.json @@ -3,9 +3,9 @@ "name" : "procurementCompleteQuotationForm", "type" : "form", "uuid" : "c28d545b-6571-4107-b577-a547a8c21915", - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1694006049221, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166407767, "description" : "Page generated with Bonita UI designer", "rows" : [ [ diff --git a/app/web_page/procurementRequestCreationForm/assets/css/style.css b/app/web_page/procurementRequestCreationForm/assets/css/style.css index ebb7b54..5ee4314 100644 --- a/app/web_page/procurementRequestCreationForm/assets/css/style.css +++ b/app/web_page/procurementRequestCreationForm/assets/css/style.css @@ -11,7 +11,8 @@ /* Set a red border to invalid input fields in forms */ input[type='text'].ng-invalid.ng-dirty, input[type='email'].ng-invalid.ng-dirty, -input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-dirty { +input[type='number'].ng-invalid.ng-dirty, input[type='url'].ng-invalid.ng-dirty, +input[type='password'].ng-invalid.ng-dirty { border-color: #C00; border-width: 1px; } @@ -33,3 +34,22 @@ input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-d .modal-open .timepicker { z-index: 9999; } + + +.ngdialog.ngdialog-theme-default .ngdialog-content { + width: 700px; + box-shadow: 0 5px 15px rgba(0,0,0,0.5); + background: #fff; + padding: 0; +} + +.ngdialog.ngdialog-theme-default { + padding-top: 30px; +} + +@media screen and (max-width: 767px) { + .ngdialog.ngdialog-theme-default .ngdialog-content { + width: 75%; + } +} + diff --git a/app/web_page/procurementRequestCreationForm/procurementRequestCreationForm.json b/app/web_page/procurementRequestCreationForm/procurementRequestCreationForm.json index 73cdb75..d408355 100644 --- a/app/web_page/procurementRequestCreationForm/procurementRequestCreationForm.json +++ b/app/web_page/procurementRequestCreationForm/procurementRequestCreationForm.json @@ -3,9 +3,9 @@ "name" : "procurementRequestCreationForm", "type" : "form", "uuid" : "da18acb0-d393-46d7-90ca-168bccf8904b", - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1694006049254, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166407874, "description" : "Page generated with Bonita UI designer", "rows" : [ [ diff --git a/app/web_page/procurementRequestListing/assets/css/style.css b/app/web_page/procurementRequestListing/assets/css/style.css index ebb7b54..5ee4314 100644 --- a/app/web_page/procurementRequestListing/assets/css/style.css +++ b/app/web_page/procurementRequestListing/assets/css/style.css @@ -11,7 +11,8 @@ /* Set a red border to invalid input fields in forms */ input[type='text'].ng-invalid.ng-dirty, input[type='email'].ng-invalid.ng-dirty, -input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-dirty { +input[type='number'].ng-invalid.ng-dirty, input[type='url'].ng-invalid.ng-dirty, +input[type='password'].ng-invalid.ng-dirty { border-color: #C00; border-width: 1px; } @@ -33,3 +34,22 @@ input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-d .modal-open .timepicker { z-index: 9999; } + + +.ngdialog.ngdialog-theme-default .ngdialog-content { + width: 700px; + box-shadow: 0 5px 15px rgba(0,0,0,0.5); + background: #fff; + padding: 0; +} + +.ngdialog.ngdialog-theme-default { + padding-top: 30px; +} + +@media screen and (max-width: 767px) { + .ngdialog.ngdialog-theme-default .ngdialog-content { + width: 75%; + } +} + diff --git a/app/web_page/procurementRequestListing/procurementRequestListing.json b/app/web_page/procurementRequestListing/procurementRequestListing.json index f901ff6..c440df3 100644 --- a/app/web_page/procurementRequestListing/procurementRequestListing.json +++ b/app/web_page/procurementRequestListing/procurementRequestListing.json @@ -3,9 +3,9 @@ "name" : "procurementRequestListing", "type" : "page", "uuid" : "b003d7d9-5441-4071-b6df-71c0c4f470f8", - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1711111258932, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166408010, "description" : "Page generated with Bonita UI designer", "rows" : [ [ diff --git a/app/web_page/procurementReviewQuotationsForm/assets/css/style.css b/app/web_page/procurementReviewQuotationsForm/assets/css/style.css index ebb7b54..5ee4314 100644 --- a/app/web_page/procurementReviewQuotationsForm/assets/css/style.css +++ b/app/web_page/procurementReviewQuotationsForm/assets/css/style.css @@ -11,7 +11,8 @@ /* Set a red border to invalid input fields in forms */ input[type='text'].ng-invalid.ng-dirty, input[type='email'].ng-invalid.ng-dirty, -input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-dirty { +input[type='number'].ng-invalid.ng-dirty, input[type='url'].ng-invalid.ng-dirty, +input[type='password'].ng-invalid.ng-dirty { border-color: #C00; border-width: 1px; } @@ -33,3 +34,22 @@ input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-d .modal-open .timepicker { z-index: 9999; } + + +.ngdialog.ngdialog-theme-default .ngdialog-content { + width: 700px; + box-shadow: 0 5px 15px rgba(0,0,0,0.5); + background: #fff; + padding: 0; +} + +.ngdialog.ngdialog-theme-default { + padding-top: 30px; +} + +@media screen and (max-width: 767px) { + .ngdialog.ngdialog-theme-default .ngdialog-content { + width: 75%; + } +} + diff --git a/app/web_page/procurementReviewQuotationsForm/procurementReviewQuotationsForm.json b/app/web_page/procurementReviewQuotationsForm/procurementReviewQuotationsForm.json index 35a29e9..5df4f00 100644 --- a/app/web_page/procurementReviewQuotationsForm/procurementReviewQuotationsForm.json +++ b/app/web_page/procurementReviewQuotationsForm/procurementReviewQuotationsForm.json @@ -3,9 +3,9 @@ "name" : "procurementReviewQuotationsForm", "type" : "form", "uuid" : "d5c2669f-f688-43e6-ace9-dc475ed6833c", - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1694006049293, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166408079, "description" : "Page generated with Bonita UI designer", "rows" : [ [ diff --git a/app/web_page/supplierListing/assets/css/style.css b/app/web_page/supplierListing/assets/css/style.css index ebb7b54..5ee4314 100644 --- a/app/web_page/supplierListing/assets/css/style.css +++ b/app/web_page/supplierListing/assets/css/style.css @@ -11,7 +11,8 @@ /* Set a red border to invalid input fields in forms */ input[type='text'].ng-invalid.ng-dirty, input[type='email'].ng-invalid.ng-dirty, -input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-dirty { +input[type='number'].ng-invalid.ng-dirty, input[type='url'].ng-invalid.ng-dirty, +input[type='password'].ng-invalid.ng-dirty { border-color: #C00; border-width: 1px; } @@ -33,3 +34,22 @@ input[type='number'].ng-invalid.ng-dirty, input[type='password'].ng-invalid.ng-d .modal-open .timepicker { z-index: 9999; } + + +.ngdialog.ngdialog-theme-default .ngdialog-content { + width: 700px; + box-shadow: 0 5px 15px rgba(0,0,0,0.5); + background: #fff; + padding: 0; +} + +.ngdialog.ngdialog-theme-default { + padding-top: 30px; +} + +@media screen and (max-width: 767px) { + .ngdialog.ngdialog-theme-default .ngdialog-content { + width: 75%; + } +} + diff --git a/app/web_page/supplierListing/supplierListing.json b/app/web_page/supplierListing/supplierListing.json index ebf2000..702f830 100644 --- a/app/web_page/supplierListing/supplierListing.json +++ b/app/web_page/supplierListing/supplierListing.json @@ -3,9 +3,9 @@ "name" : "supplierListing", "type" : "page", "uuid" : "22b348dd-65be-4592-b6c3-fd0292899189", - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1711111135955, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166408150, "description" : "Page generated with Bonita UI designer", "rows" : [ [ diff --git a/app/web_widgets/customAlert/customAlert.json b/app/web_widgets/customAlert/customAlert.json index fb587dd..3d853f9 100644 --- a/app/web_widgets/customAlert/customAlert.json +++ b/app/web_widgets/customAlert/customAlert.json @@ -3,9 +3,9 @@ "name" : "alert", "type" : "widget", "custom" : true, - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1694006049195, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166407698, "description" : "Customizable Bootstrap alert", "template" : "@customAlert.tpl.html", "controller" : "@customAlert.ctrl.js", diff --git a/app/web_widgets/customListTransferButtons/customListTransferButtons.json b/app/web_widgets/customListTransferButtons/customListTransferButtons.json index 9b0c0c6..e33dca9 100644 --- a/app/web_widgets/customListTransferButtons/customListTransferButtons.json +++ b/app/web_widgets/customListTransferButtons/customListTransferButtons.json @@ -3,9 +3,9 @@ "name" : "listTransferButtons", "type" : "widget", "custom" : true, - "modelVersion" : "2.4", - "previousArtifactVersion" : "2.3", - "lastUpdate" : 1694006049252, + "modelVersion" : "2.6", + "previousArtifactVersion" : "2.4", + "lastUpdate" : 1764166407865, "description" : "Buttons for transferring elements between two lists", "template" : "@customListTransferButtons.tpl.html", "controller" : "@customListTransferButtons.ctrl.js", diff --git a/bdm/dao-client/pom.xml b/bdm/dao-client/pom.xml index a1aa006..a8af49a 100644 --- a/bdm/dao-client/pom.xml +++ b/bdm/dao-client/pom.xml @@ -26,6 +26,11 @@ org.bonitasoft.engine bonita-client + + javax.persistence + javax.persistence-api + provided + diff --git a/bdm/model/pom.xml b/bdm/model/pom.xml index e3e79e3..91400fa 100644 --- a/bdm/model/pom.xml +++ b/bdm/model/pom.xml @@ -58,6 +58,17 @@ + + maven-assembly-plugin + + + bdm-descriptor-archive + + single + + + + diff --git a/bdm/pom.xml b/bdm/pom.xml index 3afe35c..c7d30a6 100644 --- a/bdm/pom.xml +++ b/bdm/pom.xml @@ -15,26 +15,7 @@ - org.codehaus.mojo - flatten-maven-plugin - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - + org.apache.maven.plugins maven-source-plugin @@ -43,8 +24,10 @@ jar-no-fork + + diff --git a/extensions/.project b/extensions/.project new file mode 100644 index 0000000..98958dd --- /dev/null +++ b/extensions/.project @@ -0,0 +1,17 @@ + + + procurement-example-extensions + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/extensions/pom.xml b/extensions/pom.xml new file mode 100644 index 0000000..880fdb5 --- /dev/null +++ b/extensions/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + org.bonitasoft.example + procurement-example-parent + 3.2 + + procurement-example-extensions + pom + + + + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + diff --git a/pom.xml b/pom.xml index 2ddc977..324d8ae 100644 --- a/pom.xml +++ b/pom.xml @@ -1,100 +1,23 @@ - - - 4.0.0 - org.bonitasoft.example - procurement-example-parent - 3.2 - pom - - app - bdm - - - 3.0.0-M1 - 11 - 3.3.0 - 3.2.1 - 0.1.1 - 3.4.1 - 3.10.1 - 3.3.0 - 3.2.0 - 1.3.0 - UTF-8 - 8.0.0 - UTF-8 - 3.3.0 - 3.0.0 - - - - - org.bonitasoft.runtime - bonita-runtime-bom - ${bonita.runtime.version} - pom - import - - - - - - - - maven-install-plugin - ${maven-install-plugin.version} - - - maven-source-plugin - ${maven-source-plugin.version} - - - maven-compiler-plugin - ${maven-compiler-plugin.version} - - - maven-clean-plugin - ${maven-clean-plugin.version} - - - maven-jar-plugin - ${maven-jar-plugin.version} - - - maven-resources-plugin - ${maven-resources-plugin.version} - - - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - maven-shade-plugin - ${maven-shade-plugin.version} - - - org.codehaus.mojo - flatten-maven-plugin - ${flatten-maven-plugin.version} - - - org.bonitasoft.maven - bonita-project-maven-plugin - ${bonita-project-maven-plugin.version} - - - org.bonitasoft.engine.data - bonita-business-data-generator - ${bonita.runtime.version} - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper-maven-plugin.version} - - - - - + + + 4.0.0 + + org.bonitasoft + bonita-project + 10.2.4 + + org.bonitasoft.example + procurement-example-parent + 3.2 + pom + + + + + app + bdm + extensions + + + From d7ab8eb39999d46ff67c663316142ccfebf99c16 Mon Sep 17 00:00:00 2001 From: akantcheff Date: Wed, 26 Nov 2025 15:20:43 +0100 Subject: [PATCH 2/3] Bonita '10.2.4' to '10.3.1' automated migration --- .project | 2 +- app/MIGRATION_NOTES.adoc | 6 +++ app/diagrams/Create supplier-1.0.proc | 2 +- .../Init sample procurement data-1.0.proc | 2 +- app/diagrams/Procurement request-1.0.proc | 18 ++++---- .../_RD8ycRKuEeWPr7pxbi20Rg.conf | 5 +-- .../_RehaYQhBEeWypMcgJpEEWg.conf | 5 +-- .../_yBZV0RKsEeWPr7pxbi20Rg.conf | 5 +-- pom.xml | 45 +++++++++---------- 9 files changed, 43 insertions(+), 47 deletions(-) diff --git a/.project b/.project index 9db5bf7..8e4d85b 100644 --- a/.project +++ b/.project @@ -1,7 +1,7 @@ procurement-example - 10.2.4 + 10.3.1 diff --git a/app/MIGRATION_NOTES.adoc b/app/MIGRATION_NOTES.adoc index bb6e73a..f6bcaf5 100644 --- a/app/MIGRATION_NOTES.adoc +++ b/app/MIGRATION_NOTES.adoc @@ -1,3 +1,9 @@ +== Migration notes (November 26, 2025, 3:20:39 PM CET) + +=== Updates + +* Bonita project parent has been updated from `10.2.4` to `10.3.1`. + == Migration notes (November 26, 2025 at 3:13:30 PM CET) === Additions diff --git a/app/diagrams/Create supplier-1.0.proc b/app/diagrams/Create supplier-1.0.proc index ee70ef3..924c3c1 100644 --- a/app/diagrams/Create supplier-1.0.proc +++ b/app/diagrams/Create supplier-1.0.proc @@ -1,6 +1,6 @@ - + diff --git a/app/diagrams/Init sample procurement data-1.0.proc b/app/diagrams/Init sample procurement data-1.0.proc index 5149032..85f7f25 100644 --- a/app/diagrams/Init sample procurement data-1.0.proc +++ b/app/diagrams/Init sample procurement data-1.0.proc @@ -1,6 +1,6 @@ - + diff --git a/app/diagrams/Procurement request-1.0.proc b/app/diagrams/Procurement request-1.0.proc index ff15d9c..37f17cd 100644 --- a/app/diagrams/Procurement request-1.0.proc +++ b/app/diagrams/Procurement request-1.0.proc @@ -1,6 +1,6 @@ - + @@ -57,7 +57,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -659,7 +659,7 @@ - + @@ -794,7 +794,7 @@ - + diff --git a/app/process_configurations/_RD8ycRKuEeWPr7pxbi20Rg.conf b/app/process_configurations/_RD8ycRKuEeWPr7pxbi20Rg.conf index 85bb413..7822e42 100644 --- a/app/process_configurations/_RD8ycRKuEeWPr7pxbi20Rg.conf +++ b/app/process_configurations/_RD8ycRKuEeWPr7pxbi20Rg.conf @@ -1,5 +1,5 @@ - + @@ -12,8 +12,5 @@ - - - diff --git a/app/process_configurations/_RehaYQhBEeWypMcgJpEEWg.conf b/app/process_configurations/_RehaYQhBEeWypMcgJpEEWg.conf index 85bb413..7822e42 100644 --- a/app/process_configurations/_RehaYQhBEeWypMcgJpEEWg.conf +++ b/app/process_configurations/_RehaYQhBEeWypMcgJpEEWg.conf @@ -1,5 +1,5 @@ - + @@ -12,8 +12,5 @@ - - - diff --git a/app/process_configurations/_yBZV0RKsEeWPr7pxbi20Rg.conf b/app/process_configurations/_yBZV0RKsEeWPr7pxbi20Rg.conf index 09588e4..936015d 100644 --- a/app/process_configurations/_yBZV0RKsEeWPr7pxbi20Rg.conf +++ b/app/process_configurations/_yBZV0RKsEeWPr7pxbi20Rg.conf @@ -1,5 +1,5 @@ - + @@ -84,10 +84,7 @@ - - - diff --git a/pom.xml b/pom.xml index 324d8ae..7729526 100644 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,22 @@ - - - 4.0.0 - - org.bonitasoft - bonita-project - 10.2.4 - - org.bonitasoft.example - procurement-example-parent - 3.2 - pom - - - - - app - bdm - extensions - - - + + + 4.0.0 + + org.bonitasoft + bonita-project + 10.3.1 + + org.bonitasoft.example + procurement-example-parent + 3.2 + pom + + + + + app + bdm + extensions + + + From 3efcbd96b0d323ea9c9c7788492c8b9ec2e3e42b Mon Sep 17 00:00:00 2001 From: akantcheff Date: Wed, 26 Nov 2025 17:37:14 +0100 Subject: [PATCH 3/3] chore: update version to 4.0 --- app/pom.xml | 538 ++++++++++++++++++++--------------------- bdm/dao-client/pom.xml | 216 ++++++++--------- bdm/model/pom.xml | 148 ++++++------ bdm/pom.xml | 66 ++--- extensions/pom.xml | 52 ++-- pom.xml | 44 ++-- 6 files changed, 532 insertions(+), 532 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index ff818f4..dda537a 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -1,269 +1,269 @@ - - - 4.0.0 - - org.bonitasoft.example - procurement-example-parent - 3.2 - - procurement-example - procurement-example - Official Procurement Living Application example for Bonita - - - com.bonitasoft.engine - bonita-common-sp - provided - - - org.codehaus.groovy - groovy - provided - - - org.codehaus.groovy - groovy-json - provided - - - org.codehaus.groovy - groovy-xml - provided - - - org.codehaus.groovy - groovy-nio - provided - - - org.codehaus.groovy - groovy-datetime - provided - - - org.codehaus.groovy - groovy-dateutil - provided - - - org.codehaus.groovy - groovy-sql - provided - - - org.codehaus.groovy - groovy-templates - provided - - - org.codehaus.groovy - groovy-jsr223 - provided - - - org.codehaus.groovy - groovy-jmx - provided - - - org.codehaus.groovy - groovy-yaml - provided - - - org.codehaus.groovy - groovy-servlet - provided - - - org.bonitasoft.actorfilter - bonita-actorfilter-initiator - 1.0.0 - compile - - - org.bonitasoft.connectors - bonita-connector-rest - 1.2.0 - - - org.bonitasoft.connectors - bonita-connector-document-converter - 2.3.0 - - - org.bonitasoft.connectors - bonita-connector-document-templating - 2.3.0 - - - ${project.groupId} - procurement-example-bdm-model - ${project.version} - provided - - - com.bonitasoft.web.application - bonita-admin-application-sp - zip - application - compile - - - - - - gmavenplus-plugin - org.codehaus.gmavenplus - - - bonita-project-properties - - execute - - - - generate-application-properties - - execute - - - - generate-classpath-assembly - - execute - - - - - - bonita-project-maven-plugin - org.bonitasoft.maven - - - process-bonita-artifacts - - copy-provided-pages - business-archive - uid-page - merge-configuration - - - - - - build-helper-maven-plugin - org.codehaus.mojo - - - add-source-folder - - add-source - - - - src-groovy - ${project.build.directory}/generated-groovy-sources - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - application-archive - - single - - - - application-classpath - - single - - - - - - - - - bundle - - - - maven-dependency-plugin - - - prepare-bundle-enterprise - - unpack - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - configure-bundle - - execute - - - - - - maven-assembly-plugin - - - bundle-archive-enterprise - - single - - - - - - - - - docker - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - generate-docker-resources - - execute - - - - - - org.codehaus.mojo - exec-maven-plugin - - - build-image - - exec - - - - - - - - bonitasoft.jfrog.io/docker/bonita-subscription - - - - + + + 4.0.0 + + org.bonitasoft.example + procurement-example-parent + 4.0 + + procurement-example + procurement-example + Official Procurement Living Application example for Bonita + + + com.bonitasoft.engine + bonita-common-sp + provided + + + org.codehaus.groovy + groovy + provided + + + org.codehaus.groovy + groovy-json + provided + + + org.codehaus.groovy + groovy-xml + provided + + + org.codehaus.groovy + groovy-nio + provided + + + org.codehaus.groovy + groovy-datetime + provided + + + org.codehaus.groovy + groovy-dateutil + provided + + + org.codehaus.groovy + groovy-sql + provided + + + org.codehaus.groovy + groovy-templates + provided + + + org.codehaus.groovy + groovy-jsr223 + provided + + + org.codehaus.groovy + groovy-jmx + provided + + + org.codehaus.groovy + groovy-yaml + provided + + + org.codehaus.groovy + groovy-servlet + provided + + + org.bonitasoft.actorfilter + bonita-actorfilter-initiator + 1.0.0 + compile + + + org.bonitasoft.connectors + bonita-connector-rest + 1.2.0 + + + org.bonitasoft.connectors + bonita-connector-document-converter + 2.3.0 + + + org.bonitasoft.connectors + bonita-connector-document-templating + 2.3.0 + + + ${project.groupId} + procurement-example-bdm-model + ${project.version} + provided + + + com.bonitasoft.web.application + bonita-admin-application-sp + zip + application + compile + + + + + + gmavenplus-plugin + org.codehaus.gmavenplus + + + bonita-project-properties + + execute + + + + generate-application-properties + + execute + + + + generate-classpath-assembly + + execute + + + + + + bonita-project-maven-plugin + org.bonitasoft.maven + + + process-bonita-artifacts + + copy-provided-pages + business-archive + uid-page + merge-configuration + + + + + + build-helper-maven-plugin + org.codehaus.mojo + + + add-source-folder + + add-source + + + + src-groovy + ${project.build.directory}/generated-groovy-sources + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + application-archive + + single + + + + application-classpath + + single + + + + + + + + + bundle + + + + maven-dependency-plugin + + + prepare-bundle-enterprise + + unpack + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + + configure-bundle + + execute + + + + + + maven-assembly-plugin + + + bundle-archive-enterprise + + single + + + + + + + + + docker + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + + generate-docker-resources + + execute + + + + + + org.codehaus.mojo + exec-maven-plugin + + + build-image + + exec + + + + + + + + bonitasoft.jfrog.io/docker/bonita-subscription + + + + diff --git a/bdm/dao-client/pom.xml b/bdm/dao-client/pom.xml index a8af49a..720a648 100644 --- a/bdm/dao-client/pom.xml +++ b/bdm/dao-client/pom.xml @@ -1,108 +1,108 @@ - - - 4.0.0 - - org.bonitasoft.example - procurement-example-bdm-parent - 3.2 - - procurement-example-bdm-dao-client - - - ${project.groupId} - procurement-example-bdm-model - ${project.version} - - - org.javassist - javassist - - - org.bonitasoft.engine.data - bonita-business-data-client-resources - ${bonita.runtime.version} - - - org.bonitasoft.engine - bonita-client - - - javax.persistence - javax.persistence-api - provided - - - - - - org.bonitasoft.maven - bonita-project-maven-plugin - - - generate-bdm-dao-sources - - generate-bdm-dao-client - - - ../bom.xml - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/java - - - - - - - maven-shade-plugin - - - shade-client-resources - - shade - - - true - true - - - org.bonitasoft.engine.data:bonita-business-data-client-resources - org.bonitasoft.engine:bonita-client - - - - - org.bonitasoft.engine.data:bonita-business-data-client-resources - - org/bonitasoft/engine/bdm/dao/client/resources/**/*.class - - - - org.bonitasoft.engine.data:bonita-business-data-client-resources - META-INF/MANIFEST.MF - - - org.bonitasoft.engine:bonita-client - ** - - - - - - - - - + + + 4.0.0 + + org.bonitasoft.example + procurement-example-bdm-parent + 4.0 + + procurement-example-bdm-dao-client + + + ${project.groupId} + procurement-example-bdm-model + ${project.version} + + + org.javassist + javassist + + + org.bonitasoft.engine.data + bonita-business-data-client-resources + ${bonita.runtime.version} + + + org.bonitasoft.engine + bonita-client + + + javax.persistence + javax.persistence-api + provided + + + + + + org.bonitasoft.maven + bonita-project-maven-plugin + + + generate-bdm-dao-sources + + generate-bdm-dao-client + + + ../bom.xml + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/java + + + + + + + maven-shade-plugin + + + shade-client-resources + + shade + + + true + true + + + org.bonitasoft.engine.data:bonita-business-data-client-resources + org.bonitasoft.engine:bonita-client + + + + + org.bonitasoft.engine.data:bonita-business-data-client-resources + + org/bonitasoft/engine/bdm/dao/client/resources/**/*.class + + + + org.bonitasoft.engine.data:bonita-business-data-client-resources + META-INF/MANIFEST.MF + + + org.bonitasoft.engine:bonita-client + ** + + + + + + + + + diff --git a/bdm/model/pom.xml b/bdm/model/pom.xml index 91400fa..9718ce6 100644 --- a/bdm/model/pom.xml +++ b/bdm/model/pom.xml @@ -1,74 +1,74 @@ - - - 4.0.0 - - org.bonitasoft.example - procurement-example-bdm-parent - 3.2 - - procurement-example-bdm-model - - - org.bonitasoft.engine.data - bonita-business-data-generator - ${bonita.runtime.version} - provided - - - - - - org.bonitasoft.maven - bonita-project-maven-plugin - - - generate-bdm-model-sources - - generate-bdm-model - - - ../bom.xml - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/java - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - remove - - - - - maven-assembly-plugin - - - bdm-descriptor-archive - - single - - - - - - - + + + 4.0.0 + + org.bonitasoft.example + procurement-example-bdm-parent + 4.0 + + procurement-example-bdm-model + + + org.bonitasoft.engine.data + bonita-business-data-generator + ${bonita.runtime.version} + provided + + + + + + org.bonitasoft.maven + bonita-project-maven-plugin + + + generate-bdm-model-sources + + generate-bdm-model + + + ../bom.xml + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/java + + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + remove + + + + + maven-assembly-plugin + + + bdm-descriptor-archive + + single + + + + + + + diff --git a/bdm/pom.xml b/bdm/pom.xml index c7d30a6..7e557e0 100644 --- a/bdm/pom.xml +++ b/bdm/pom.xml @@ -1,33 +1,33 @@ - - - 4.0.0 - - org.bonitasoft.example - procurement-example-parent - 3.2 - - procurement-example-bdm-parent - pom - - model - dao-client - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - - + + + 4.0.0 + + org.bonitasoft.example + procurement-example-parent + 4.0 + + procurement-example-bdm-parent + pom + + model + dao-client + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + + + diff --git a/extensions/pom.xml b/extensions/pom.xml index 880fdb5..ccf31f6 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -1,26 +1,26 @@ - - - 4.0.0 - - org.bonitasoft.example - procurement-example-parent - 3.2 - - procurement-example-extensions - pom - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - + + + 4.0.0 + + org.bonitasoft.example + procurement-example-parent + 4.0 + + procurement-example-extensions + pom + + + + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + diff --git a/pom.xml b/pom.xml index 7729526..2f08759 100644 --- a/pom.xml +++ b/pom.xml @@ -1,22 +1,22 @@ - - - 4.0.0 - - org.bonitasoft - bonita-project - 10.3.1 - - org.bonitasoft.example - procurement-example-parent - 3.2 - pom - - - - - app - bdm - extensions - - - + + + 4.0.0 + + org.bonitasoft + bonita-project + 10.3.1 + + org.bonitasoft.example + procurement-example-parent + 4.0 + pom + + + + + app + bdm + extensions + + +