Merge pull request #5431 from tkafalas/feature

[BACKLOG-39083] Add old commons-dbcp and commons-pool jars back to CE…
pentaho · Oct 31, 2023 · ef0dabf · ef0dabf
2 parents f3bd1ab + 6c2443e
commit ef0dabf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -125,6 +125,31 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!--The old dbcp and pool jars are needed for jackrabbit to work on CE.  They will get removed for EE -->
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>${commons-dbcp.version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>${commons-pool.version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -58,6 +58,8 @@
     <pentaho-vfs.version>1.0</pentaho-vfs.version>
     <wstx-asl.version>3.2.4</wstx-asl.version>
     <icu4j.version>63.1</icu4j.version>
+    <commons-dbcp.version>1.4</commons-dbcp.version>
+    <commons-pool.version>1.5.7</commons-pool.version>
     <gdata-analytics-meta.version>2.1</gdata-analytics-meta.version>
     <syslog4j.version>0.9.46</syslog4j.version>
     <bean-matchers.version>0.9</bean-matchers.version>