Updated to phive 9.x

phax · Sep 14, 2023 · 92da6b0 · 92da6b0
1 parent d612584
commit 92da6b0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java
@@ -47,6 +47,7 @@
 import com.helger.commons.state.ESuccess;
 import com.helger.commons.state.ETriState;
 import com.helger.commons.string.StringHelper;
+import com.helger.diver.api.version.VESID;
 import com.helger.peppol.sbdh.PeppolSBDHDocument;
 import com.helger.peppol.sbdh.payload.PeppolSBDHPayloadBinaryMarshaller;
 import com.helger.peppol.sbdh.payload.PeppolSBDHPayloadTextMarshaller;
@@ -78,8 +79,7 @@
 import com.helger.phase4.sender.IAS4SendingDateTimeConsumer;
 import com.helger.phase4.util.Phase4Exception;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
-import com.helger.phive.api.executorset.VESID;
-import com.helger.phive.engine.source.IValidationSourceXML;
+import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.sbdh.CSBDH;
 import com.helger.sbdh.SBDMarshaller;
 import com.helger.smpclient.peppol.ISMPServiceMetadataProvider;

diff --git a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolValidation.java b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolValidation.java
@@ -25,15 +25,15 @@
 import com.helger.commons.ValueEnforcer;
 import com.helger.commons.annotation.ReturnsMutableCopy;
 import com.helger.commons.annotation.ReturnsMutableObject;
+import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.execute.ValidationExecutionManager;
 import com.helger.phive.api.executorset.IValidationExecutorSet;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
-import com.helger.phive.api.executorset.VESID;
 import com.helger.phive.api.executorset.ValidationExecutorSetRegistry;
 import com.helger.phive.api.result.ValidationResultList;
-import com.helger.phive.engine.source.IValidationSourceXML;
-import com.helger.phive.engine.source.ValidationSourceXML;
 import com.helger.phive.peppol.PeppolValidation;
+import com.helger.phive.xml.source.IValidationSourceXML;
+import com.helger.phive.xml.source.ValidationSourceXML;
 
 /**
  * This class contains the client side validation required for outgoing Peppol

diff --git a/...c/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisboxXRechnung.java b/...c/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderCisboxXRechnung.java
@@ -34,7 +34,7 @@
 import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.en16931.EN16931Validation;
-import com.helger.phive.engine.source.IValidationSourceXML;
+import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xrechnung.XRechnungValidation;
 import com.helger.servlet.mock.MockServletContext;
 import com.helger.smpclient.peppol.SMPClientReadOnly;

diff --git a/...t/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerXRechnung12CII.java b/...t/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderHelgerXRechnung12CII.java
@@ -40,7 +40,7 @@
 import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.en16931.EN16931Validation;
-import com.helger.phive.engine.source.IValidationSourceXML;
+import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xrechnung.XRechnungValidation;
 import com.helger.servlet.mock.MockServletContext;
 import com.helger.smpclient.peppol.SMPClientReadOnly;

diff --git a/...ent/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaCII.java b/...ent/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaCII.java
@@ -35,7 +35,7 @@
 import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.en16931.EN16931Validation;
-import com.helger.phive.engine.source.IValidationSourceXML;
+import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.servlet.mock.MockServletContext;
 import com.helger.smpclient.peppol.SMPClientReadOnly;
 import com.helger.web.scope.mgr.WebScopeManager;

diff --git a/...ent/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaUBL.java b/...ent/src/test/java/com/helger/phase4/peppol/receivers/MainPhase4PeppolSenderQvaliaUBL.java
@@ -40,7 +40,7 @@
 import com.helger.phase4.sender.AbstractAS4UserMessageBuilder.ESimpleUserMessageSendResult;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.en16931.EN16931Validation;
-import com.helger.phive.engine.source.IValidationSourceXML;
+import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.servlet.mock.MockServletContext;
 import com.helger.smpclient.peppol.SMPClientReadOnly;
 import com.helger.web.scope.mgr.WebScopeManager;

diff --git a/pom.xml b/pom.xml
@@ -80,8 +80,8 @@
     <peppol-reporting.version>2.1.2</peppol-reporting.version>
     <ph-ubl.version>8.0.3</ph-ubl.version>
     <ph-schematron.version>7.1.2</ph-schematron.version>
-    <phive.version>8.0.1</phive.version>
-    <phive-rules.version>3.0.5</phive-rules.version>
+    <phive.version>9.0.0</phive.version>
+    <phive-rules.version>3.1.0</phive-rules.version>
     <spring-boot.version>3.1.3</spring-boot.version>
   </properties>