diff --git a/persistence-modules/spring-boot-persistence-2/README.md b/persistence-modules/spring-boot-persistence-2/README.md
index a74bf7ff02..fac8b75615 100644
--- a/persistence-modules/spring-boot-persistence-2/README.md
+++ b/persistence-modules/spring-boot-persistence-2/README.md
@@ -1,4 +1,3 @@
 ### Relevant Articles:
 
-- [Using JDBI with Spring Boot](https://www.baeldung.com/spring-boot-jdbi)
-- [Oracle Connection Pooling With Spring](https://www.baeldung.com/oracle-connection-pooling-with-spring)
\ No newline at end of file
+- [Using JDBI with Spring Boot](https://www.baeldung.com/spring-boot-jdbi)
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-2/lib/ons.jar b/persistence-modules/spring-boot-persistence-2/lib/ons.jar
deleted file mode 100644
index 637cf11887..0000000000
Binary files a/persistence-modules/spring-boot-persistence-2/lib/ons.jar and /dev/null differ
diff --git a/persistence-modules/spring-boot-persistence-2/pom.xml b/persistence-modules/spring-boot-persistence-2/pom.xml
index 8f76bce1b3..c1afededb0 100644
--- a/persistence-modules/spring-boot-persistence-2/pom.xml
+++ b/persistence-modules/spring-boot-persistence-2/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.boot.persistence</groupId>
     <artifactId>spring-boot-persistence-2</artifactId>
@@ -41,20 +41,20 @@
     </dependencyManagement>
 
     <dependencies>
-    	<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>			
-		</dependency>
-		
-		<dependency>
-			<groupId>net.bytebuddy</groupId>
-			<artifactId>byte-buddy</artifactId>			
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.jdbi</groupId>
@@ -92,47 +92,23 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc8</artifactId>
-			<version>12.2.0.1</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/lib/ojdbc8.jar</systemPath>
-		</dependency>
-		
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ucp</artifactId>
-			<version>12.2.0.1</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/lib/ucp.jar</systemPath>
-		</dependency>
-		
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ons</artifactId>
-			<version>12.2.0.1</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/lib/ons.jar</systemPath>
-		</dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>${c3p0.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>com.mchange</groupId>
-			<artifactId>c3p0</artifactId>
-			<version>${c3p0.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-dbcp2</artifactId>			
-		</dependency>
-		
- 		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-jdbc</artifactId>			
-		</dependency>
-        
     </dependencies>
 
     <build>
@@ -141,6 +117,23 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <!-- Please note that ojdbc8.jar, ucp.jar and ons.jar dependencies 
+                are needed for OracleConfiguration.java, OracleUCPConfiguration.java, SpringOraclePoolingApplicationOracleLiveTest.java 
+                and SpringOraclePoolingApplicationOracleUCPLiveTest.java -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>com/baeldung/spring/oracle/pooling/configuration/OracleConfiguration.java</exclude>
+                        <exclude>com/baeldung/spring/oracle/pooling/configuration/OracleUCPConfiguration.java</exclude>
+                    </excludes>
+                    <testExcludes>
+                        <testExclude>com/baeldung/spring/oracle/pooling/SpringOraclePoolingApplicationOracleLiveTest.java</testExclude>
+                        <testExclude>com/baeldung/spring/oracle/pooling/SpringOraclePoolingApplicationOracleUCPLiveTest.java</testExclude>
+                    </testExcludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/configuration/OracleConfiguration.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/configuration/OracleConfiguration.java
index 327374cb54..9cf7e27c99 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/configuration/OracleConfiguration.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/configuration/OracleConfiguration.java
@@ -22,6 +22,8 @@ public class OracleConfiguration {
         dataSource.setURL("jdbc:oracle:thin:@//localhost:11521/ORCLPDB1");
         dataSource.setFastConnectionFailoverEnabled(true);
         dataSource.setImplicitCachingEnabled(true);
+        // Only with clients prior to v11.2
+        // dataSource.setConnectionCachingEnabled(true);
         return dataSource;
     }    
 }
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/configuration/OracleUCPConfiguration.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/configuration/OracleUCPConfiguration.java
index 67b4b40712..b4c1544149 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/configuration/OracleUCPConfiguration.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/configuration/OracleUCPConfiguration.java
@@ -21,9 +21,11 @@ public class OracleUCPConfiguration {
         dataSource.setUser("books");
         dataSource.setPassword("books");
         dataSource.setConnectionFactoryClassName("oracle.jdbc.pool.OracleDataSource");
-        dataSource.setURL("jdbc:oracle:thin:@//localhost:11521/ORCLPDB1");     
+        dataSource.setURL("jdbc:oracle:thin:@//localhost:11521/ORCLPDB1");
+        
         dataSource.setFastConnectionFailoverEnabled(true);
         dataSource.setInitialPoolSize(5);
+        dataSource.setMinPoolSize(5);
         dataSource.setMaxPoolSize(10);
         return dataSource;
     }