Merge 21.6.0 to develop

Author: labkey-tchad

build.gradle

@@ -305,22 +305,6 @@ subprojects {
             description: "Displays the dependencies for all projects")
 }
 
-// We copy the resource files to a separate directory so they can be copied to jsptmp directory
-// for use in compiling JSPs.  Copying directly from the project.sourceSets.webapp.output for the JSP
-// task for api does not work when modules may be evaluated before the api module is evaluated.  Attempts to
-// declare evaluationDependsOn(:server:api) for each of these projects did not work.
-// This task is defined at the root to eliminate problems with evaluation order
-project.task("copyTagLibsBase",
-        type: Copy,
-        {CopySpec copy ->
-            copy.from "${BuildUtils.getApiProjectPath(gradle).replace(":", "/").substring(1)}/webapp"
-            copy.into "${project.buildDir}/webapp"
-            copy.include 'WEB-INF/web.xml'
-            copy.include 'WEB-INF/*.tld'
-            copy.include 'WEB-INF/*.jspf'
-        }
-)
-
 project.task("showDiscrepancies",
         group: "Help",
         type: ShowDiscrepancies,