FINERACT-1480: Fix Swagger UI broken by incremental build

fineract-provider/build.gradle

@@ -247,6 +247,8 @@ bootRun {
     dependencies {
         implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.3'
     }
+
+    classpath += files("build/generated/swagger-ui")
 }
 
 springBoot {
@@ -266,6 +268,14 @@ bootJar {
     }
 }
 
+jar {
+    from('build/generated/swagger-ui') {
+        include '*'
+    }
+}
+
+jar.dependsOn resolve
+
 jib {
     from {
         image = 'azul/zulu-openjdk-alpine:17'

fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebFrontEndConfiguration.java

@@ -46,7 +46,8 @@ public class WebFrontEndConfiguration implements WebMvcConfigurer {
         LOG.info("Found Swagger UI at {}", fullPathToSwaggerUiJs);
         String fullPathToSwaggerUi = fullPathToSwaggerUiJs.substring(0, fullPathToSwaggerUiJs.lastIndexOf("/") + 1);
 
-        final String[] swaggerResourceLocations = { "classpath:/static/swagger-ui/", "classpath:" + fullPathToSwaggerUi };
+        final String[] swaggerResourceLocations = { "classpath:/static/swagger-ui/", "classpath:fineract.yaml",
+                "classpath:" + fullPathToSwaggerUi };
 
         registry.addResourceHandler("/swagger-ui/**").addResourceLocations(swaggerResourceLocations);
     }

fineract-war/build.gradle

@@ -43,10 +43,6 @@ war {
     }
     enabled = true
     classifier = ''
-
-    from('$rootDir/fineract-provider/build/generated/swagger-ui') {
-        into 'BOOT-INF/classes/static/swagger-ui'
-    }
 }
 
 dependencies {

integration-tests/src/test/java/org/apache/fineract/integrationtests/SwaggeruiTest.java

@@ -46,6 +46,7 @@ public class SwaggeruiTest {
     public void testSwaggeruiAccess() {
         Utils.performServerGet(requestSpec, responseSpec, "/fineract-provider/swagger-ui", null);
         Utils.performServerGet(requestSpec, responseSpec, "/fineract-provider/swagger-ui/index.html", null);
+        Utils.performServerGet(requestSpec, responseSpec, "/fineract-provider/swagger-ui/fineract.yaml", null);
     }
 
 }