Merge pull request #137 from aka4rKO/3.0.0-analytics-fix-new

[OB3] Fixes analytics no class def found issue
wso2 · Oct 10, 2024 · e36257c · e36257c
2 parents 3ac1dd0 + 765a342
commit e36257c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/...accelerator.data.publisher/com.wso2.openbanking.accelerator.data.publisher.common/pom.xml b/...accelerator.data.publisher/com.wso2.openbanking.accelerator.data.publisher.common/pom.xml
@@ -38,6 +38,10 @@
             <groupId>com.wso2.openbanking.accelerator</groupId>
             <artifactId>com.wso2.openbanking.accelerator.common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
@@ -84,7 +88,7 @@
                             org.wso2.carbon.databridge.agent.*; version="${carbon.analytics.common.version.range}",
                             org.wso2.carbon.databridge.commons.*; version="${carbon.analytics.common.version.range}",
                             com.wso2.openbanking.accelerator.common.*; version="${project.version}",
-                            org.apache.tomcat.dbcp.pool2.*; version="${tomcat.catalina.version}"
+                            org.apache.commons.pool2.*; version="${commons-pool2.version}"
                         </Import-Package>
                         <Export-Package>
                             !com.wso2.openbanking.accelerator.data.publisher.common.internal,

diff --git a/...ain/java/com/wso2/openbanking/accelerator/data/publisher/common/DataPublisherFactory.java b/...ain/java/com/wso2/openbanking/accelerator/data/publisher/common/DataPublisherFactory.java
@@ -18,9 +18,9 @@
 
 package com.wso2.openbanking.accelerator.data.publisher.common;
 
-import org.apache.tomcat.dbcp.pool2.BasePooledObjectFactory;
-import org.apache.tomcat.dbcp.pool2.PooledObject;
-import org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject;
+import org.apache.commons.pool2.BasePooledObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
 
 /**
  * Data Publisher Factory class.

diff --git a/...c/main/java/com/wso2/openbanking/accelerator/data/publisher/common/DataPublisherPool.java b/...c/main/java/com/wso2/openbanking/accelerator/data/publisher/common/DataPublisherPool.java
@@ -18,9 +18,9 @@
 
 package com.wso2.openbanking.accelerator.data.publisher.common;
 
-import org.apache.tomcat.dbcp.pool2.PooledObjectFactory;
-import org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool;
-import org.apache.tomcat.dbcp.pool2.impl.GenericObjectPoolConfig;
+import org.apache.commons.pool2.PooledObjectFactory;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 
 /**
  * Data Publisher Pool class.

diff --git a/...om/wso2/openbanking/accelerator/data/publisher/common/internal/OBAnalyticsDataHolder.java b/...om/wso2/openbanking/accelerator/data/publisher/common/internal/OBAnalyticsDataHolder.java
@@ -25,7 +25,7 @@
 import com.wso2.openbanking.accelerator.data.publisher.common.EventQueue;
 import com.wso2.openbanking.accelerator.data.publisher.common.OpenBankingDataPublisher;
 import com.wso2.openbanking.accelerator.data.publisher.common.constants.DataPublishingConstants;
-import org.apache.tomcat.dbcp.pool2.impl.GenericObjectPoolConfig;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 
 import java.util.Map;
 

diff --git a/pom.xml b/pom.xml
@@ -454,6 +454,11 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>${commons-lang.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-pool2</artifactId>
+                <version>${commons-pool2.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>
                 <artifactId>commons-dbcp</artifactId>
@@ -755,6 +760,7 @@
         <axiom.wso2.version>1.2.11-wso2v16</axiom.wso2.version>
         <commons.logging.version>1.2</commons.logging.version>
         <commons-lang.version>3.4</commons-lang.version>
+        <commons-pool2.version>2.8.0</commons-pool2.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>
         <commons.bean.utils.version>1.9.3</commons.bean.utils.version>
         <maven.bundle.plugin.version>3.2.0</maven.bundle.plugin.version>