Merge branch 'feature/shibui-2393' of bitbucket.org:unicon/shib-idp-u…

…i into feature/shibui-2393
TIER · Dec 1, 2022 · 893f006 · 893f006
2 parents 5a7733d + e9ea0af
commit 893f006
Show file tree

Hide file tree

Showing 5 changed files with 473 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -420,3 +420,4 @@ beacon/spring/out
 /testbed/authentication/shibui/saml-signing-cert.pem
 /testbed/authentication/shibui/samlKeystore.jks
 /testbed/authentication/shibui/sp-metadata.xml
+/backend/src/main/resources/application.yml
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -91,6 +91,20 @@ processResources.dependsOn(':ui:npm_run_buildProd')
 
 jar {
     enabled = true
+    dependsOn 'copyApplicationYAML'
+}
+
+task copyApplicationYAML(type: Copy) {
+    if ( "${project.'use.release.app.yml'}".toBoolean() ) {
+        from 'src/main/app-resources/release.yml'
+        into 'src/main/resources'
+        rename { 'application.yml' }
+    }
+    else {
+        from 'src/main/app-resources/default.yml'
+        into 'src/main/resources'
+        rename { 'application.yml' }
+    }
 }
 
 //Integration of the frontend and backend into the build to have all of the UI resources available in the app's executable war

diff --git a/backend/src/main/resources/application.yml → backend/src/main/app-resources/default.yml b/backend/src/main/resources/application.yml → backend/src/main/app-resources/default.yml