feature: move apitest gradle dependencies into build.gradle

Reorder log fields to put message as the second column where we can easily see it

Author: coling01

build.gradle

@@ -25,15 +25,8 @@ apply {
   from("$rootDir/gradle/api-test.gradle")
 }
 
-springBoot {
-  buildInfo {
-    properties {
-      name = project.name
-      version = project.version.toString()
-    }
-  }
-}
-
+// We MUST keep all dependencies in the build.gradle to allow dependabot to provide version updates
+// Sadly, dependabot does not track dependencies in the apply-from files
 dependencies {
   // Api spec
   implementation("uk.gov.hmcts.cp:api-hmcts-crime-template:2.0.2")
@@ -86,4 +79,16 @@ dependencies {
 
   // Jwt token
   implementation 'io.jsonwebtoken:jjwt:0.13.0'
+
+
+  // Api Test
+  apiTestImplementation platform('org.junit:junit-bom:5.13.4')
+  apiTestRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+  apiTestImplementation('org.springframework.boot:spring-boot-starter-test') {
+    exclude group: 'junit', module: 'junit'
+    exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+  }
+  apiTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+  apiTestCompileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.38'
+  apiTestAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.38'
 }

gradle/api-test.gradle

@@ -49,19 +49,6 @@ configurations {
   }
 }
 
-dependencies {
-  apiTestImplementation platform('org.junit:junit-bom:5.13.4')
-  apiTestRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-
-  apiTestImplementation('org.springframework.boot:spring-boot-starter-test') {
-    exclude group: 'junit', module: 'junit'
-    exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
-  }
-  apiTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-  apiTestCompileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.38'
-  apiTestAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.38'
-}
-
 dockerCompose {
   useComposeFiles = ['docker-compose.yml']
   startedServices = ['app', 'db']

gradle/java.gradle

@@ -14,4 +14,13 @@ tasks.withType(JavaExec).configureEach {
 
 tasks.named('wrapper') {
   delete "${projectDir}/gradlew.bat"
+}
+
+springBoot {
+  buildInfo {
+    properties {
+      name = project.name
+      version = project.version.toString()
+    }
+  }
 }

gradle/spring-db.gradle

@@ -2,17 +2,18 @@
     <appender name="JSON" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
             <providers>
-                <mdc/>
                 <timestamp>
                     <fieldName>timestamp</fieldName>
                     <pattern>yyyy-MM-dd' 'HH:mm:ss.SSS</pattern>
                 </timestamp>
-                <loggerName/>
-                <threadName/>
-                <logLevel/>
+                <!-- Lets keep the message to the left so its easier to find without scrolling -->
                 <pattern>
                     <pattern>{"message": "%message%n%xException{full}"}</pattern>
                 </pattern>
+                <mdc/>
+                <loggerName/>
+                <threadName/>
+                <logLevel/>
             </providers>
         </encoder>
     </appender>