Merge branch 'feature/hibernate_6' into feature/internal_artifactory

fintechworks · Jan 30, 2023 · 67d0c6f · 67d0c6f
2 parents 4f9d673 + 63d48da
commit 67d0c6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/modules/minigl/src/main/java/org/jpos/gl/tools/Import.java b/modules/minigl/src/main/java/org/jpos/gl/tools/Import.java
@@ -22,7 +22,6 @@
 import jakarta.persistence.TypedQuery;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.dom4j.DocumentException;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
@@ -86,7 +85,7 @@ public static void usage () {
         System.exit (0);
     }
 
-    private void createSchema () throws HibernateException, DocumentException {
+    private void createSchema () throws HibernateException, JDOMException {
         DB db = new DB(configModifier);
         db.open();
         db.beginTransaction();
@@ -370,7 +369,7 @@ public InputSource resolveEntity (String publicId, String systemId) {
     }
     public void parse (String file)
       throws JDOMException, SQLException, HibernateException,
-      ParseException, IOException, GLException, DocumentException {
+      ParseException, IOException, GLException {
         SAXBuilder builder = new SAXBuilder (true);
         builder.setEntityResolver (this);
 

diff --git a/modules/seqno/src/test/java/org/jpos/ee/SeqNoTest.java b/modules/seqno/src/test/java/org/jpos/ee/SeqNoTest.java
@@ -18,7 +18,6 @@
 
 package org.jpos.ee;
 
-import org.dom4j.DocumentException;
 import org.jpos.iso.ISOUtil;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -31,7 +30,7 @@
 
 public class SeqNoTest {
     @BeforeAll
-    public static void setUp() throws DocumentException {
+    public static void setUp() throws Exception {
         System.setProperty("db.create.enabled", "YES");
         try (DB db = new DB()) {
             db.createSchema(null, true);