This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new dda24b6 UNOMI-491 Upgrade Karaf, CXF and Jackson (#339)
dda24b6 is described below
commit dda24b66eb796f4c4d1463410d868a456364a4ad
Author: Serge Huber <[email protected]>
AuthorDate: Thu Sep 16 09:24:15 2021 +0200
UNOMI-491 Upgrade Karaf, CXF and Jackson (#339)
* Attempting to upgrade CXF and hibernate-validator
* Upgrading libraries:
- Karaf -> 4.2.11
- CXF -> 3.4.4
- GraphQL -> 17
- GraphQL annotations -> 9.0
- Jackson -> 2.11.1
* Revert back to GraphQL 14 and GraphQL Java Annotations 8
* Minor fixes
* - Switch back to bean validation 1.1.0 / hibernate validator 5.4.1
- Fix Jackson databind versions
- Moved Jackson dataformat YAML bundle out of WAB because it was causing
scanning issues
* - Fix validation API in GraphQL feature
- Reactive all Unomi features in package
* - Revert to JAXB annotations
- Fix problem with JAXB API dependency that was not at correct version
* Some cleanup
* Revert back to old date/JSON functions
---
api/pom.xml | 7 ++--
.../src/main/feature/feature.xml | 1 +
extensions/router/router-rest/pom.xml | 2 +-
.../karaf-kar/src/main/feature/feature.xml | 1 +
.../karaf-kar/src/main/feature/feature.xml | 1 +
.../karaf-kar/src/main/feature/feature.xml | 1 +
.../karaf-kar/src/main/feature/feature.xml | 1 +
graphql/karaf-feature/src/main/feature/feature.xml | 44 +++++++++++-----------
graphql/pom.xml | 4 +-
kar/src/main/feature/feature.xml | 10 +++--
.../unomi/persistence/spi/CustomObjectMapper.java | 2 +-
.../spi/PropertyTypedObjectDeserializer.java | 9 ++++-
plugins/baseplugin/pom.xml | 6 +--
plugins/kafka-injector/pom.xml | 4 +-
pom.xml | 12 +++---
rest/pom.xml | 2 +
wab/pom.xml | 1 +
17 files changed, 62 insertions(+), 46 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 8b16b1f..7bc17fa 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -32,9 +32,9 @@
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -65,7 +65,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git
a/extensions/router/router-karaf-feature/src/main/feature/feature.xml
b/extensions/router/router-karaf-feature/src/main/feature/feature.xml
index 7812271..d3c9cd7 100644
--- a/extensions/router/router-karaf-feature/src/main/feature/feature.xml
+++ b/extensions/router/router-karaf-feature/src/main/feature/feature.xml
@@ -18,6 +18,7 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0
http://karaf.apache.org/xmlns/features/v1.3.0";
name="unomi-router-karaf-feature">
<feature name="unomi-router-karaf-feature" version="${project.version}"
description="Apache Unomi :: Extensions :: Router :: Apache Karaf Feature">
<details>Apache Karaf feature for the Apache Unomi Context Server
extension</details>
+ <feature>wrap</feature>
<feature>unomi-kar</feature>
<bundle
start-level="90">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/0.1.54_1</bundle>
<bundle start-level="90">mvn:commons-net/commons-net/3.6</bundle>
diff --git a/extensions/router/router-rest/pom.xml
b/extensions/router/router-rest/pom.xml
index 9213f42..b3fc379 100644
--- a/extensions/router/router-rest/pom.xml
+++ b/extensions/router/router-rest/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${version.jackson.core}</version>
+ <version>${version.jackson.databind}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
b/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
index d3fbc36..aa544d8 100644
--- a/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
@@ -18,6 +18,7 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1";
name="unomi-salesforce-connector-karaf-feature">
<feature name="unomi-salesforce-connector-karaf-kar"
version="${project.version}" description="Apache Unomi :: Extensions ::
Salesforce connector :: Apache Karaf Feature">
<details>Apache Karaf feature for the Apache Unomi Context Server
extension that integrates with Salesforce</details>
+ <feature>unomi-kar</feature>
<configfile
finalname="/etc/org.apache.unomi.sfdc.cfg">mvn:org.apache.unomi/unomi-salesforce-connector-services/${project.version}/cfg/sfdccfg</configfile>
<bundle
start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore-osgi.version}</bundle>
<bundle
start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-osgi.version}</bundle>
diff --git a/extensions/unomi-mailchimp/karaf-kar/src/main/feature/feature.xml
b/extensions/unomi-mailchimp/karaf-kar/src/main/feature/feature.xml
index 5faa7bc..6c043b2 100644
--- a/extensions/unomi-mailchimp/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/unomi-mailchimp/karaf-kar/src/main/feature/feature.xml
@@ -19,6 +19,7 @@
<feature name="unomi-mailchimp-connector-karaf-kar"
version="${project.version}"
description="Apache Unomi :: Extensions :: MailChimp Connector ::
Apache Karaf Feature">
<details>Connect Apache Unomi to MailChimp API</details>
+ <feature>unomi-kar</feature>
<configfile
finalname="/etc/org.apache.unomi.mailchimpconnector.cfg">mvn:org.apache.unomi/unomi-mailchimp-connector-services/${project.version}/cfg/mailchimpconnectorcfg</configfile>
<bundle
start-level="90">mvn:org.apache.unomi/unomi-mailchimp-connector-services/${project.version}</bundle>
<bundle
start-level="90">mvn:org.apache.unomi/unomi-mailchimp-connector-rest/${project.version}</bundle>
diff --git a/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
b/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
index 34b46bb..f1db52b 100644
--- a/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
@@ -20,6 +20,7 @@
description="Apache Unomi :: Extensions :: Weather update ::
Apache Karaf Feature">
<details>Apache Karaf feature for the Apache Unomi Context Server
extension that integrates Weather
update</details>
+ <feature>unomi-kar</feature>
<configfile
finalname="/etc/org.apache.unomi.weatherUpdate.cfg">mvn:org.apache.unomi/unomi-weather-update-core/${project.version}/cfg/weatherupdatecfg</configfile>
<bundle
start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore-osgi.version}</bundle>
<bundle
start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-osgi.version}</bundle>
diff --git a/extensions/web-tracker/karaf-kar/src/main/feature/feature.xml
b/extensions/web-tracker/karaf-kar/src/main/feature/feature.xml
index 1efbb26..85c6446 100644
--- a/extensions/web-tracker/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/web-tracker/karaf-kar/src/main/feature/feature.xml
@@ -19,6 +19,7 @@
<feature name="unomi-web-tracker-karaf-kar" version="${project.version}"
description="Apache Unomi :: Extensions :: Web Tracker :: Apache
Karaf Feature">
<details>Apache Karaf feature for the Apache Unomi Context Server
extension that provide the web tracker.</details>
+ <feature>unomi-kar</feature>
<bundle
start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore-osgi.version}</bundle>
<bundle
start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-osgi.version}</bundle>
<bundle
start-level="85">mvn:org.apache.unomi/unomi-web-tracker-wab/${project.version}</bundle>
diff --git a/graphql/karaf-feature/src/main/feature/feature.xml
b/graphql/karaf-feature/src/main/feature/feature.xml
index 3579d2b..c1ac4c0 100644
--- a/graphql/karaf-feature/src/main/feature/feature.xml
+++ b/graphql/karaf-feature/src/main/feature/feature.xml
@@ -16,10 +16,10 @@
~ limitations under the License.
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0";
name="cdp-graphql-feature">
- <feature name="cdp-graphql-feature" description="Apache Unomi :: GraphQL
API :: Karaf Feature" version="2.0.0.SNAPSHOT">
+ <feature name="cdp-graphql-feature" description="Apache Unomi :: GraphQL
API :: Karaf Feature" version="${project.version}">
<details>Apache Unomi Context GraphQL API Karaf Feature</details>
+ <feature prerequisite="true">wrap</feature>
<feature>unomi-kar</feature>
- <feature prerequisite="true" dependency="false">wrap</feature>
<bundle start-level="80">mvn:com.google.guava/guava/24.1.1-jre</bundle>
<bundle
start-level="80">wrap:mvn:com.google.code.findbugs/jsr305/1.3.9</bundle>
<bundle
start-level="80">wrap:mvn:org.checkerframework/checker-compat-qual/2.0.0</bundle>
@@ -28,30 +28,30 @@
<bundle
start-level="80">wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14</bundle>
<bundle
start-level="80">mvn:commons-fileupload/commons-fileupload/1.3.1</bundle>
<bundle start-level="80">mvn:commons-io/commons-io/2.4</bundle>
- <bundle start-level="80">mvn:org.antlr/antlr4-runtime/4.7.1</bundle>
- <bundle
start-level="80">mvn:com.graphql-java/java-dataloader/2.2.0</bundle>
+ <bundle
start-level="80">mvn:org.antlr/antlr4-runtime/${antlr.runtime.version}</bundle>
+ <bundle
start-level="80">wrap:mvn:com.graphql-java/java-dataloader/${java.dataloader.version}</bundle>
<bundle
start-level="80">mvn:org.reactivestreams/reactive-streams/1.0.2</bundle>
- <bundle
start-level="80">mvn:com.graphql-java/graphql-java/14.0</bundle>
- <bundle
start-level="80">mvn:io.github.graphql-java/graphql-java-annotations/8.0</bundle>
- <bundle
start-level="80">mvn:javax.validation/validation-api/1.1.0.Final</bundle>
- <bundle
start-level="80">wrap:mvn:com.graphql-java/graphql-java-extended-scalars/1.0</bundle>
+ <bundle
start-level="80">mvn:com.graphql-java/graphql-java/${graphql.java.version}</bundle>
+ <bundle
start-level="80">mvn:io.github.graphql-java/graphql-java-annotations/${graphql.java.annotations.version}</bundle>
+ <bundle
start-level="80">mvn:javax.validation/validation-api/${bean.validation.version}</bundle>
+ <bundle
start-level="80">wrap:mvn:com.graphql-java/graphql-java-extended-scalars/${graphql.java.extended.scalars.version}</bundle>
<bundle
start-level="80">wrap:mvn:com.squareup.okhttp3/okhttp/3.2.0</bundle>
<bundle start-level="80">wrap:mvn:com.squareup.okio/okio/1.6.0</bundle>
<bundle
start-level="80">mvn:io.reactivex.rxjava2/rxjava/2.2.19</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-server/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-common/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-api/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-util/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-io/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-client/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-client/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-xml/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-servlet/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-util/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-io/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-client/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-xml/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-servlet/${jetty.websocket.version}</bundle>
<bundle
start-level="80">mvn:javax.servlet/javax.servlet-api/3.0.1</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-servlet/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-security/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-server/9.4.28.v20200408</bundle>
- <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-http/9.4.28.v20200408</bundle>
- <bundle start-level="80"
start="false">mvn:org.apache.unomi/cdp-graphql-api-impl/2.0.0-SNAPSHOT</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-servlet/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-security/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-server/${jetty.websocket.version}</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-http/${jetty.websocket.version}</bundle>
+ <bundle start-level="80"
start="false">mvn:org.apache.unomi/cdp-graphql-api-impl/${project.version}</bundle>
</feature>
</features>
diff --git a/graphql/pom.xml b/graphql/pom.xml
index 822a215..9c64908 100644
--- a/graphql/pom.xml
+++ b/graphql/pom.xml
@@ -36,7 +36,9 @@
<graphql.java.annotations.version>8.0</graphql.java.annotations.version>
<graphql.java.extended.scalars.version>1.0</graphql.java.extended.scalars.version>
<reactivex.version>2.2.19</reactivex.version>
- <jetty.websocket.version>9.4.28.v20200408</jetty.websocket.version>
+ <antlr.runtime.version>4.7.1</antlr.runtime.version>
+ <java.dataloader.version>2.2.0</java.dataloader.version>
+ <jetty.websocket.version>9.4.38.v20210224</jetty.websocket.version>
</properties>
<modules>
diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml
index 2849ddf..af6d6ea 100644
--- a/kar/src/main/feature/feature.xml
+++ b/kar/src/main/feature/feature.xml
@@ -24,15 +24,16 @@
<feature description="unomi-kar" version="${project.version}"
name="unomi-kar"
start-level="70">
- <feature>war</feature>
+ <feature prerequisite="true">wrap</feature>
+ <feature prerequisite="true">aries-blueprint</feature>
+ <feature prerequisite="true">war</feature>
<feature>cxf-jaxrs</feature>
<feature>cxf-features-metrics</feature>
+ <feature>cxf-rs-security-cors</feature>
<feature>cxf-rs-description-openapi-v3</feature>
<feature>cellar</feature>
<feature>eventadmin</feature>
<feature>shell-compat</feature>
- <feature prerequisite="true">wrap</feature>
- <feature dependency="true">aries-blueprint</feature>
<feature
version="${hibernate.validator.version}">hibernate-validator</feature>
<configfile
finalname="/etc/org.apache.unomi.web.cfg">mvn:org.apache.unomi/unomi-wab/${project.version}/cfg/unomicfg</configfile>
<configfile
finalname="/etc/org.apache.unomi.persistence.elasticsearch.cfg">mvn:org.apache.unomi/unomi-persistence-elasticsearch-core/${project.version}/cfg/elasticsearchcfg</configfile>
@@ -50,11 +51,12 @@
<bundle start-level="75">mvn:com.google.guava/guava/16.0.1</bundle>
<bundle
start-level="75">mvn:com.github.fge/jackson-coreutils/1.8</bundle>
<bundle start-level="75">mvn:com.github.fge/json-patch/1.9</bundle>
- <bundle
start-level="75">mvn:com.fasterxml.jackson.core/jackson-databind/${version.jackson.core}</bundle>
+ <bundle
start-level="75">mvn:com.fasterxml.jackson.core/jackson-databind/${version.jackson.databind}</bundle>
<bundle
start-level="75">mvn:com.fasterxml.jackson.core/jackson-annotations/${version.jackson.core}</bundle>
<bundle
start-level="75">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${version.jackson.core}</bundle>
<bundle
start-level="75">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${version.jackson.jaxb}</bundle>
<bundle
start-level="75">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${version.jackson.core}</bundle>
+ <bundle
start-level="75">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${version.jackson.core}</bundle>
<bundle
start-level="75">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/1.4_1</bundle>
<bundle
start-level="75">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/2.3_1</bundle>
<bundle
start-level="75">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/2.9.0</bundle>
diff --git
a/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/CustomObjectMapper.java
b/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/CustomObjectMapper.java
index 21dbcbd..4f967c8 100644
---
a/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/CustomObjectMapper.java
+++
b/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/CustomObjectMapper.java
@@ -56,7 +56,7 @@ public class CustomObjectMapper extends ObjectMapper {
new SimpleModule("PropertyTypedObjectDeserializerModule",
new Version(1, 0, 0, null, "org.apache.unomi.rest",
"deserializer"));
- PropertyTypedObjectDeserializer propertyTypedObjectDeserializer = new
PropertyTypedObjectDeserializer();
+ PropertyTypedObjectDeserializer propertyTypedObjectDeserializer = new
PropertyTypedObjectDeserializer(null, null);
propertyTypedObjectDeserializer.registerMapping("type=.*Condition",
Condition.class);
deserializerModule.addDeserializer(Object.class,
propertyTypedObjectDeserializer);
diff --git
a/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PropertyTypedObjectDeserializer.java
b/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PropertyTypedObjectDeserializer.java
index 1057654..23a556e 100644
---
a/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PropertyTypedObjectDeserializer.java
+++
b/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PropertyTypedObjectDeserializer.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.core.TreeNode;
import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.deser.std.UntypedObjectDeserializer;
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -37,7 +38,7 @@ import java.util.*;
* SimpleModule deserializerModule =
* new SimpleModule("PropertyTypedObjectDeserializerModule",
* new Version(1, 0, 0, null, "org.apache.unomi.rest",
"deserializer"));
- * PropertyTypedObjectDeserializer propertyTypedObjectDeserializer
= new PropertyTypedObjectDeserializer();
+ * PropertyTypedObjectDeserializer propertyTypedObjectDeserializer
= new PropertyTypedObjectDeserializer(null, null);
*
propertyTypedObjectDeserializer.registerMapping("type=.*Condition",
Condition.class);
* deserializerModule.addDeserializer(Object.class,
propertyTypedObjectDeserializer);
* objectMapper.registerModule(deserializerModule);
@@ -58,6 +59,10 @@ public class PropertyTypedObjectDeserializer extends
UntypedObjectDeserializer {
private Map<String,Set<String>> fieldValuesToMatch = new
LinkedHashMap<String,Set<String>>();
+ public PropertyTypedObjectDeserializer(JavaType listType, JavaType
mapType) {
+ super(listType, mapType);
+ }
+
public void registerMapping(String matchExpression,
Class<? extends Object> mappedClass) {
registry.put(matchExpression, mappedClass);
@@ -74,7 +79,7 @@ public class PropertyTypedObjectDeserializer extends
UntypedObjectDeserializer {
public Object deserialize(
JsonParser jp, DeserializationContext ctxt)
throws IOException {
- if (jp.getCurrentTokenId() != JsonTokenId.ID_START_OBJECT) {
+ if (jp.currentTokenId() != JsonTokenId.ID_START_OBJECT) {
return super.deserialize(jp, ctxt);
}
ObjectCodec codec = jp.getCodec();
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 3b9ef91..87c3af1 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -37,9 +37,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/plugins/kafka-injector/pom.xml b/plugins/kafka-injector/pom.xml
index 772ad0e..a3f6953 100644
--- a/plugins/kafka-injector/pom.xml
+++ b/plugins/kafka-injector/pom.xml
@@ -47,12 +47,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.8</version>
+ <version>${version.jackson.core}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.8</version>
+ <version>${version.jackson.databind}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/pom.xml b/pom.xml
index 7519bb0..60a8c1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,11 +64,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.3.4</cxf.version>
- <version.jackson.core>2.9.10</version.jackson.core>
- <version.jackson.databind>2.9.10.8</version.jackson.databind>
- <version.jackson.jaxb>2.9.10</version.jackson.jaxb>
- <version.karaf>4.2.8</version.karaf>
+ <cxf.version>3.3.11</cxf.version>
+ <version.jackson.core>2.10.5</version.jackson.core>
+ <version.jackson.databind>2.10.5.1</version.jackson.databind>
+ <version.jackson.jaxb>2.10.5</version.jackson.jaxb>
+ <version.karaf>4.2.11</version.karaf>
<version.karaf.cellar>4.2.1</version.karaf.cellar>
<version.pax.exam>4.13.1</version.pax.exam>
<elasticsearch.version>7.4.2</elasticsearch.version>
@@ -740,7 +740,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${version.jackson.core}</version>
+ <version>${version.jackson.databind}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/rest/pom.xml b/rest/pom.xml
index e7342ac..77ae8fc 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -157,10 +157,12 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
diff --git a/wab/pom.xml b/wab/pom.xml
index accca9a..961a5cb 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -66,6 +66,7 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${version.jackson.core}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
