From a98613b826cb2522886121ffee3a6fe8c308135d Mon Sep 17 00:00:00 2001 From: Julien Ruaux Date: Mon, 27 Jun 2022 11:57:25 -0700 Subject: [PATCH] build: Renamed subprojects folder to core --- build.gradle | 9 --------- .../redis-sidecar-jdbc/gradle.properties | 0 .../redis-sidecar-jdbc/redis-sidecar-jdbc.gradle | 12 +++++++++++- .../src/main/java/com/redis/sidecar/Driver.java | 0 .../redis/sidecar/core/AbstractResultSetCache.java | 0 .../redis/sidecar/core/ByteArrayResultSetCodec.java | 0 .../src/main/java/com/redis/sidecar/core/Config.java | 0 .../java/com/redis/sidecar/core/ConfigUpdater.java | 0 .../java/com/redis/sidecar/core/ResultSetCache.java | 0 .../com/redis/sidecar/core/StringResultSetCache.java | 0 .../src/main/java/com/redis/sidecar/jdbc/Clob.java | 0 .../src/main/java/com/redis/sidecar/jdbc/RowId.java | 0 .../redis/sidecar/jdbc/SidecarCallableStatement.java | 0 .../com/redis/sidecar/jdbc/SidecarConnection.java | 0 .../redis/sidecar/jdbc/SidecarPreparedStatement.java | 0 .../com/redis/sidecar/jdbc/SidecarStatement.java | 0 .../main/resources/META-INF/services/java.sql.Driver | 0 .../src/test/java/com/redis/sidecar/DriverTests.java | 0 .../com/redis/sidecar/core/AbstractSidecarTests.java | 0 .../test/java/com/redis/sidecar/core/CodecTests.java | 0 .../java/com/redis/sidecar/core/ConfigTests.java | 0 .../com/redis/sidecar/core/ConfigUpdaterTests.java | 0 .../java/com/redis/sidecar/core/ScriptRunner.java | 0 .../test/java/com/redis/sidecar/core/TestUtils.java | 0 .../test/java/com/redis/sidecar/jdbc/DB2Tests.java | 0 .../test/java/com/redis/sidecar/jdbc/MSSQLTests.java | 0 .../java/com/redis/sidecar/jdbc/MetricsTests.java | 0 .../test/java/com/redis/sidecar/jdbc/MySQLTests.java | 0 .../java/com/redis/sidecar/jdbc/OracleTests.java | 0 .../java/com/redis/sidecar/jdbc/PostgresTests.java | 0 .../src/test/resources/db2/create.sql | 0 .../src/test/resources/db2/data.sql | 0 .../src/test/resources/db2/drop.sql | 0 .../src/test/resources/mssql/create_tables.sql | 0 .../src/test/resources/mssql/populate_tables.sql | 0 .../src/test/resources/mysql/northwind.sql | 0 .../src/test/resources/oracle/employee.sql | 0 .../src/test/resources/oracle/hr.sql | 0 .../src/test/resources/postgres/employee.sql | 0 .../src/test/resources/postgres/northwind.sql | 0 settings.gradle | 8 ++++++-- 41 files changed, 17 insertions(+), 12 deletions(-) rename {subprojects => core}/redis-sidecar-jdbc/gradle.properties (100%) rename {subprojects => core}/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle (93%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/Driver.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/AbstractResultSetCache.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ByteArrayResultSetCodec.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/Config.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ConfigUpdater.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ResultSetCache.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/StringResultSetCache.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/Clob.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/RowId.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarCallableStatement.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarConnection.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarPreparedStatement.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarStatement.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/main/resources/META-INF/services/java.sql.Driver (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/DriverTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/AbstractSidecarTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/CodecTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigUpdaterTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ScriptRunner.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/TestUtils.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/DB2Tests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MSSQLTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MetricsTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MySQLTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/OracleTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/PostgresTests.java (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/db2/create.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/db2/data.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/db2/drop.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/mssql/create_tables.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/mssql/populate_tables.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/mysql/northwind.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/oracle/employee.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/oracle/hr.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/postgres/employee.sql (100%) rename {subprojects => core}/redis-sidecar-jdbc/src/test/resources/postgres/northwind.sql (100%) diff --git a/build.gradle b/build.gradle index bde65d9..31759af 100644 --- a/build.gradle +++ b/build.gradle @@ -75,15 +75,6 @@ subprojects { useJUnitPlatform() maxHeapSize = "1024m" } - - bootJar { - enabled = false - } - - jar { - enabled = true - archiveClassifier = '' - } sourceCompatibility = 8 targetCompatibility = 8 diff --git a/subprojects/redis-sidecar-jdbc/gradle.properties b/core/redis-sidecar-jdbc/gradle.properties similarity index 100% rename from subprojects/redis-sidecar-jdbc/gradle.properties rename to core/redis-sidecar-jdbc/gradle.properties diff --git a/subprojects/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle b/core/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle similarity index 93% rename from subprojects/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle rename to core/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle index b5768db..2ebc6ed 100644 --- a/subprojects/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle +++ b/core/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle @@ -22,8 +22,18 @@ dependencies { testImplementation 'com.zaxxer:HikariCP' } + +bootJar { + enabled = false +} + +jar { + enabled = true + archiveClassifier = '' +} + shadowJar { archiveClassifier.set('') } -jar.finalizedBy shadowJar \ No newline at end of file +jar.finalizedBy shadowJar diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/Driver.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/Driver.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/Driver.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/Driver.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/AbstractResultSetCache.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/AbstractResultSetCache.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/AbstractResultSetCache.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/AbstractResultSetCache.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ByteArrayResultSetCodec.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ByteArrayResultSetCodec.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ByteArrayResultSetCodec.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ByteArrayResultSetCodec.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/Config.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/Config.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/Config.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/Config.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ConfigUpdater.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ConfigUpdater.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ConfigUpdater.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ConfigUpdater.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ResultSetCache.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ResultSetCache.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ResultSetCache.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/ResultSetCache.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/StringResultSetCache.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/StringResultSetCache.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/StringResultSetCache.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/core/StringResultSetCache.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/Clob.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/Clob.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/Clob.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/Clob.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/RowId.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/RowId.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/RowId.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/RowId.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarCallableStatement.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarCallableStatement.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarCallableStatement.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarCallableStatement.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarConnection.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarConnection.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarConnection.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarConnection.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarPreparedStatement.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarPreparedStatement.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarPreparedStatement.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarPreparedStatement.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarStatement.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarStatement.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarStatement.java rename to core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/jdbc/SidecarStatement.java diff --git a/subprojects/redis-sidecar-jdbc/src/main/resources/META-INF/services/java.sql.Driver b/core/redis-sidecar-jdbc/src/main/resources/META-INF/services/java.sql.Driver similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/main/resources/META-INF/services/java.sql.Driver rename to core/redis-sidecar-jdbc/src/main/resources/META-INF/services/java.sql.Driver diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/DriverTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/DriverTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/DriverTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/DriverTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/AbstractSidecarTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/AbstractSidecarTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/AbstractSidecarTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/AbstractSidecarTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/CodecTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/CodecTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/CodecTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/CodecTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigUpdaterTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigUpdaterTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigUpdaterTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ConfigUpdaterTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ScriptRunner.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ScriptRunner.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ScriptRunner.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/ScriptRunner.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/TestUtils.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/TestUtils.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/TestUtils.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/core/TestUtils.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/DB2Tests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/DB2Tests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/DB2Tests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/DB2Tests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MSSQLTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MSSQLTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MSSQLTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MSSQLTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MetricsTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MetricsTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MetricsTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MetricsTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MySQLTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MySQLTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MySQLTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/MySQLTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/OracleTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/OracleTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/OracleTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/OracleTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/PostgresTests.java b/core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/PostgresTests.java similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/PostgresTests.java rename to core/redis-sidecar-jdbc/src/test/java/com/redis/sidecar/jdbc/PostgresTests.java diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/db2/create.sql b/core/redis-sidecar-jdbc/src/test/resources/db2/create.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/db2/create.sql rename to core/redis-sidecar-jdbc/src/test/resources/db2/create.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/db2/data.sql b/core/redis-sidecar-jdbc/src/test/resources/db2/data.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/db2/data.sql rename to core/redis-sidecar-jdbc/src/test/resources/db2/data.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/db2/drop.sql b/core/redis-sidecar-jdbc/src/test/resources/db2/drop.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/db2/drop.sql rename to core/redis-sidecar-jdbc/src/test/resources/db2/drop.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/mssql/create_tables.sql b/core/redis-sidecar-jdbc/src/test/resources/mssql/create_tables.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/mssql/create_tables.sql rename to core/redis-sidecar-jdbc/src/test/resources/mssql/create_tables.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/mssql/populate_tables.sql b/core/redis-sidecar-jdbc/src/test/resources/mssql/populate_tables.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/mssql/populate_tables.sql rename to core/redis-sidecar-jdbc/src/test/resources/mssql/populate_tables.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/mysql/northwind.sql b/core/redis-sidecar-jdbc/src/test/resources/mysql/northwind.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/mysql/northwind.sql rename to core/redis-sidecar-jdbc/src/test/resources/mysql/northwind.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/oracle/employee.sql b/core/redis-sidecar-jdbc/src/test/resources/oracle/employee.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/oracle/employee.sql rename to core/redis-sidecar-jdbc/src/test/resources/oracle/employee.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/oracle/hr.sql b/core/redis-sidecar-jdbc/src/test/resources/oracle/hr.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/oracle/hr.sql rename to core/redis-sidecar-jdbc/src/test/resources/oracle/hr.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/postgres/employee.sql b/core/redis-sidecar-jdbc/src/test/resources/postgres/employee.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/postgres/employee.sql rename to core/redis-sidecar-jdbc/src/test/resources/postgres/employee.sql diff --git a/subprojects/redis-sidecar-jdbc/src/test/resources/postgres/northwind.sql b/core/redis-sidecar-jdbc/src/test/resources/postgres/northwind.sql similarity index 100% rename from subprojects/redis-sidecar-jdbc/src/test/resources/postgres/northwind.sql rename to core/redis-sidecar-jdbc/src/test/resources/postgres/northwind.sql diff --git a/settings.gradle b/settings.gradle index 2ebd742..93de790 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,7 +18,7 @@ apply plugin: 'org.kordamp.gradle.kordamp-parentbuild' rootProject.name = 'redis-sidecar' projects { - directories = ['subprojects'] + directories = ['core', 'demos'] plugins { all { @@ -27,13 +27,17 @@ projects { path(':') { id 'org.kordamp.gradle.java-project' } - dirs(['subprojects']) { + dirs(['core']) { id 'java-library' id 'java-library-distribution' id 'org.springframework.boot' id 'io.spring.dependency-management' id 'com.github.johnrengelman.shadow' } + dirs(['demos']) { + id 'org.springframework.boot' + id 'io.spring.dependency-management' + } } }