This is an automated email from the ASF dual-hosted git repository.
dependabot[bot] pushed a change to branch
dependabot/gradle/com.h2database-h2-2.5.250
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
discard d077364c8f Bump com.h2database:h2 from 2.4.240 to 2.5.250
add b470f794dd Fixed: duplicateCategoryEntities throws GroovyCastException
(OFBIZ-13563)
add e9c3244ad7 Fixed: createQuoteFromCart duplicates QuoteAdjustment
records (OFBIZ-13525)
add 6302c22681 Fixed: Quote service permission checks don't match original
design (OFBIZ-13526)
add 1622af5589 Fixed: productPriceGenericPermission ignores its own
sub-check result (OFBIZ-13538)
add 2f41b9b724 Fixed: Bump js-yaml to 4.3.2 to resolve CVE-2026-84375
add 2a9abd7644 Fixed: Party permission-check helper methods use incorrect
logic (OFBIZ-13541)
add a4f7483ebd Fixed: straightLineDepreciation uses wrong field for
elapsed years (OFBIZ-13524)
add f9a9eea814 Fixed: findCustomTimePeriods thruDate boundary and exclude
flag (OFBIZ-13527)
add a976a49235 Fixed: getFXConversion fails instead of defaulting to 1
when no rate configured (OFBIZ-13531)
add 115f457df7 Fixed: hasValidStateProvince returns String but declared
Map (OFBIZ-13533)
add 0595284c85 Fixed: recreateOrderAdjustments calls nonexistent
ShoppingCartItem.getDescription (OFBIZ-13532)
add dce2591ef4 Fixed: PartyServices contact-lookup and role-hierarchy
regressions (OFBIZ-13534)
add 23ccf061f8 Fixed: Correct portlet sequence drag and drop boundaries
and calculation (OFBIZ-13528)
add cc87a52658 Bump com.twelvemonkeys.imageio:imageio-tiff from 3.14.0 to
3.15.0
add 3f3cbf8e12 Bump dompurify in
/themes/common-theme/webapp/common-theme/js
add 9b1292f695 Bump github/codeql-action/upload-sarif
add 6ccfc8f168 Fixed: convertUom custom parameters and rounding
regressions (OFBIZ-13530)
add b139d64cc1 Fixed: filterRateAmountList sequential filtering and
fallback behavior (OFBIZ-13543)
add 1159a521fc Fixed: createMissingCategoryAndProductAltUrls default
parameter handling (OFBIZ-13539)
add 4059aab27f Fixed: createLead person creation guard for company-only
leads (OFBIZ-13549)
add e7c6af7e5a Fixed: getProductRouting virtual product variant date
filtering (OFBIZ-13550)
add c8723f95fc Fixed: getSystemInfoStatus open communication events
condition (OFBIZ-13551)
add a4d221d142 Fixed: sendOrderDeliveryScheduleNotification malformed from
address (OFBIZ-13552)
add c4c8f1d2c0 Fixed: applyFeatureToProductFromTypeAndCode sequenceNum
mutation (OFBIZ-13554)
add d58c46138e Fixed: updateBudgetStatus silent success on invalid status
transitions (OFBIZ-13558)
add b1a513ad9b Fixed: copyAgreement silent success when agreement does not
exist (OFBIZ-13559)
add 7a97ba0bb4 Fixed: createFacilityLocation locationSeqId collision
fallback regression (OFBIZ-13557)
add f2059c894c Fixed: PortalPageMethods portlet attribute saving and page
copying regressions (OFBIZ-13568)
add 96732783ca Fixed: Mini-lang to Groovy regressions in
InvoiceServicesScript (OFBIZ-13569)
add ce8cfadfe3 Fixed: Mini-lang to Groovy regressions in
CommonServicesScript (OFBIZ-13570)
add 0fe9f63d2d Fixed: error in creating category image content.
(OFBIZ-12011) (#1694)
add 0ad2ac60da Fixed: Mini-lang to Groovy regressions in
QuoteServicesScript (OFBIZ-13571)
add 5507b49bcf Bump github/codeql-action/upload-sarif
add 2b0be7cf77 Fixed: MiniLang to Groovy conversion issues in
ContactMechServicesScript (OFBIZ-13572)
add 10df14008e Bump github/codeql-action/autobuild from 4.37.9 to 4.38.0
add f192d9cb09 Bump github/codeql-action/init and analyze to v4.38.0
add 0f0202c7ef Fixed: Mini-lang to Groovy regressions in
InvoiceServicesScript (OFBIZ-13575)
add 1290618031 Fixed: updateBudgetStatus invalid-transition error omits
the requested status (OFBIZ-13558)
add bd4bff1b87 Implemented: real POI-based .xlsx export via a new
screenxlsx view-handler type (OFBIZ-13567)
add 6c844b668b Fixed: Mini-lang to Groovy regressions in
ProductStoreServices (OFBIZ-13576)
add 1138b75968 Fixed: Mini-lang to Groovy regressions in
InventoryIssueServices (OFBIZ-13577)
add 74b2fa1137 Fixed: Mini-lang to Groovy regressions in
ShoppingListServicesScript (OFBIZ-13579)
add 7e4b510dc2 Fixed: Mini-lang to Groovy regressions in
PortalPageServices (OFBIZ-13580)
add 0269e6240d Fixed: Mini-lang to Groovy regressions in
EmailServicesScript (OFBIZ-13581)
add 04cfc34698 Removed: obsolete screenxls view-handler type, superseded
by screenxlsx (OFBIZ-13578)
add 21acf41bc8 Bump com.auth0:java-jwt from 4.6.0 to 4.6.1
add 8911dbe619 Fixed: Timing-dependent deadlock-retry test in service
engine (OFBIZ-13585)
add 8754ba969f Bump org.apache.james:apache-mime4j-core from 0.8.14 to
0.8.15
add 33746b0bf9 Bump github/codeql-action/upload-sarif
add 6c05b16bb6 Bump actions/setup-java from 6.0.0 to 6.0.1
add 9399768531 Bump org.bouncycastle:bcprov-jdk18on from 1.85.2 to 1.86
add b559ac035b Bump redoc from 2.5.3 to 2.5.4 in /framework/rest-api
add 72f5ae7dcd Fixed: updateContentPermission grants UPDATE via ancestor
ownership without an ownership change request (OFBIZ-13592)
add 7f1d8df019 Fixed: Six regressions in the minilang-to-Groovy conversion
of PaymentServices.groovy (OFBIZ-13596)
add 6f64c433cb Fixed: createEmailAddress and updateEmailAddress accept
blank email addresses (OFBIZ-13582)
add 43222d5b3c Fixed: Two regressions in the minilang-to-Groovy conversion
of CommonServicesScript.groovy (OFBIZ-13583)
add 5f1730bdf6 Fixed: createUpdateBillingAddressAndPaymentMethod throws
NPE for anonymous checkout (OFBIZ-13584)
add ccd8f036d8 Groovy DSL Enhancements (#2010)
add e4fb4b7886 Fixed: updatePartyRate does not persist expiry of the
previous rate (OFBIZ-13590)
add 896b4e6fb8 Fixed: Two regressions in the minilang-to-Groovy conversion
of ContentServicesScript.groovy (OFBIZ-13589)
add e771baad4d Bump tomcat from 10.1.59 to 10.1.60
add 27d9b9c506 Fixed: setCommEventRoleToRead and
setCommunicationEventRoleStatus throw NPE when no role exists (OFBIZ-13591)
add 5a0be63e93 Groovy dsl enhancement applied (#2018)
add 741fa6fca4 Fixed: Four regressions in the minilang-to-Groovy
conversion of PartyServicesScript.groovy (OFBIZ-13593)
add 0d4c438067 Fixed: getLastSystemInfoNote off-by-one on note 2 and note
3 thresholds (OFBIZ-13586)
add afe3b95b6d Fixed: PDF print and create file actions failing from Find
Orders (OF… (#2024)
add c7503e0c62 Fixed: checkInvoiceStatusInProgress loses its specific
error messages (OFBIZ-13587)
add 11ad4c1fdb Improved: View combined PDF of selected orders from Find
Orders (OFBIZ-13598) (#2025)
add d611864a4d Fixed: setPortalPortletAttributes doesn't clean up blank
attribute values (OFBIZ-13588)
add fda763909b Implemented: Prevent unnecessary session creation during
rest-api authentication (OFBIZ-12033) (#2028)
add 745ceb44fc Fixed: updatePartyInvitation silently no-ops on a
nonexistent record (OFBIZ-13594)
add 57c34ee747 Fixed: accAndDecPartyInvitationPermissionCheck shows the
wrong error message on an identity mismatch (OFBIZ-13595)
add 613043d657 Fixed: Two regressions in saveExtFileDataResource's
handling of a missing DataResource (OFBIZ-13597)
add 10a2c78cf9 Bump github/codeql-action/upload-sarif
add 56601b3dfa Groovy DSL Enhancement - Part 2 (#2038)
add 9f86d1040e Fixed: ModelApiReader resolved omitted auth/publish
attributes to false, opposite of rest-api.xsd's declared default (#2011)
add 7aff21fa2a Groovy DSL cleanup: WorkEffort helper, double-negation
fixes, update() adoption (#2039)
add 8839dbeeb7 Implemented: Support for independent rest-apis
(OFBIZ-13440) (#1790)
add 4d62756268 Bump github/codeql-action/upload-sarif
add 2578f62ebf Extend the update()/delete() DSL with safer toggles, plus
two bugs fixed along the way (#2043)
add 79936a6635 Bump github/codeql-action/upload-sarif
add 6911fc2980 Bump docker/build-push-action from 7.3.0 to 7.4.0
add edf8e9bc31 Bump moment-timezone in
/themes/common-theme/webapp/common-theme/js
add 3531f6eed9 Fixed: Three regressions in the minilang-to-Groovy
conversion of PaymentServices.groovy (OFBIZ-13600)
add 1bdd5edb37 Adopt update() DSL in ImageManagementServicesScript and
OrderServicesScript (#2050)
add 228a035259 Fixed: Multiple regressions and one pre-existing bug in
WorkEffortServicesScript.groovy (OFBIZ-13601)
add 8a1c007062 Fixed: visualThemePermissionCheck() checks a permission ID
that doesn't exist (OFBIZ-13602)
add bd6e4890c9 Fixed: Two regressions in
OrderRequirementServicesScript.groovy break automatic-requirement generation
(OFBIZ-13603)
add facd72ccb5 Fixed: createFuturePeriod() crashes with
NullPointerException when CustomTimePeriod SystemProperty config is missing
(OFBIZ-13604)
add 86f99c1aec Fixed: Added missing licenses (OFBIZ-27538) (#2063)
add 6f3f3ff411 Bump github/codeql-action/upload-sarif
add 8b58d9851a Bump github/codeql-action/init from 4.38.0 to 4.38.1
add 567761643f Bump github/codeql-action/autobuild from 4.38.0 to 4.38.1
add 774ddac1f0 Bump github/codeql-action/analyze from 4.38.0 to 4.38.1
add 5745b73f2c Bump com.twelvemonkeys.imageio:imageio-tiff from 3.15.0 to
3.15.2
add 8d8047dc7a Bump swagger-ui-dist from 5.32.15 to 5.33.0 in
/framework/rest-api
add 613bb9f361 Bump org.apache.groovy:groovy-all from 5.1.2 to 5.1.3
add cae2bb65c1 Fixed: EntityCrypto uses AES in ECB mode for encrypt="true"
fields, producing deterministic ciphertext (OFBIZ-13599) (#2055)
add 17736a72a4 Bump github/codeql-action/upload-sarif
add bf5a26af85 Bump github/codeql-action/upload-sarif
add 55f2405e20 Fixed: AdminServer no longer starts without a configured
admin key
add 3cf93ad862 Fixed: ViewFile no longer discloses arbitrary properties or
xml files
add b361fe2b34 Fixed: moveContentJson lets a caller without UPDATE
permission re-parent content associations
add b4ad4b02c6 Fixed: createReturnItem() does not cap returnPrice to
returnablePrice for non-privileged callers
add a63cc20481 Improved: Harden the ProgramExport Groovy sandbox against
indirectly-named method calls
add d1238a2756 Improved: deleteContentJson lets a caller without DELETE
permission detach content and cascade-delete its alias subtree (#2099)
add 62fe61202f Fixed: quickReturnFromOrder() permission guard is a no-op
due to an operator-precedence error
add 326481a0ee Fixed: PBKDF2 password verification always fails in
HashCrypt.doComparePbkdf2 (OFBIZ-13609)
add ddec45f8c1 Fixed: Two regressions in the minilang-to-Groovy conversion
of CommonServicesScript.groovy (OFBIZ-13610)
add b39268e8a8 Fixed: Three regressions in the minilang-to-Groovy
conversion of PortalPageServices.groovy (OFBIZ-13611)
add b40ed9a861 Fixed: HashCrypt compares non-PBKDF2 password hashes with
variable-time String.equals() (OFBIZ-13615)
add 1035243069 Fixed: Regression in the minilang-to-Groovy conversion of
ProductStoreServices.groovy (OFBIZ-13613)
add 4221b119dd Fixed: Regression in the minilang-to-Groovy conversion of
ContactMechServicesScript.groovy (OFBIZ-13612)
add f778f1fbc6 Fixed: Regression in the minilang-to-Groovy conversion of
InventoryIssueServices.groovy (OFBIZ-13614)
add ea4a99f35a Fixed: Two regressions in the minilang-to-Groovy conversion
of PriceServicesScript.groovy (OFBIZ-13616)
add 5400cf0708 Fixed: DELETE statements built from EntityCondition inlined
values as SQL literals instead of binding them (OFBIZ-13620)
add e76ac3bf8e Fixed: Three regressions in the minilang-to-Groovy
conversion of CostServices.groovy (OFBIZ-13617)
add 5c44d5ed17 Fixed: Five regressions in the minilang-to-Groovy
conversion of ProductionRunServicesScript.groovy (OFBIZ-13618)
add 9711ae8534 Fixed: Regressions in the minilang-to-Groovy conversion of
OrderReturnServicesScript.groovy (OFBIZ-13619)
add ca81d628c4 Bump com.github.ben-manes.caffeine:caffeine from 3.2.4 to
3.3.0
add 1a073b10fc Bump com.fasterxml.jackson.core:jackson-databind from
2.22.2 to 2.22.3
add e2d9c38c47 Fix path interpretation for windows machines (#2062)
add bc19632c86 Fixed: Duplication of JWT send to the request on modal
stepper (#2092)
add d83b046758 Fixed: Fix condition date when more than two fields are
present (#2093)
add d4127a683e Fixed: Escape potential NPE after jobTracker start (#2094)
add a57b6b3d57 Fixed: Isolate shortcut menu variable in context (#2095)
add caa5bde27f Improved groovy dsl descriptor (#2096)
add 5cf6250869 Bump github/codeql-action/upload-sarif
add fef25261f8 Bump dompurify in
/themes/common-theme/webapp/common-theme/js
add 0496633a83 Bump github/codeql-action/init from 4.38.1 to 4.38.2
add e64267b51f Bump github/codeql-action/autobuild from 4.38.1 to 4.38.2
add acaefd6013 Bump github/codeql-action/analyze from 4.38.1 to 4.38.2
add 125e4d91ef Bump com.h2database:h2 from 2.4.240 to 2.5.250
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d077364c8f)
\
N -- N -- N
refs/heads/dependabot/gradle/com.h2database-h2-2.5.250 (125e4d91ef)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/codeql-analysis.yml | 6 +-
.github/workflows/docker-image.yml | 6 +-
.github/workflows/gradle.yml | 2 +-
.github/workflows/scorecard.yml | 2 +-
.../accounting/config/AccountingErrorUiLabels.xml | 3 +
.../accounting/config/AccountingUiLabels.xml | 6 +
applications/accounting/ofbiz-component.xml | 1 +
.../accounting/servicedef/services_finaccount.xml | 6 +
.../accounting/admin/AcctgAdminServices.groovy | 15 +-
.../agreement/AgreementServicesScript.groovy | 100 ++---
.../ofbiz/accounting/budget/BudgetServices.groovy | 21 +-
.../fixedasset/FixedAssetServices.groovy | 37 +-
.../invoice/InvoiceServicesScript.groovy | 163 ++++----
.../accounting/payment/PaymentServices.groovy | 136 +++----
.../ofbiz/accounting/period/GPeriodServices.groovy | 4 +-
.../ofbiz/accounting/rate/RateServices.groovy | 57 ++-
.../tax/TaxAuthorityServicesScript.groovy | 24 +-
.../accounting/finaccount/FinAccountServices.java | 46 +++
.../accounting/PaymentContentTests.groovy | 125 ++++++
.../ofbiz/accounting/accounting/RateTests.groovy | 22 ++
.../accounting/tax/test/TaxAuthorityTests.groovy | 75 ++++
.../testdef/TaxAuthorityTests.xml} | 6 +-
applications/accounting/testdef/paymenttests.xml | 5 +-
applications/accounting/widget/CommonScreens.xml | 4 +-
.../commonext/ofbizsetup/SystemInfoServices.groovy | 16 +-
.../org/apache/ofbiz/content/BlogServices.groovy | 4 +-
.../content/content/ContentServicesScript.groovy | 12 +-
.../ofbiz/content/data/DataServicesScript.groovy | 25 +-
.../permission/ContentPermissionServices.groovy | 35 +-
.../ofbiz/content/cms/ContentJsonEvents.java | 42 +-
.../ofbiz/content/output/OutputServices.java | 5 +-
applications/content/widget/CommonScreens.xml | 4 +-
.../datamodel/entitydef/accounting-entitymodel.xml | 2 +-
applications/humanres/widget/CommonScreens.xml | 4 +-
.../manufacturing/api/bom-management.rest.xml | 4 +-
.../manufacturing/api/mrp-planning.rest.xml | 4 +-
.../manufacturing/api/production-runs.rest.xml | 4 +-
.../manufacturing/api/routing-cost.rest.xml | 4 +-
.../jobshopmgt/ProductionRunResServices.groovy | 4 +-
.../jobshopmgt/ProductionRunServicesScript.groovy | 34 +-
.../routing/RoutingServicesScript.groovy | 22 +-
.../widget/manufacturing/CommonScreens.xml | 4 +-
.../ofbiz/marketing/sfa/lead/LeadServices.groovy | 40 +-
applications/marketing/widget/CommonScreens.xml | 4 +-
.../marketing/widget/sfa/CommonScreens.xml | 4 +-
applications/order/config/OrderErrorUiLabels.xml | 6 +
applications/order/config/OrderUiLabels.xml | 3 +
applications/order/servicedef/services.xml | 1 -
.../ofbiz/order/order/CheckoutServices.groovy | 12 +-
.../ofbiz/order/order/OrderDeliveryServices.groovy | 12 +-
.../order/OrderRequirementServicesScript.groovy | 12 +-
.../order/order/OrderReturnServicesScript.groovy | 23 +-
.../ofbiz/order/order/OrderServicesScript.groovy | 39 +-
.../ofbiz/order/order/OrderViewWebSecure.groovy | 9 +-
.../ofbiz/order/quote/QuoteServicesScript.groovy | 213 +++++-----
.../requirement/RequirementServicesScript.groovy | 64 ++-
.../shoppinglist/ShoppingListServicesScript.groovy | 56 +--
.../org/apache/ofbiz/order/order/OrderEvents.java | 80 ++++
.../ofbiz/order/order/OrderLookupServices.java | 13 +-
.../ofbiz/order/order/test/QuoteTests.groovy | 60 +++
applications/order/template/order/FindOrders.ftl | 5 +-
.../order/webapp/ordermgr/WEB-INF/controller.xml | 6 +
.../order/widget/ordermgr/CommonScreens.xml | 4 +-
.../CommunicationEventServicesScript.groovy | 9 +-
.../party/contact/ContactMechServicesScript.groovy | 91 ++---
.../party/party/PartyInvitationServices.groovy | 11 +-
.../party/party/PartyPermissionServices.groovy | 29 +-
.../ofbiz/party/party/PartyServicesScript.groovy | 59 ++-
.../ofbiz/party/party/PartySimpleMethods.groovy | 4 +-
.../ofbiz/party/party/test/PartyMiscTests.groovy | 19 +
.../party/widget/partymgr/CommonScreens.xml | 4 +-
applications/product/servicedef/services.xml | 1 +
.../product/catalog/category/EditCategory.groovy | 5 +-
.../config/EditProductConfigItemContent.groovy | 5 +-
.../catalog/imagemanagement/ImageUpload.groovy | 5 +-
.../catalog/product/EditProductContent.groovy | 5 +-
.../facility/facility/FacilityGeoServices.groovy | 5 +-
.../facility/storage/StorageServices.groovy | 15 +-
.../product/product/catalog/CatalogServices.groovy | 4 +-
.../category/CategoryContentServicesScript.groovy | 35 +-
.../product/category/CategoryServicesScript.groovy | 96 ++---
.../ProductConfigItemContentServicesScript.groovy | 4 +-
.../ofbiz/product/product/cost/CostServices.groovy | 21 +-
.../feature/ProductFeatureServicesScript.groovy | 21 +-
.../ImageManagementServicesScript.groovy | 138 ++-----
.../inventory/InventoryIssueServices.groovy | 9 +-
.../inventory/InventoryServicesScript.groovy | 31 +-
.../product/price/PriceServicesScript.groovy | 47 +--
.../product/ProductContentServicesScript.groovy | 31 +-
.../product/product/ProductServicesScript.groovy | 105 ++---
.../product/promo/PromoServicesScript.groovy | 19 +-
.../product/store/ProductStoreServices.groovy | 78 ++--
.../shipment/ShipmentReceiptServices.groovy | 21 +-
.../ofbiz/product/shipment/ShipmentServices.groovy | 96 ++---
.../product/product/test/CategoryTests.groovy | 56 +++
.../product/test/ImageManagementTests.groovy | 220 +++++++++++
.../product/test/ProductContentTests.groovy | 64 +++
.../product/test/ProductPromoCondTests.groovy | 61 +++
.../product/product/test/ShipmentTests.groovy | 47 +++
applications/product/testdef/CatalogTests.xml | 8 +
.../product/widget/catalog/CatalogScreens.xml | 4 +-
.../product/widget/catalog/CategoryForms.xml | 2 +-
.../product/widget/facility/FacilityScreens.xml | 4 +-
applications/workeffort/servicedef/services.xml | 2 +-
.../workeffort/WorkEffortServicesScript.groovy | 123 +++---
.../workeffort/test/WorkEffortTests.groovy | 30 ++
applications/workeffort/widget/CommonScreens.xml | 4 +-
build.gradle | 15 +-
dependencies.gradle | 1 +
docs/asciidoc/developer-manual.adoc | 2 +-
.../ofbiz/base/container/AdminServerContainer.java | 29 +-
.../org/apache/ofbiz/base/crypto/HashCrypt.java | 18 +-
.../org/apache/ofbiz/base/util/UtilValidate.java | 21 +-
.../ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl | 48 ++-
framework/common/config/CommonUiLabels.xml | 3 +
framework/common/servicedef/services.xml | 3 +-
.../ofbiz/common/CommonServicesScript.groovy | 55 +--
.../apache/ofbiz/common/PortalPageMethods.groovy | 40 +-
.../apache/ofbiz/common/PortalPageServices.groovy | 56 +--
.../ofbiz/common/SetTimeZoneFromBrowser.groovy | 6 +-
.../ofbiz/common/email/EmailServicesScript.groovy | 5 +-
.../permission/CommonPermissionServices.groovy | 14 +-
.../webcommon/WEB-INF/handlers-controller.xml | 2 +-
framework/entity/dtd/entitymodel.xsd | 1 -
framework/entity/entitydef/entitymodel_test.xml | 6 -
.../apache/ofbiz/entity/datasource/GenericDAO.java | 6 +-
.../ofbiz/entity/finder/EntityFinderUtil.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelField.java | 3 +-
.../org/apache/ofbiz/entity/util/EntityCrypto.java | 55 ++-
.../ofbiz/entity/test/EntityCryptoTestSuite.java | 48 +--
.../ofbiz/entityext/EntitySyncServices.groovy | 3 +-
.../ofbiz/entityext/data/EntityDataServices.java | 17 +-
...mpleApiDefinition.rest.xml => testApi.rest.xml} | 22 +-
framework/rest-api/config/rest-api.properties | 3 +-
...Data.xml => RestSecurityPermissionDemoData.xml} | 12 +-
.../data/RestSecurityPermissionSeedData.xml | 15 +-
framework/rest-api/dtd/rest-api.xsd | 11 +-
framework/rest-api/ofbiz-component.xml | 4 +-
framework/rest-api/package-lock.json | 22 +-
framework/rest-api/package.json | 6 +-
framework/rest-api/src/docs/asciidoc/rest-api.adoc | 40 +-
.../apache/ofbiz/ws/rs/core/OFBizApiConfig.java | 55 ++-
.../ofbiz/ws/rs/examples/RestExampleServices.java | 18 +
.../ofbiz/ws/rs/examples/RestOrderExample.java | 18 +
.../ofbiz/ws/rs/examples/RestOrderItemExample.java | 18 +
.../org/apache/ofbiz/ws/rs/model/ModelApi.java | 18 +-
.../apache/ofbiz/ws/rs/model/ModelApiReader.java | 25 +-
.../apache/ofbiz/ws/rs/model/ModelQueryParam.java | 18 +
.../ofbiz/ws/rs/openapi/OFBizOpenApiReader.java | 69 +++-
.../ofbiz/ws/rs/openapi/OFBizOpenApiUiFilter.java} | 46 ++-
.../ws/rs/resources/AuthenticationResource.java | 33 +-
.../ofbiz/ws/rs/resources/OpenApiResource.java | 18 +-
.../ofbiz/ws/rs/security/auth/APIAuthFilter.java | 16 +-
.../ws/rs/security/auth/HttpBasicAuthFilter.java | 39 +-
.../org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 13 +
.../ofbiz/ws/rs/core/OFBizApiConfigTest.java | 24 +-
.../ofbiz/ws/rs/model/ModelApiReaderTest.java | 14 +-
.../ws/rs/openapi/OFBizOpenApiReaderTest.java | 11 +-
.../ofbiz/ws/rs/resources/OpenApiResourceTest.java | 2 +-
.../ofbiz/ws/rs/test/RestTestHttpRequest.java | 64 ++-
.../ws/rs/util/RestApiUtilPaginationTest.java | 18 +
.../ws/rs/util/RestListResponseBuilderTest.java | 18 +
.../ofbiz/ws/rs/util/RestQueryOptionsTest.java | 18 +
framework/rest-api/webapp/docs/WEB-INF/web.xml | 14 +
framework/rest-api/webapp/docs/swagger-ui.html | 21 +-
.../_include/sy-entity-field-encryption.adoc | 39 ++
framework/security/src/docs/asciidoc/security.adoc | 1 +
framework/service/servicedef/services_test_se.xml | 68 ++++
.../service/engine/EntityDeleteBuilder.groovy | 58 +++
.../service/engine/EntityUpdateBuilder.groovy | 132 +++++++
.../ofbiz/service/engine/GroovyBaseScript.groovy | 102 ++++-
.../apache/ofbiz/service/test/TestServices.groovy | 78 ++++
...ceException.java => ServiceErrorException.java} | 22 +-
.../service/test/ServiceEngineTestServices.java | 37 +-
.../apache/ofbiz/service/tracker/JobTracker.java | 13 +-
.../test/engine/EntityDeleteBuilderTest.groovy | 99 +++++
.../test/engine/EntityUpdateBuilderTest.groovy | 86 ++++
.../service/test/GroovyDslServiceEngineTests.java | 236 +++++++++++
framework/service/testdef/servicetests.xml | 6 +
.../org/apache/ofbiz/base/start/start.properties | 4 +-
.../apache/ofbiz/webapp/control/JWTManager.java | 15 +-
.../ofbiz/webtools/entity/ProgramExport.groovy | 13 +
.../ofbiz/webtools/labelmanager/ViewFile.groovy | 27 +-
.../ofbiz/webtools/secret/EncryptValue.groovy | 20 +
.../webapp/webtools/WEB-INF/controller.xml | 4 +-
framework/widget/dtd/widget-screen.xsd | 8 -
.../ofbiz/widget/model/CommonWidgetModels.java | 3 -
.../ofbiz/widget/model/ModelScreenWidget.java | 2 +-
.../ofbiz/widget/model/WidgetSecureLocation.java | 14 +-
.../widget/renderer/macro/MacroCommonRenderer.java | 3 +
.../renderer/xlsx/ScreenXlsxViewHandler.java | 128 ++++++
.../widget/renderer/xlsx/XlsxFormRenderer.java | 433 +++++++++++++++++++++
.../renderer/xlsx/XlsxScreenStringRenderer.java | 173 ++++++++
.../widget/renderer/xlsx/XlsxFormRendererTest.java | 232 +++++++++++
.../ofbiz/widget/test/WidgetMacroLibraryTests.java | 28 +-
gradle/libs.versions.toml | 17 +-
.../common-theme/template/includes/Simple.xls.ftl | 57 ---
.../template/macro/XlsFormMacroLibrary.ftl | 162 --------
.../template/macro/XlsScreenMacroLibrary.ftl | 56 ---
.../template/macro/XlsTreeMacroLibrary.ftl | 33 --
.../webapp/common-theme/js/package-lock.json | 16 +-
.../webapp/common-theme/js/package.json | 4 +-
themes/common-theme/widget/CommonScreens.xml | 1 -
themes/common-theme/widget/Theme.xml | 5 -
204 files changed, 4866 insertions(+), 2186 deletions(-)
create mode 100644
applications/accounting/src/test/groovy/org/apache/ofbiz/accounting/accounting/PaymentContentTests.groovy
create mode 100644
applications/accounting/src/test/groovy/org/apache/ofbiz/accounting/tax/test/TaxAuthorityTests.groovy
copy applications/{product/testdef/CostTests.xml =>
accounting/testdef/TaxAuthorityTests.xml} (83%)
create mode 100644
applications/product/src/test/groovy/org/apache/ofbiz/product/product/test/ImageManagementTests.groovy
create mode 100644
applications/product/src/test/groovy/org/apache/ofbiz/product/product/test/ProductContentTests.groovy
rename framework/rest-api/api/{exampleApiDefinition.rest.xml =>
testApi.rest.xml} (82%)
copy framework/rest-api/data/{RestSecurityPermissionSeedData.xml =>
RestSecurityPermissionDemoData.xml} (75%)
copy
framework/{webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java
=>
rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiUiFilter.java}
(53%)
create mode 100644
framework/security/src/docs/asciidoc/_include/sy-entity-field-encryption.adoc
create mode 100644
framework/service/src/main/groovy/org/apache/ofbiz/service/engine/EntityDeleteBuilder.groovy
create mode 100644
framework/service/src/main/groovy/org/apache/ofbiz/service/engine/EntityUpdateBuilder.groovy
copy
framework/service/src/main/java/org/apache/ofbiz/service/{GenericServiceException.java
=> ServiceErrorException.java} (64%)
create mode 100644
framework/service/src/test/groovy/org/apache/ofbiz/service/test/engine/EntityDeleteBuilderTest.groovy
create mode 100644
framework/service/src/test/groovy/org/apache/ofbiz/service/test/engine/EntityUpdateBuilderTest.groovy
create mode 100644
framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/xlsx/ScreenXlsxViewHandler.java
create mode 100644
framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/xlsx/XlsxFormRenderer.java
create mode 100644
framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/xlsx/XlsxScreenStringRenderer.java
create mode 100644
framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/xlsx/XlsxFormRendererTest.java
delete mode 100644 themes/common-theme/template/includes/Simple.xls.ftl
delete mode 100644 themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
delete mode 100644 themes/common-theme/template/macro/XlsScreenMacroLibrary.ftl
delete mode 100644 themes/common-theme/template/macro/XlsTreeMacroLibrary.ftl
