From 3fe71d3bc518ff4353c87c878a536ac533230240 Mon Sep 17 00:00:00 2001
From: Philip Helger <philip@helger.com>
Date: Tue, 19 Mar 2024 21:56:01 +0100
Subject: [PATCH] Deprecated Peppol 2023-05 rules

---
 README.md                                     |  1 +
 .../helger/phive/peppol/PeppolValidation.java |  3 +-
 .../phive/peppol/PeppolValidation2023_05.java | 31 ++++++++++---------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 52af2e0e..fbedd2eb 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ I hope that with the introduction of PINT, the versioning problem will be solved
  
 * v3.1.9 - work in progress
     * Deprecated Peppol Business Card formats v1 and v2
+    * Deprecated Peppol May 2023 release
 * v3.1.8 - 2024-03-06
     * Added support for Peppol Reporting EUSR v1.1.5 and deprecated v1.1.4
     * Added support for Peppol Reporting TSR v1.0.5 and deprecated v1.0.4
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation.java
index 40278ffa..733b94cd 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation.java
@@ -37,6 +37,7 @@
  * @author Philip Helger
  */
 @Immutable
+@SuppressWarnings ("deprecation")
 public final class PeppolValidation
 {
   /**
@@ -44,7 +45,6 @@ public final class PeppolValidation
    *         Never <code>null</code>.
    * @since 5.1.8
    */
-  // @SuppressWarnings ("deprecation")
   @Nonnull
   @Nonempty
   public static String getVersionToUse ()
@@ -69,7 +69,6 @@ private PeppolValidation ()
    * @param aRegistry
    *        The registry to add the artefacts. May not be <code>null</code>.
    */
-  // @SuppressWarnings ("deprecation")
   public static void initStandard (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     // For better error messages
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java
index 0f7fa085..c311a112 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java
@@ -46,6 +46,7 @@
  * @author Philip Helger
  */
 @Immutable
+@Deprecated
 public final class PeppolValidation2023_05
 {
   // Standard resources
@@ -111,7 +112,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     // See https://docs.peppol.eu/poacc/upgrade-3/release-notes/
     final String sAkaVersionBIS = " (aka BIS 3.0.11)";
 
-    final boolean bNotDeprecated = false;
+    final boolean bDeprecated = true;
 
     final String PREFIX_XSLT = "external/schematron/openpeppol/" + VERSION_STR + "/xslt/";
     final IReadableResource INVOICE_UBL_CEN = new ClassPathResource (PREFIX_XSLT + "CEN-EN16931-UBL.xslt", _getCL ());
@@ -136,7 +137,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Invoice" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -144,7 +145,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Credit Note" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBilling,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -161,61 +162,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXsltUBL (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXsltUBL (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (INVOICE_MESSAGE_RESPONSE)));
     // UBL 2.3!
@@ -223,7 +224,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Change" +
                                                                                                            sVersion +
                                                                                                            sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderChangeXSDs ()),
                                                                            _createXsltUBL (ORDER_CHANGE)));
     // UBL 2.3!
@@ -231,7 +232,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Cancellation" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderCancellationXSDs ()),
                                                                            _createXsltUBL (ORDER_CANCELLATION)));
     // UBL 2.3!
@@ -239,7 +240,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Response Advanced" +
                                                                                                                       sVersion +
                                                                                                                       sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           bDeprecated,
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_RESPONSE_ADVANCED)));
   }