Update versions and recipe

Author: andytael

recipes/hikariucp/pom.xml

@@ -44,10 +44,10 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <rewrite.version>8.47.2</rewrite.version> <!-- Latest as of Mar 2025 -->
-        <rewrite.recipe.version>3.3.0</rewrite.recipe.version> <!-- Latest as of Mar 2025 -->
-        <maven.rewrite.plugin.version>6.2.1</maven.rewrite.plugin.version>
-        <junit.version>5.12.0</junit.version> <!-- Latest as of Mar 2025 -->
+        <rewrite.version>8.48.1</rewrite.version>                           <!-- Latest as of Mar 2025 -->
+        <rewrite.recipe.version>3.3.0</rewrite.recipe.version>              <!-- Latest as of Mar 2025 -->
+        <maven.rewrite.plugin.version>6.3.2</maven.rewrite.plugin.version>  <!-- Latest as of Mar 2025 -->
+        <junit.version>5.12.1</junit.version>                                <!-- Latest as of Mar 2025 -->
     </properties>
 
     <dependencies>

recipes/hikariucp/src/main/resources/META-INF/rewrite/rewrite.yml

@@ -17,6 +17,9 @@ tags:
 recipeList:
 
   # For pom.xml
+  - org.openrewrite.java.dependencies.RemoveDependency:
+      GroupId: com.oracle.database.jdbc
+      ArtifactId: ojdbc*
   - org.openrewrite.java.dependencies.RemoveDependency:
       groupId: com.zaxxer*
       artifactId: HikariCP*
@@ -29,6 +32,80 @@ recipeList:
       artifactId: oracle-spring-boot-starter-wallet
       version: 25.1.0
 
+  # https://docs.openrewrite.org/recipes/java/spring/addspringproperty
+  # Add a spring configuration property to a configuration file if it does not already exist in that file.
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.driver-class-name
+      value: oracle.jdbc.OracleDriver
+      comment: "JDBC driver class"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.type
+      value: oracle.ucp.jdbc.PoolDataSource
+      comment: specify the connection pool driver to use"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.connection-pool-name
+      value: UCPConnectionPool
+      comment: "Connection Pool Name"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.max-pool-size
+      value: 20
+      comment: "Specifies the maximum number of available and borrowed connections that our pool is maintaining"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.min-pool-size
+      value: 5
+      comment: "Specifies the minimum number of available and borrowed connections that our pool is maintaining"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.initial-pool-size
+      value: 10
+      comment: "Specifies the number of available connections created after the pool is initiated"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.connection-wait-timeout
+      value: 3
+      comment: "specifies how long an application request waits to obtain a connection if there are no longer any connections in the pool"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.inactive-connection-timeout
+      value: 0
+      comment: "Specifies how long an available connection can remain idle before it is closed and removed from the pool"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.max-connection-reuse-time
+      value: 0
+      comment: "Allows connections to be gracefully closed and removed from a connection pool after a specific amount of time"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.connection-validation-timeout
+      value: 15
+      comment: "Specifies the duration within which a borrowed connection from the pool is validated"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.fast-connection-failover-enabled
+      value: false
+      comment: "Enables faster failover for connection attempts"
+      pathExpressions: ["**/application.properties"]
+
+  - org.openrewrite.java.spring.AddSpringProperty:
+      property: spring.datasource.oracleucp.validate-connection-on-borrow
+      value: false
+      comment: "Whether to validate connections when borrowed from the pool"
+      pathExpressions: ["**/application.properties"]
+
   # spring.datasource.oracleucp.connection-factory-class: oracle.jdbc.pool.OracleDataSource
   - org.openrewrite.java.spring.ChangeSpringPropertyKey:
       oldPropertyKey: spring.datasource.hikari.data-source-class-name
@@ -87,12 +164,6 @@ recipeList:
       oldPropertyKey: spring.datasource.hikari.validation-timeout
       newPropertyKey: spring.datasource.oracleucp.connection-validation-timeout
 
-  # spring.datasource.oracleucp.initial-pool-size
-  - org.openrewrite.java.spring.AddSpringProperty:
-      property: spring.datasource.oracleucp.initial-pool-size
-      value: 5
-      comment: "Specifies the number of available connections created after the pool is initiated"
-
   # HikariCP properties that don’t have identical UCP properties
   - org.openrewrite.java.spring.CommentOutSpringPropertyKey:
       propertyKey: spring.datasource.hikari.auto-commit