build: Renamed subprojects folder to core

redis-field-engineering · Jun 27, 2022 · a98613b · a98613b
1 parent d7bccfd
commit a98613b
Show file tree

Hide file tree

Showing 41 changed files with 17 additions and 12 deletions.
diff --git 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/...ects/redis-sidecar-jdbc/gradle.properties → core/redis-sidecar-jdbc/gradle.properties b/...ects/redis-sidecar-jdbc/gradle.properties → core/redis-sidecar-jdbc/gradle.properties
diff --git a/...is-sidecar-jdbc/redis-sidecar-jdbc.gradle → ...is-sidecar-jdbc/redis-sidecar-jdbc.gradle b/...is-sidecar-jdbc/redis-sidecar-jdbc.gradle → ...is-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
+jar.finalizedBy shadowJar
diff --git a/...c/main/java/com/redis/sidecar/Driver.java → ...c/main/java/com/redis/sidecar/Driver.java b/...c/main/java/com/redis/sidecar/Driver.java → ...c/main/java/com/redis/sidecar/Driver.java
diff --git a/.../sidecar/core/AbstractResultSetCache.java → .../sidecar/core/AbstractResultSetCache.java b/.../sidecar/core/AbstractResultSetCache.java → .../sidecar/core/AbstractResultSetCache.java
diff --git a/...sidecar/core/ByteArrayResultSetCodec.java → ...sidecar/core/ByteArrayResultSetCodec.java b/...sidecar/core/ByteArrayResultSetCodec.java → ...sidecar/core/ByteArrayResultSetCodec.java
diff --git a/...n/java/com/redis/sidecar/core/Config.java → ...n/java/com/redis/sidecar/core/Config.java b/...n/java/com/redis/sidecar/core/Config.java → ...n/java/com/redis/sidecar/core/Config.java
diff --git a/...com/redis/sidecar/core/ConfigUpdater.java → ...com/redis/sidecar/core/ConfigUpdater.java b/...com/redis/sidecar/core/ConfigUpdater.java → ...com/redis/sidecar/core/ConfigUpdater.java
diff --git a/...om/redis/sidecar/core/ResultSetCache.java → ...om/redis/sidecar/core/ResultSetCache.java b/...om/redis/sidecar/core/ResultSetCache.java → ...om/redis/sidecar/core/ResultSetCache.java
diff --git a/...is/sidecar/core/StringResultSetCache.java → ...is/sidecar/core/StringResultSetCache.java b/...is/sidecar/core/StringResultSetCache.java → ...is/sidecar/core/StringResultSetCache.java
diff --git a/...ain/java/com/redis/sidecar/jdbc/Clob.java → ...ain/java/com/redis/sidecar/jdbc/Clob.java b/...ain/java/com/redis/sidecar/jdbc/Clob.java → ...ain/java/com/redis/sidecar/jdbc/Clob.java
diff --git a/...in/java/com/redis/sidecar/jdbc/RowId.java → ...in/java/com/redis/sidecar/jdbc/RowId.java b/...in/java/com/redis/sidecar/jdbc/RowId.java → ...in/java/com/redis/sidecar/jdbc/RowId.java
diff --git a/...idecar/jdbc/SidecarCallableStatement.java → ...idecar/jdbc/SidecarCallableStatement.java b/...idecar/jdbc/SidecarCallableStatement.java → ...idecar/jdbc/SidecarCallableStatement.java
diff --git a/...redis/sidecar/jdbc/SidecarConnection.java → ...redis/sidecar/jdbc/SidecarConnection.java b/...redis/sidecar/jdbc/SidecarConnection.java → ...redis/sidecar/jdbc/SidecarConnection.java
diff --git a/...idecar/jdbc/SidecarPreparedStatement.java → ...idecar/jdbc/SidecarPreparedStatement.java b/...idecar/jdbc/SidecarPreparedStatement.java → ...idecar/jdbc/SidecarPreparedStatement.java
diff --git a/.../redis/sidecar/jdbc/SidecarStatement.java → .../redis/sidecar/jdbc/SidecarStatement.java b/.../redis/sidecar/jdbc/SidecarStatement.java → .../redis/sidecar/jdbc/SidecarStatement.java
diff --git a/...sources/META-INF/services/java.sql.Driver → ...sources/META-INF/services/java.sql.Driver b/...sources/META-INF/services/java.sql.Driver → ...sources/META-INF/services/java.sql.Driver
diff --git a/...t/java/com/redis/sidecar/DriverTests.java → ...t/java/com/redis/sidecar/DriverTests.java b/...t/java/com/redis/sidecar/DriverTests.java → ...t/java/com/redis/sidecar/DriverTests.java
diff --git a/...is/sidecar/core/AbstractSidecarTests.java → ...is/sidecar/core/AbstractSidecarTests.java b/...is/sidecar/core/AbstractSidecarTests.java → ...is/sidecar/core/AbstractSidecarTests.java
diff --git a/...va/com/redis/sidecar/core/CodecTests.java → ...va/com/redis/sidecar/core/CodecTests.java b/...va/com/redis/sidecar/core/CodecTests.java → ...va/com/redis/sidecar/core/CodecTests.java
diff --git a/...a/com/redis/sidecar/core/ConfigTests.java → ...a/com/redis/sidecar/core/ConfigTests.java b/...a/com/redis/sidecar/core/ConfigTests.java → ...a/com/redis/sidecar/core/ConfigTests.java
diff --git a/...edis/sidecar/core/ConfigUpdaterTests.java → ...edis/sidecar/core/ConfigUpdaterTests.java b/...edis/sidecar/core/ConfigUpdaterTests.java → ...edis/sidecar/core/ConfigUpdaterTests.java
diff --git a/.../com/redis/sidecar/core/ScriptRunner.java → .../com/redis/sidecar/core/ScriptRunner.java b/.../com/redis/sidecar/core/ScriptRunner.java → .../com/redis/sidecar/core/ScriptRunner.java
diff --git a/...ava/com/redis/sidecar/core/TestUtils.java → ...ava/com/redis/sidecar/core/TestUtils.java b/...ava/com/redis/sidecar/core/TestUtils.java → ...ava/com/redis/sidecar/core/TestUtils.java
diff --git a/...java/com/redis/sidecar/jdbc/DB2Tests.java → ...java/com/redis/sidecar/jdbc/DB2Tests.java b/...java/com/redis/sidecar/jdbc/DB2Tests.java → ...java/com/redis/sidecar/jdbc/DB2Tests.java
diff --git a/...va/com/redis/sidecar/jdbc/MSSQLTests.java → ...va/com/redis/sidecar/jdbc/MSSQLTests.java b/...va/com/redis/sidecar/jdbc/MSSQLTests.java → ...va/com/redis/sidecar/jdbc/MSSQLTests.java
diff --git a/.../com/redis/sidecar/jdbc/MetricsTests.java → .../com/redis/sidecar/jdbc/MetricsTests.java b/.../com/redis/sidecar/jdbc/MetricsTests.java → .../com/redis/sidecar/jdbc/MetricsTests.java
diff --git a/...va/com/redis/sidecar/jdbc/MySQLTests.java → ...va/com/redis/sidecar/jdbc/MySQLTests.java b/...va/com/redis/sidecar/jdbc/MySQLTests.java → ...va/com/redis/sidecar/jdbc/MySQLTests.java
diff --git a/...a/com/redis/sidecar/jdbc/OracleTests.java → ...a/com/redis/sidecar/jdbc/OracleTests.java b/...a/com/redis/sidecar/jdbc/OracleTests.java → ...a/com/redis/sidecar/jdbc/OracleTests.java
diff --git a/...com/redis/sidecar/jdbc/PostgresTests.java → ...com/redis/sidecar/jdbc/PostgresTests.java b/...com/redis/sidecar/jdbc/PostgresTests.java → ...com/redis/sidecar/jdbc/PostgresTests.java
diff --git a/...ar-jdbc/src/test/resources/db2/create.sql → ...ar-jdbc/src/test/resources/db2/create.sql b/...ar-jdbc/src/test/resources/db2/create.sql → ...ar-jdbc/src/test/resources/db2/create.sql
diff --git a/...ecar-jdbc/src/test/resources/db2/data.sql → ...ecar-jdbc/src/test/resources/db2/data.sql b/...ecar-jdbc/src/test/resources/db2/data.sql → ...ecar-jdbc/src/test/resources/db2/data.sql
diff --git a/...ecar-jdbc/src/test/resources/db2/drop.sql → ...ecar-jdbc/src/test/resources/db2/drop.sql b/...ecar-jdbc/src/test/resources/db2/drop.sql → ...ecar-jdbc/src/test/resources/db2/drop.sql
diff --git a/...rc/test/resources/mssql/create_tables.sql → ...rc/test/resources/mssql/create_tables.sql b/...rc/test/resources/mssql/create_tables.sql → ...rc/test/resources/mssql/create_tables.sql
diff --git a/.../test/resources/mssql/populate_tables.sql → .../test/resources/mssql/populate_tables.sql b/.../test/resources/mssql/populate_tables.sql → .../test/resources/mssql/populate_tables.sql
diff --git a/...bc/src/test/resources/mysql/northwind.sql → ...bc/src/test/resources/mysql/northwind.sql b/...bc/src/test/resources/mysql/northwind.sql → ...bc/src/test/resources/mysql/northwind.sql
diff --git a/...bc/src/test/resources/oracle/employee.sql → ...bc/src/test/resources/oracle/employee.sql b/...bc/src/test/resources/oracle/employee.sql → ...bc/src/test/resources/oracle/employee.sql
diff --git a/...car-jdbc/src/test/resources/oracle/hr.sql → ...car-jdbc/src/test/resources/oracle/hr.sql b/...car-jdbc/src/test/resources/oracle/hr.sql → ...car-jdbc/src/test/resources/oracle/hr.sql
diff --git a/.../src/test/resources/postgres/employee.sql → .../src/test/resources/postgres/employee.sql b/.../src/test/resources/postgres/employee.sql → .../src/test/resources/postgres/employee.sql
diff --git a/...src/test/resources/postgres/northwind.sql → ...src/test/resources/postgres/northwind.sql b/...src/test/resources/postgres/northwind.sql → ...src/test/resources/postgres/northwind.sql
diff --git 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'
+        }
     }
 }