Allow TeamCity to disable embedded tomcat (#695)

* Add ${CSP.REPORT.PARAMS} to sample CSP report-uri directives
* gitignore 'external' directory that might get generated

.gitignore

@@ -9,9 +9,10 @@ enlistment.properties
 server/config.properties
 #IntelliJ build output directory
 server/bootstrap/out/
+dist/
+external/
 
 # Ignore other common repository locations
-dist/
 distributions/
 labkey-api-*/
 labkey-ui-components/

gradle.properties

@@ -62,7 +62,7 @@ windowsProteomicsBinariesVersion=1.0
 # The current version numbers for the gradle plugins.
 artifactoryPluginVersion=4.31.9
 gradleNodePluginVersion=3.5.1
-gradlePluginsVersion=2.2.1
+gradlePluginsVersion=2.2.2
 owaspDependencyCheckPluginVersion=8.4.3
 versioningPluginVersion=1.1.2
 

server/configs/application.properties

@@ -136,7 +136,7 @@ spring.main.banner-mode=off
 #    base-uri 'self' ;\
 #    upgrade-insecure-requests ;\
 #    frame-ancestors 'self' ;\
-#    report-uri https://www.labkey.org/admin-contentsecuritypolicyreport.api ;
+#    report-uri https://www.labkey.org/admin-contentsecuritypolicyreport.api?${CSP.REPORT.PARAMS} ;
 
 # example usage 2 - less strict but enforces directives, (NOTE: unsafe-inline is still required for many modules)
 
@@ -151,7 +151,7 @@ spring.main.banner-mode=off
 #    base-uri 'self' ;\
 #    upgrade-insecure-requests ;\
 #    frame-ancestors 'self' ;\
-#    report-uri  https://www.labkey.org/admin-contentsecuritypolicyreport.api ;
+#    report-uri  https://www.labkey.org/admin-contentsecuritypolicyreport.api?${CSP.REPORT.PARAMS} ;
 
 # Default CSP for TeamCity and dev deployments
 #setupTask#csp.report=\
@@ -164,7 +164,7 @@ spring.main.banner-mode=off
 #setupTask#    script-src 'unsafe-eval' 'strict-dynamic' 'nonce-${REQUEST.SCRIPT.NONCE}' ;\
 #setupTask#    base-uri 'self' ;\
 #setupTask#    frame-ancestors 'self' ;\
-#setupTask#    report-uri /admin-contentsecuritypolicyreport.api ;
+#setupTask#    report-uri /admin-contentsecuritypolicyreport.api?${CSP.REPORT.PARAMS} ;
 
 # Use a non-temp directory for tomcat
 #setupTask#server.tomcat.basedir=@@pathToServer@@/build/deploy/embedded

settings.gradle

@@ -96,7 +96,7 @@ import org.labkey.gradle.util.BuildUtils
   node in the tree with these leaves (e.g., 'server:modules:core' will create projects for ":server"
   ":server:modules" and ":server:modules:core").
  */
-if (hasProperty("useEmbeddedTomcat"))
+if (BuildUtils.useEmbeddedTomcat(this.settings))
 {
     include ":server:embedded"
 }