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

Upgrade to R2DBC 1.0.0.Release #1266

Merged
merged 3 commits into from Dec 10, 2022
Merged

Upgrade to R2DBC 1.0.0.Release #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbe4633
Upgrade to R2DBC 1.0.0.Release
vladimirfx Nov 28, 2022
caba7be
Fixing CI
lukas-krecan Dec 9, 2022
2f7736f
Move property to the subproject
lukas-krecan Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...pport-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MsSqlServerConfig.java
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ public String nowExpression() {

static class MyMSSQLServerContainer extends MSSQLServerContainer<MyMSSQLServerContainer> {
MyMSSQLServerContainer() {
super("mcr.microsoft.com/mssql/server:2019-latest");
super("mcr.microsoft.com/mssql/server:2022-latest");
withLogConsumer(it -> LOGGER.info(it.getUtf8String()));
acceptLicense();
}
Expand Down
1 change: 1 addition & 0 deletions ...est-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MySqlConfig.java
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ public MySqlConfig() {
.withDatabaseName(TEST_SCHEMA_NAME)
.withUsername("SA")
.withPassword("pass")
.withCommand("--default-authentication-plugin=mysql_native_password")
);
}

Expand Down
2 changes: 1 addition & 1 deletion ...port-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/OracleServerConfig.java
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@

public final class OracleServerConfig extends AbstractContainerBasedDbConfig<OracleContainer> {
public OracleServerConfig() {
super(new OracleContainer("gvenzl/oracle-xe:18-slim"));
super(new OracleContainer("gvenzl/oracle-xe:21-slim"));
}

@Override
Expand Down
30 changes: 15 additions & 15 deletions providers/r2dbc/shedlock-provider-r2dbc/pom.xml
View file
Open in desktop
Expand Up @@ -12,6 +12,10 @@
<artifactId>shedlock-provider-r2dbc</artifactId>
<version>5.0.0-SNAPSHOT</version>

<properties>
<r2dbc.version>1.0.0.RELEASE</r2dbc.version>
</properties>

<dependencies>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
Expand All @@ -22,6 +26,7 @@
<dependency>
<groupId>io.r2dbc</groupId>
<artifactId>r2dbc-spi</artifactId>
<version>${r2dbc.version}</version>
</dependency>

<dependency>
Expand All @@ -41,25 +46,29 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>r2dbc-postgresql</artifactId>
<!-- Maintained in as pgjdbc project with own release cycle -->
<version>1.0.0.RELEASE</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.r2dbc</groupId>
<artifactId>r2dbc-mssql</artifactId>
<version>${r2dbc.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>dev.miku</groupId>
<artifactId>r2dbc-mysql</artifactId>
<version>0.8.2.RELEASE</version>
<groupId>com.github.jasync-sql</groupId>
<artifactId>jasync-r2dbc-mysql</artifactId>
<version>2.1.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.oracle.database.r2dbc</groupId>
<artifactId>oracle-r2dbc</artifactId>
<version>1.1.0</version>
<scope>test</scope>
</dependency>

Expand All @@ -73,18 +82,21 @@
<dependency>
<groupId>io.r2dbc</groupId>
<artifactId>r2dbc-h2</artifactId>
<version>${r2dbc.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mariadb</groupId>
<artifactId>r2dbc-mariadb</artifactId>
<version>1.1.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.r2dbc</groupId>
<artifactId>r2dbc-pool</artifactId>
<version>${r2dbc.version}</version>
<scope>test</scope>
</dependency>

Expand All @@ -96,18 +108,6 @@
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.r2dbc</groupId>
<artifactId>r2dbc-bom</artifactId>
<version>Borca-SR1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
Expand Down
2 changes: 2 additions & 0 deletions ...ock-provider-r2dbc/src/main/java/net/javacrumbs/shedlock/provider/r2dbc/R2dbcAdapter.java
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
abstract class R2dbcAdapter {
private static final String MSSQL_NAME = "Microsoft SQL Server";
private static final String MYSQL_NAME = "MySQL";
private static final String JASYNC_MYSQL_NAME = "Jasync-MySQL";
private static final String MARIA_NAME = "MariaDB";
private static final String ORACLE_NAME = "Oracle Database";

Expand All @@ -23,6 +24,7 @@ static R2dbcAdapter create(@NonNull String driver) {
R2dbcAdapter::bindByName
);
case MYSQL_NAME:
case JASYNC_MYSQL_NAME:
case MARIA_NAME:
return new DefaultR2dbcAdapter(
(index, name) -> "?",
Expand Down
2 changes: 2 additions & 0 deletions ...st/java/net/javacrumbs/shedlock/provider/r2dbc/MariaR2dbcLockProviderIntegrationTest.java
View file
Open in desktop
Expand Up @@ -17,7 +17,9 @@

import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
import net.javacrumbs.shedlock.test.support.jdbc.MariaDbConfig;
import org.junit.jupiter.api.Disabled;

@Disabled("No R2DBC 1.0.0 compatible driver")
public class MariaR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
private static final DbConfig dbConfig = new MariaDbConfig();

Expand Down
2 changes: 2 additions & 0 deletions ...st/java/net/javacrumbs/shedlock/provider/r2dbc/MsSqlR2dbcLockProviderIntegrationTest.java
View file
Open in desktop
Expand Up @@ -17,7 +17,9 @@

import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
import net.javacrumbs.shedlock.test.support.jdbc.MsSqlServerConfig;
import org.junit.jupiter.api.Disabled;

@Disabled
public class MsSqlR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
private static final DbConfig dbConfig = new MsSqlServerConfig();

Expand Down