From de3ae573d8ce2b9b37dd01693f1aa1ad518ef40b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 10:43:44 +0000 Subject: [PATCH 1/6] build(deps): bump com.siemens.ct.exi:exificient from 0.9.3 to 1.0.7 Bumps [com.siemens.ct.exi:exificient](https://github.com/EXIficient/exificient) from 0.9.3 to 1.0.7. - [Changelog](https://github.com/EXIficient/exificient/blob/master/CHANGES.md) - [Commits](https://github.com/EXIficient/exificient/compare/exificient-0.9.3...exificient-1.0.7) --- updated-dependencies: - dependency-name: com.siemens.ct.exi:exificient dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- exist-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml index e5ecd57ba8a..6c6f1849bf1 100644 --- a/exist-parent/pom.xml +++ b/exist-parent/pom.xml @@ -417,7 +417,7 @@ com.siemens.ct.exi exificient - 0.9.3 + 1.0.7 xerces From acd85cff57492a5d059ae73be797b817f327bfd9 Mon Sep 17 00:00:00 2001 From: Dannes Wessels Date: Wed, 29 Nov 2023 14:50:27 +0100 Subject: [PATCH 2/6] Fix imports due to changed packages --- .../org/exist/util/serializer/EXISerializer.java | 12 ++++++------ .../org/exist/util/serializer/EXISerializerTest.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) 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 index 4b7bbf8261b..0c41fc7946b 100644 --- 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 index 39000b6c85e..4ebc406e426 100644 --- 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 { From 236e28c8492d90d9116ed3efb258e118c7c86ab7 Mon Sep 17 00:00:00 2001 From: Dannes Wessels Date: Wed, 29 Nov 2023 14:55:42 +0100 Subject: [PATCH 3/6] Fix imports due to changed packages --- .../java/org/exist/xquery/modules/exi/EncodeExiFunction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 689f86c8cc4..d24d7ff32d7 100755 --- 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. From cfad8d723998c62bbf9ab42331540e868341acb5 Mon Sep 17 00:00:00 2001 From: Dannes Wessels Date: Wed, 29 Nov 2023 15:20:59 +0100 Subject: [PATCH 4/6] Fix imports due to changed packages --- .../java/org/exist/xquery/modules/exi/EncodeExiFunction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d24d7ff32d7..5c6b2c70c3e 100755 --- 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.core.exceptions.EXIException +import com.siemens.ct.exi.core.exceptions.EXIException; /** * eXist EXI Module Extension EncodeExiFunction. From 784e5e806e914b2926294ef810f900aab6bdad59 Mon Sep 17 00:00:00 2001 From: Dannes Wessels Date: Wed, 29 Nov 2023 15:38:30 +0100 Subject: [PATCH 5/6] Fix imports due to changed packages --- .../exist/xquery/modules/exi/DecodeExiFunction.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 index bec40a8e412..cf01ffebf05 100644 --- 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. From e753ba10032616a7eb0df99565561abc9aa294ad Mon Sep 17 00:00:00 2001 From: Dannes Wessels Date: Wed, 29 Nov 2023 15:40:43 +0100 Subject: [PATCH 6/6] Update pom files --- exist-core/pom.xml | 24 ++++++++++++++++++++++++ exist-parent/pom.xml | 24 ++++++++++++++++++++++++ extensions/modules/exi/pom.xml | 22 ++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/exist-core/pom.xml b/exist-core/pom.xml index e799bcd3210..111ccbfdffb 100644 --- a/exist-core/pom.xml +++ b/exist-core/pom.xml @@ -101,6 +101,30 @@ + + com.siemens.ct.exi + exificient-grammars + compile + + + xerces + xercesImpl + + + + + + com.siemens.ct.exi + exificient-core + compile + + + xerces + xercesImpl + + + + com.ibm.icu icu4j diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml index 6c6f1849bf1..fa7f8595a01 100644 --- a/exist-parent/pom.xml +++ b/exist-parent/pom.xml @@ -426,6 +426,30 @@ + + com.siemens.ct.exi + exificient-grammars + 1.0.7 + + + xerces + xercesImpl + + + + + + com.siemens.ct.exi + exificient-core + 1.0.7 + + + xerces + xercesImpl + + + + org.expath.packaging pkg-java diff --git a/extensions/modules/exi/pom.xml b/extensions/modules/exi/pom.xml index c499db17b30..47f18b5f352 100644 --- a/extensions/modules/exi/pom.xml +++ b/extensions/modules/exi/pom.xml @@ -58,6 +58,28 @@ exificient + + com.siemens.ct.exi + exificient-grammars + + + xerces + xercesImpl + + + + + + com.siemens.ct.exi + exificient-core + + + xerces + xercesImpl + + + + com.evolvedbinary.j8fu j8fu