(unomi) branch master updated: UNOMI-841: move dependency as provided to remove error at startup (#669)

[jsinovassinnaik]

This is an automated email from the ASF dual-hosted git repository.

jsinovassinnaik 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 37c4948f4 UNOMI-841: move dependency as provided to remove error at 
startup (#669)
37c4948f4 is described below

commit 37c4948f417ce1c0a86dab526f762da1591f44b1
Author: jsinovassin <58434978+jsinovas...@users.noreply.github.com>
AuthorDate: Mon Jun 10 14:50:02 2024 +0200

    UNOMI-841: move dependency as provided to remove error at startup (#669)
---
 kar/src/main/feature/feature.xml | 1 +
 pom.xml                          | 9 ++++++---
 tools/shell-commands/pom.xml     | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml
index cd4be3d37..e16b43e0e 100644
--- a/kar/src/main/feature/feature.xml
+++ b/kar/src/main/feature/feature.xml
@@ -52,6 +52,7 @@
         <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:org.json/json/${org.json.version}</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>
diff --git a/pom.xml b/pom.xml
index d50d50089..48fbd520d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
         <joda-time.version>2.12.7</joda-time.version>
         <st4.version>4.3.4</st4.version>
         <json-patch.version>1.9</json-patch.version>
+        <org.json.version>20240303</org.json.version>
 
         <java.version>11</java.version>
 
@@ -958,26 +959,28 @@
                 <version>1.0</version>
                 <scope>provided</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
                 <version>1.0</version>
                 <scope>provided</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-annotation_1.1_spec</artifactId>
                 <version>1.0.1</version>
                 <scope>provided</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.mvel</groupId>
                 <artifactId>mvel2</artifactId>
                 <version>2.5.2.Final</version>
             </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>${org.json.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/tools/shell-commands/pom.xml b/tools/shell-commands/pom.xml
index 745567914..e87fc50bc 100644
--- a/tools/shell-commands/pom.xml
+++ b/tools/shell-commands/pom.xml
@@ -52,15 +52,15 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20240303</version>
+            <scope>provided</scope>
         </dependency>
 
-
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>