Skip to content

Commit f35075a

Browse files
line-oline-o
authored
Merge pull request #5042 from eXist-db/dependabot/maven/com.siemens.ct.exi-exificient-1.0.7
2 parents c1e7fce + e753ba1 commit f35075a

File tree

7 files changed

+85
-15
lines changed

7 files changed

+85
-15
lines changed

‎exist-core/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,30 @@
101101
</exclusions>
102102
</dependency>
103103

104+
<dependency>
105+
<groupId>com.siemens.ct.exi</groupId>
106+
<artifactId>exificient-grammars</artifactId>
107+
<scope>compile</scope>
108+
<exclusions>
109+
<exclusion> <!-- conflicts with xerces 2.12.2 -->
110+
<groupId>xerces</groupId>
111+
<artifactId>xercesImpl</artifactId>
112+
</exclusion>
113+
</exclusions>
114+
</dependency>
115+
116+
<dependency>
117+
<groupId>com.siemens.ct.exi</groupId>
118+
<artifactId>exificient-core</artifactId>
119+
<scope>compile</scope>
120+
<exclusions>
121+
<exclusion> <!-- conflicts with xerces 2.12.2 -->
122+
<groupId>xerces</groupId>
123+
<artifactId>xercesImpl</artifactId>
124+
</exclusion>
125+
</exclusions>
126+
</dependency>
127+
104128
<dependency>
105129
<groupId>com.ibm.icu</groupId>
106130
<artifactId>icu4j</artifactId>

‎exist-core/src/main/java/org/exist/util/serializer/EXISerializer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
import org.xml.sax.SAXException;
3535
import org.xml.sax.helpers.AttributesImpl;
3636

37-
import com.siemens.ct.exi.EXIFactory;
38-
import com.siemens.ct.exi.GrammarFactory;
39-
import com.siemens.ct.exi.api.sax.SAXEncoder;
40-
import com.siemens.ct.exi.exceptions.EXIException;
41-
import com.siemens.ct.exi.grammars.Grammars;
42-
import com.siemens.ct.exi.helpers.DefaultEXIFactory;
37+
import com.siemens.ct.exi.core.EXIFactory;
38+
import com.siemens.ct.exi.core.exceptions.EXIException;
39+
import com.siemens.ct.exi.core.grammars.Grammars;
40+
import com.siemens.ct.exi.core.helpers.DefaultEXIFactory;
41+
import com.siemens.ct.exi.grammars.GrammarFactory;
42+
import com.siemens.ct.exi.main.api.sax.SAXEncoder;
4343

4444
import javax.annotation.Nullable;
4545

‎exist-core/src/test/java/org/exist/util/serializer/EXISerializerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.junit.Test;
4141
import org.xml.sax.Attributes;
4242

43-
import com.siemens.ct.exi.api.sax.SAXEncoder;
43+
import com.siemens.ct.exi.main.api.sax.SAXEncoder;
4444

4545
public class EXISerializerTest {
4646

‎exist-parent/pom.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
<dependency>
418418
<groupId>com.siemens.ct.exi</groupId>
419419
<artifactId>exificient</artifactId>
420-
<version>0.9.3</version>
420+
<version>1.0.7</version>
421421
<exclusions>
422422
<exclusion> <!-- conflicts with xerces 2.12.0 dependency -->
423423
<groupId>xerces</groupId>
@@ -426,6 +426,30 @@
426426
</exclusions>
427427
</dependency>
428428

429+
<dependency>
430+
<groupId>com.siemens.ct.exi</groupId>
431+
<artifactId>exificient-grammars</artifactId>
432+
<version>1.0.7</version>
433+
<exclusions>
434+
<exclusion> <!-- conflicts with xerces 2.12.2 -->
435+
<groupId>xerces</groupId>
436+
<artifactId>xercesImpl</artifactId>
437+
</exclusion>
438+
</exclusions>
439+
</dependency>
440+
441+
<dependency>
442+
<groupId>com.siemens.ct.exi</groupId>
443+
<artifactId>exificient-core</artifactId>
444+
<version>1.0.7</version>
445+
<exclusions>
446+
<exclusion> <!-- conflicts with xerces 2.12.2 -->
447+
<groupId>xerces</groupId>
448+
<artifactId>xercesImpl</artifactId>
449+
</exclusion>
450+
</exclusions>
451+
</dependency>
452+
429453
<dependency>
430454
<groupId>org.expath.packaging</groupId>
431455
<artifactId>pkg-java</artifactId>

‎extensions/modules/exi/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,28 @@
5858
<artifactId>exificient</artifactId>
5959
</dependency>
6060

61+
<dependency>
62+
<groupId>com.siemens.ct.exi</groupId>
63+
<artifactId>exificient-grammars</artifactId>
64+
<exclusions>
65+
<exclusion> <!-- conflicts with xerces 2.12.2 -->
66+
<groupId>xerces</groupId>
67+
<artifactId>xercesImpl</artifactId>
68+
</exclusion>
69+
</exclusions>
70+
</dependency>
71+
72+
<dependency>
73+
<groupId>com.siemens.ct.exi</groupId>
74+
<artifactId>exificient-core</artifactId>
75+
<exclusions>
76+
<exclusion> <!-- conflicts with xerces 2.12.2 -->
77+
<groupId>xerces</groupId>
78+
<artifactId>xercesImpl</artifactId>
79+
</exclusion>
80+
</exclusions>
81+
</dependency>
82+
6183
<dependency>
6284
<groupId>com.evolvedbinary.j8fu</groupId>
6385
<artifactId>j8fu</artifactId>

‎extensions/modules/exi/src/main/java/org/exist/xquery/modules/exi/DecodeExiFunction.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
import org.xml.sax.InputSource;
4646
import org.xml.sax.SAXException;
4747

48-
import com.siemens.ct.exi.EXIFactory;
49-
import com.siemens.ct.exi.GrammarFactory;
50-
import com.siemens.ct.exi.api.sax.SAXDecoder;
51-
import com.siemens.ct.exi.exceptions.EXIException;
52-
import com.siemens.ct.exi.grammars.Grammars;
53-
import com.siemens.ct.exi.helpers.DefaultEXIFactory;
48+
import com.siemens.ct.exi.core.EXIFactory;
49+
import com.siemens.ct.exi.grammars.GrammarFactory;
50+
import com.siemens.ct.exi.main.api.sax.SAXDecoder;
51+
import com.siemens.ct.exi.core.exceptions.EXIException;
52+
import com.siemens.ct.exi.core.grammars.Grammars;
53+
import com.siemens.ct.exi.core.helpers.DefaultEXIFactory;
5454

5555
/**
5656
* eXist EXI Module Extension DecodeExiFunction.

‎extensions/modules/exi/src/main/java/org/exist/xquery/modules/exi/EncodeExiFunction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.exist.xquery.value.Type;
4646
import org.xml.sax.SAXException;
4747

48-
import com.siemens.ct.exi.exceptions.EXIException;
48+
import com.siemens.ct.exi.core.exceptions.EXIException;
4949

5050
/**
5151
* eXist EXI Module Extension EncodeExiFunction.

0 commit comments

Comments
 (0)