Merge to vampire_textbook_uat from origin/release_5.175 #17937
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Recreate edi xsd from export-formats (#17720) * recreate edi xsd from export-formats * adopt code back to the recreated schema.xsd * adapt test cases (cherry picked from commit 1bb9ac8) solved Conflicts: misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/META-INF/sun-jaxb.episode misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/CCreditMemoReasonEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/COrderDeliveryRuleEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/COrderDeliveryViaRuleEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIADOrgLookupBPLGLNVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICBPartnerLookupBPLGLNVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop000VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop111VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop119VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop120VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop140VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop901991VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctopInvoic500VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctopInvoicVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIDesadvFeedbackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerLocationType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerProductVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCCurrencyType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCLocationType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCUOMType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvLinePackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvLineType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvLineWithNoPackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvPackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpMProductType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExportStatusEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpADInputDataSourceLookupINType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCBPartnerLocationLookupGLNType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCBPartnerLookupRecipientGLNType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCCurrencyLookupISOCodeType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCOLCandType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCOLCandsType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCUOMLookupUOMSymbolType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIInvoiceFeedbackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMHUPIItemProductLookupUPCVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMProductLookupUPCVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMessage.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIReplicationTrxUpdateType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/FreshCCOUNTRYLOOKUPCOUNTRYCODEType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/InvoicableQtyBasedOnEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ObjectFactory.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationEventEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationModeEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationTypeEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/XLSImpCOLCandType.java misc/services/camel/de-metas-camel-edi/src/main/xsd/metasfresh/schema.xsd * fix c&p error
* Avoid NPE on webapi startup * Remove duplicated class UserNotificationDetailMessageFormat * Remove duplicated class UserNotificationDetailMessageFormat (cherry picked from commit 0ebf832) Co-authored-by: Tobias Schöneberg <metas-ts@users.noreply.github.com>
* fix external system startup (#17496) (#17703) (cherry picked from commit f9e9dc2) Co-authored-by: Max Rieck <32903793+mrie04@users.noreply.github.com> * Update Jasper to latest version `6.21.2` * Resolving import conflicts after updating Jasper to latest version `6.21.2` * Resolving import conflicts after updating Jasper to latest version `6.21.2` * Update `itext` version: After release `2.1.7`, iText moved from the MPLicense to the AGPLicense. The groupId changed from `com.lowagie` to `com.itextpdf` and the artifactId from `itext` to `itextpdf` * Remove jasper exclusions * Remove jasper exclusions * Update `Batik` Version * Remove `TRUE` from `Order By` * Remove `TRUE` from `Order By` * Using `com.itextpdf.text.Rectangle` --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Max Rieck <32903793+mrie04@users.noreply.github.com>
(cherry picked from commit 4d3613d)
…pr-17922 Don't update report sysConfigs after migration in pipeline (copy #17922)
metas-ts
added
ops:dont_auto_merge
mergify
bot
deleted the
metas-ts/vampire_textbook_uat/merge-from/origin/release_5.175
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
!!Don't squash please!! Instead, integrate it with a normal merge commit.