use paltform-layout per review comments

Author: myronkscott

.github/workflows/it-dynamic-config.yml

@@ -69,6 +69,9 @@ jobs:
           path: |
             **/build/reports/
             **/build/test-results/
+            **/build/angela/
+            **/build/test-data/
+            
 
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4

gradle.properties

@@ -4,7 +4,7 @@ defaultVersion = 5.11-SNAPSHOT
 # Terracotta libs
 terracottaAngelaVersion = 3.3.40
 terracottaApisVersion = 5.12.0
-terracottaRuntimeVersion = 5.12.2
+terracottaRuntimeVersion = 5.12.3
 terracottaConfigVersion=10.7.5
 terracottaStatisticVersion = 2.1.3
 terracottaUtilitiesTestToolsVersion = 0.0.19
@@ -15,7 +15,7 @@ gsonVersion = 2.11.0
 hamcrestVersion = 2.2
 jcommanderVersion = 1.78
 junitVersion = 4.13.1
-logbackVersion = 1.2.11
+logbackVersion = 1.2.13
 mockitoVersion = 2.23.4
 slf4jVersion = 1.7.36
 

management/testing/entity/build.gradle

@@ -5,7 +5,9 @@ plugins {
 
 dependencies {
   service project(':dynamic-config:api')
-  service project(':management:server:api')
+  service (project(':management:server:api')) {
+    exclude group: 'org.slf4j'
+  }
   service project(':resources:offheap')
   implementation project(':voltron-proxy:server')
 

management/testing/integration-tests/build.gradle

@@ -19,30 +19,12 @@ dependencies {
   testImplementation "org.terracotta.internal:client-runtime:$terracottaRuntimeVersion"
   testCompileOnly "org.terracotta:client-api:$terracottaApisVersion"
   testImplementation project(':dynamic-config:testing:galvan')
-  testImplementation "org.terracotta:server-api:$terracottaApisVersion"
   testImplementation project(":lease:client")
 
-  pluginsApi project(':dynamic-config:api')
-  pluginsApi project(':management:server:api')
-  pluginsApi project(':resources:offheap')
-  pluginsApi project(':dynamic-config:server:api')
-  pluginsApi project(':diagnostic:server:api')
-  pluginsApi project(':management:server:api')
-  pluginsApi project(':common:json')
-
-  pluginsImpl project(':dynamic-config:entities:management:server')
-  pluginsImpl project(':dynamic-config:entities:nomad:server')
-  pluginsImpl project(':dynamic-config:entities:topology:server')
-  pluginsImpl project(':dynamic-config:server:config-provider')
-  pluginsImpl project(':dynamic-config:server:services')
-  pluginsImpl project(':management:testing:entity')
-  pluginsImpl project(':management:entities:nms:server')
-  pluginsImpl project(':management:entities:nms-agent:server')
-  pluginsImpl project(':management:server:services')
-  pluginsImpl project(':lease:server')
-  pluginsImpl project(':client-message-tracker')
-  pluginsImpl project(':diagnostic:server:services')
-  pluginsImpl project(':platform-base')
+  pluginsImpl (project(':management:testing:entity')) {
+    exclude group: 'org.slf4j'
+  }
+
 }
 
 sourceSets {
@@ -53,6 +35,10 @@ sourceSets {
   }
 }
 
+var explodedPath = project(":platform-layout").layout.buildDirectory.dir("exploded-kit/server/plugins").get().toString()
+
+println "Testing path " + explodedPath
+
 test {
   jvmArgs "-XX:MaxDirectMemorySize=2048m"
     systemProperty "galvan.plugin", layout.buildDirectory.dir("plugin").get().toString()
@@ -83,7 +69,21 @@ task galvanTestClean(type: Delete) {
     delete layout.buildDirectory.dir("galvan")
 }
 
+task copyBaseKit() {
+    doLast {
+        project.sync {
+            from project(":platform-layout").layout.buildDirectory.dir("exploded-kit/server/plugins/api")
+            into layout.buildDirectory.dir("plugin/api")
+        }
+        project.sync {
+            from project(":platform-layout").layout.buildDirectory.dir("exploded-kit/server/plugins/lib")
+            into layout.buildDirectory.dir("plugin/lib")
+        }
+    }
+}
+
+test.dependsOn(project(":platform-layout").getTasksByName("explodedKit", true))
 test.dependsOn(copyPluginsImpl)
 copyPluginsImpl.dependsOn(copyPluginsApi)
-copyPluginsApi.dependsOn(serverClean)
-serverClean.dependsOn(pluginClean)
+copyPluginsApi.dependsOn(copyBaseKit)
+copyBaseKit.dependsOn(serverClean)

resources/data-root/build.gradle

@@ -14,7 +14,9 @@ sourceSets {
 dependencies {
   service project(':dynamic-config:server:api')
   service project(':management:server:api')
-  service "org.terracotta:statistics:$terracottaStatisticVersion"
+  service ("org.terracotta:statistics:$terracottaStatisticVersion") {
+    exclude group:'org.slf4j'
+  }
 
   implementation "org.terracotta:terracotta-utilities-tools:$terracottaUtilitiesToolsVersion"
 

voter/build.gradle

@@ -11,7 +11,6 @@ dependencies {
   implementation project(':dynamic-config:cli:jcommander')
   implementation "org.terracotta.internal:client-runtime:$terracottaRuntimeVersion"
   implementation "ch.qos.logback:logback-classic:$logbackVersion"
-  testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
   testImplementation "org.terracotta:terracotta-utilities-test-tools:$terracottaUtilitiesTestToolsVersion"
 }