Merge pull request #5042 from eXist-db/dependabot/maven/com.siemens.c…

…t.exi-exificient-1.0.7
eXist-db · Nov 29, 2023 · f35075a · f35075a
2 parents c1e7fce + e753ba1
commit f35075a
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 15 deletions.
diff --git a/exist-core/pom.xml b/exist-core/pom.xml
@@ -101,6 +101,30 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.siemens.ct.exi</groupId>
+            <artifactId>exificient-grammars</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion> <!-- conflicts with xerces 2.12.2 -->
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.siemens.ct.exi</groupId>
+            <artifactId>exificient-core</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion> <!-- conflicts with xerces 2.12.2 -->
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>

diff --git a/exist-core/src/main/java/org/exist/util/serializer/EXISerializer.java b/exist-core/src/main/java/org/exist/util/serializer/EXISerializer.java
@@ -34,12 +34,12 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
-import com.siemens.ct.exi.EXIFactory;
-import com.siemens.ct.exi.GrammarFactory;
-import com.siemens.ct.exi.api.sax.SAXEncoder;
-import com.siemens.ct.exi.exceptions.EXIException;
-import com.siemens.ct.exi.grammars.Grammars;
-import com.siemens.ct.exi.helpers.DefaultEXIFactory;
+import com.siemens.ct.exi.core.EXIFactory;
+import com.siemens.ct.exi.core.exceptions.EXIException;
+import com.siemens.ct.exi.core.grammars.Grammars;
+import com.siemens.ct.exi.core.helpers.DefaultEXIFactory;
+import com.siemens.ct.exi.grammars.GrammarFactory;
+import com.siemens.ct.exi.main.api.sax.SAXEncoder;
 
 import javax.annotation.Nullable;
 

diff --git a/exist-core/src/test/java/org/exist/util/serializer/EXISerializerTest.java b/exist-core/src/test/java/org/exist/util/serializer/EXISerializerTest.java
@@ -40,7 +40,7 @@
 import org.junit.Test;
 import org.xml.sax.Attributes;
 
-import com.siemens.ct.exi.api.sax.SAXEncoder;
+import com.siemens.ct.exi.main.api.sax.SAXEncoder;
 
 public class EXISerializerTest {
 

diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml
@@ -417,7 +417,7 @@
             <dependency>
                 <groupId>com.siemens.ct.exi</groupId>
                 <artifactId>exificient</artifactId>
-                <version>0.9.3</version>
+                <version>1.0.7</version>
                 <exclusions>
                     <exclusion>  <!-- conflicts with xerces 2.12.0 dependency -->
                         <groupId>xerces</groupId>
@@ -426,6 +426,30 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>com.siemens.ct.exi</groupId>
+                <artifactId>exificient-grammars</artifactId>
+                <version>1.0.7</version>
+                <exclusions>
+                    <exclusion> <!-- conflicts with xerces 2.12.2 -->
+                        <groupId>xerces</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>com.siemens.ct.exi</groupId>
+                <artifactId>exificient-core</artifactId>
+                <version>1.0.7</version>
+                <exclusions>
+                    <exclusion> <!-- conflicts with xerces 2.12.2 -->
+                        <groupId>xerces</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>org.expath.packaging</groupId>
                 <artifactId>pkg-java</artifactId>

diff --git a/extensions/modules/exi/pom.xml b/extensions/modules/exi/pom.xml
@@ -58,6 +58,28 @@
             <artifactId>exificient</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.siemens.ct.exi</groupId>
+            <artifactId>exificient-grammars</artifactId>
+            <exclusions>
+                <exclusion> <!-- conflicts with xerces 2.12.2 -->
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.siemens.ct.exi</groupId>
+            <artifactId>exificient-core</artifactId>
+            <exclusions>
+                <exclusion> <!-- conflicts with xerces 2.12.2 -->
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>com.evolvedbinary.j8fu</groupId>
             <artifactId>j8fu</artifactId>

diff --git a/extensions/modules/exi/src/main/java/org/exist/xquery/modules/exi/DecodeExiFunction.java b/extensions/modules/exi/src/main/java/org/exist/xquery/modules/exi/DecodeExiFunction.java
@@ -45,12 +45,12 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import com.siemens.ct.exi.EXIFactory;
-import com.siemens.ct.exi.GrammarFactory;
-import com.siemens.ct.exi.api.sax.SAXDecoder;
-import com.siemens.ct.exi.exceptions.EXIException;
-import com.siemens.ct.exi.grammars.Grammars;
-import com.siemens.ct.exi.helpers.DefaultEXIFactory;
+import com.siemens.ct.exi.core.EXIFactory;
+import com.siemens.ct.exi.grammars.GrammarFactory;
+import com.siemens.ct.exi.main.api.sax.SAXDecoder;
+import com.siemens.ct.exi.core.exceptions.EXIException;
+import com.siemens.ct.exi.core.grammars.Grammars;
+import com.siemens.ct.exi.core.helpers.DefaultEXIFactory;
 
 /**
  * eXist EXI Module Extension DecodeExiFunction.

diff --git a/extensions/modules/exi/src/main/java/org/exist/xquery/modules/exi/EncodeExiFunction.java b/extensions/modules/exi/src/main/java/org/exist/xquery/modules/exi/EncodeExiFunction.java
@@ -45,7 +45,7 @@
 import org.exist.xquery.value.Type;
 import org.xml.sax.SAXException;
 
-import com.siemens.ct.exi.exceptions.EXIException;
+import com.siemens.ct.exi.core.exceptions.EXIException;
 
 /**
  * eXist EXI Module Extension EncodeExiFunction.