From 61dfd861743f0dbe574b53214299dc35f9ce96c9 Mon Sep 17 00:00:00 2001
From: Michael-A-McMahon <Michael.A.McMahon@oracle.com>
Date: Wed, 28 Sep 2022 13:12:09 -0700
Subject: [PATCH 1/3] Updating dependencies

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9f54c67..bd9d8c6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -65,12 +65,12 @@
 
   <properties>
     <java.version>11</java.version>
-    <ojdbc.version>21.5.0.0</ojdbc.version>
+    <ojdbc.version>21.7.0.0</ojdbc.version>
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
-    <reactor.version>2020.0.19</reactor.version>
+    <reactor.version>2020.0.23</reactor.version>
     <reactive-streams.version>1.0.3</reactive-streams.version>
-    <junit.version>5.8.2</junit.version>
-    <spring-jdbc.version>5.2.6.RELEASE</spring-jdbc.version>
+    <junit.version>5.9.1</junit.version>
+    <spring-jdbc.version>5.3.19</spring-jdbc.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

From e0a46e3b00432630dde1879f65d9ab5511027a76 Mon Sep 17 00:00:00 2001
From: Michael-A-McMahon <Michael.A.McMahon@oracle.com>
Date: Tue, 15 Nov 2022 12:13:06 -0800
Subject: [PATCH 2/3] Update to Reactor 3.5

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bd9d8c6..a226de4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
     <java.version>11</java.version>
     <ojdbc.version>21.7.0.0</ojdbc.version>
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
-    <reactor.version>2020.0.23</reactor.version>
+    <reactor.version>3.5.0</reactor.version>
     <reactive-streams.version>1.0.3</reactive-streams.version>
     <junit.version>5.9.1</junit.version>
     <spring-jdbc.version>5.3.19</spring-jdbc.version>
@@ -214,6 +214,7 @@
   </build>
 
 
+  <!--
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -225,6 +226,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  -->
 
   <dependencies>
     <!-- Oracle R2DBC Driver Dependencies -->
@@ -241,6 +243,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
+      <version>${reactor.version}</version>
     </dependency>
     <dependency>
       <groupId>org.reactivestreams</groupId>
@@ -273,11 +276,13 @@
       <version>${spring-jdbc.version}</version>
       <scope>test</scope>
     </dependency>
+    <!---
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
       <scope>test</scope>
     </dependency>
+    -->
 
   </dependencies>
 

From 32c9fda457bf6e0684eefc86193ee59d62b7720d Mon Sep 17 00:00:00 2001
From: Michael-A-McMahon <Michael.A.McMahon@oracle.com>
Date: Tue, 15 Nov 2022 15:51:57 -0800
Subject: [PATCH 3/3] Remove java.naming module dependency

---
 pom.xml                        | 37 +++++-----------------------------
 src/main/java/module-info.java |  1 -
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9742805..6d272b4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -86,18 +86,10 @@
             <arg>-Xlint:-options</arg>
             <arg>-Xlint:-processing</arg>
             <arg>-Xlint:-serial</arg>
+            <!-- LDAP URL tests require the java.naming module -->
+            <testCompilerArgument>--add-modules</testCompilerArgument>
+            <testCompilerArgument>java.naming</testCompilerArgument>
           </compilerArgs>
-          <!-- LDAP URL tests require the java.naming module -->
-          <!-- Maven seems to ignore the forceJavacCompilerUse.
-            This results in an error when passing the addModules option to
-            the javax.tools API. For this reason, Oracle R2DBC's module-info is
-            declaring a depency on the java.naming module.
-            TODO: Figure out how to make maven compile tests correctly, and 
-            remove the java.naming depenency from Oracle R2DBC.
-          <fork>true</fork>
-          <forceJavacCompilerUse>true</forceJavacCompilerUse>
-          <testCompilerArgument>- -add-modules java.naming</testCompilerArgument>
-          -->
           <showWarnings>true</showWarnings>
           <release>${java.version}</release>
         </configuration>
@@ -166,6 +158,8 @@
             <include>**/*Test.java</include>
             <include>**/*TestKit.java</include>
           </includes>
+          <!-- LDAP URL tests require the java.naming module -->
+          <argLine>--add-reads com.oracle.database.r2dbc=java.naming</argLine>
         </configuration>
       </plugin>
       <plugin>
@@ -226,20 +220,6 @@
   </build>
 
 
-  <!--
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.projectreactor</groupId>
-        <artifactId>reactor-bom</artifactId>
-        <version>${reactor.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  -->
-
   <dependencies>
     <!-- Oracle R2DBC Driver Dependencies -->
     <dependency>
@@ -288,13 +268,6 @@
       <version>${spring-jdbc.version}</version>
       <scope>test</scope>
     </dependency>
-    <!---
-    <dependency>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    -->
   </dependencies>
 
   <profiles>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index ce9c4bc..796c99e 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -30,7 +30,6 @@
     with oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl;
 
   requires java.sql;
-  requires java.naming;
   requires com.oracle.database.jdbc;
   requires reactor.core;
   requires transitive org.reactivestreams;