Upgrade 3rd party dependencies and Siddhi version

wso2 · Mar 2, 2024 · 9ab7346 · 9ab7346
1 parent d44917c
commit 9ab7346
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/components/event-flow/org.wso2.carbon.event.flow.ui/pom.xml b/components/event-flow/org.wso2.carbon.event.flow.ui/pom.xml
@@ -61,7 +61,7 @@
             <artifactId>org.wso2.carbon.ui</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
+            <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>

diff --git a/components/event-flow/org.wso2.carbon.event.flow/pom.xml b/components/event-flow/org.wso2.carbon.event.flow/pom.xml
@@ -64,7 +64,7 @@
             <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
+            <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>

diff --git a/components/event-processor/org.wso2.carbon.event.processor.admin/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.admin/pom.xml
@@ -33,7 +33,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
+            <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>

diff --git a/components/event-processor/org.wso2.carbon.event.processor.siddhi.extension/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.siddhi.extension/pom.xml
@@ -34,7 +34,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
+            <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>

diff --git a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/pom.xml
@@ -36,7 +36,7 @@
             <artifactId>org.wso2.carbon.event.template.manager.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
+            <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>

diff --git a/components/geo-dashboard/org.wso2.carbon.siddhi.geo.event.fuser/pom.xml b/components/geo-dashboard/org.wso2.carbon.siddhi.geo.event.fuser/pom.xml
@@ -23,7 +23,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
+            <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
     </dependencies>

diff --git a/components/geo-dashboard/org.wso2.carbon.siddhi.geo.event.notifier/pom.xml b/components/geo-dashboard/org.wso2.carbon.siddhi.geo.event.notifier/pom.xml
@@ -39,7 +39,7 @@
             <artifactId>siddhi-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
+            <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>

diff --git a/features/event-processor/org.wso2.carbon.event.processor.server.feature/pom.xml b/features/event-processor/org.wso2.carbon.event.processor.server.feature/pom.xml
@@ -156,7 +156,7 @@
             <!--<artifactId>org.wso2.carbon.ml.database</artifactId>-->
         <!--</dependency>-->
         <dependency>
-            <groupId>org.quartz-scheduler.wso2</groupId>
+            <groupId>org.wso2.orbit.org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
         </dependency>
         <dependency>
@@ -257,7 +257,7 @@
                                     org.antlr:antlr4-runtime:${antlr.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    org.quartz-scheduler.wso2:quartz:${quartz.version}
+                                    org.wso2.orbit.org.quartz-scheduler:quartz:${quartz.version}
                                 </bundleDef>
 
                                 <!--siddhi extensions-->

diff --git a/...2.carbon.geo.dashboard.feature/src/main/resources/org_wso2_carbon_geo_dashboard-1.0.0.car b/...2.carbon.geo.dashboard.feature/src/main/resources/org_wso2_carbon_geo_dashboard-1.0.0.car
diff --git a/pom.xml b/pom.xml
@@ -105,7 +105,7 @@
                 <version>${snakeyaml.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.quartz-scheduler.wso2</groupId>
+                <groupId>org.wso2.orbit.org.quartz-scheduler</groupId>
                 <artifactId>quartz</artifactId>
                 <version>${quartz.version}</version>
             </dependency>
@@ -191,7 +191,7 @@
                 <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
+                <groupId>org.wso2.org.ops4j.pax.logging</groupId>
                 <artifactId>pax-logging-api</artifactId>
                 <version>${pax.logging.api.version}</version>
             </dependency>
@@ -428,6 +428,12 @@
                 <groupId>org.wso2.siddhi</groupId>
                 <artifactId>siddhi-core</artifactId>
                 <version>${siddhi.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.wso2.siddhi</groupId>
@@ -923,7 +929,7 @@
         <carbon.event.processing.version>2.3.9-SNAPSHOT</carbon.event.processing.version>
         <carbon.analytics.common.version>5.3.6</carbon.analytics.common.version>
         <carbon.analytics.common.range>[5.2.0, 6.0.0)</carbon.analytics.common.range>
-        <siddhi.version>3.2.8</siddhi.version>
+        <siddhi.version>3.2.12</siddhi.version>
         <carbon.metrics.version>1.3.7</carbon.metrics.version>
 
         <orbit.version.axiom>1.2.11-wso2v16</orbit.version.axiom>
@@ -940,7 +946,7 @@
         <antlr.version>4.5</antlr.version>
         <guava.version>33.0.0-jre</guava.version>
         <snakeyaml.version>2.2</snakeyaml.version>
-        <quartz.version>2.1.1.wso2v1</quartz.version>
+        <quartz.version>2.3.2.wso2v1</quartz.version>
         <hadoop.client.version>2.7.2.wso2v1</hadoop.client.version>
         <ml.version>1.2.7</ml.version>
         <commons-math3.version>3.2</commons-math3.version>
@@ -964,7 +970,7 @@
         <encoder.wso2.version>1.2.0.wso2v1</encoder.wso2.version>
         <apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>
         <maven.scr.plugin.version>1.26.0</maven.scr.plugin.version>
-        <pax.logging.api.version>1.10.1</pax.logging.api.version>
+        <pax.logging.api.version>2.2.1-wso2v2</pax.logging.api.version>
         <import.package.version.commons.logging>[1.2.0,2.0.0)</import.package.version.commons.logging>
     </properties>