Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependencies Update #105

Merged
merged 5 commits into from
Nov 16, 2022
Merged

Dependencies Update #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61dfd86
Updating dependencies
Michael-A-McMahon Sep 28, 2022
e0a46e3
Update to Reactor 3.5
Michael-A-McMahon Nov 15, 2022
dca2ece
Merge branch 'main' of https://github.com/oracle/oracle-r2dbc into 1-…
Michael-A-McMahon Nov 15, 2022
9ecc170
Merge branch 'main' of https://github.com/oracle/oracle-r2dbc into 1-…
Michael-A-McMahon Nov 15, 2022
32c9fda
Remove java.naming module dependency
Michael-A-McMahon Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 10 additions & 32 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>3.5.0</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>

Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -226,18 +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>
Expand All @@ -253,6 +235,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>${reactor.version}</version>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
Expand Down Expand Up @@ -285,11 +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>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down