Skip to content

Commit f297420

Browse files
committed
fixed call order in prepareInplaceWebAppFolder
1 parent 8f47949 commit f297420

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

libs/gretty/src/main/groovy/org/akhikhl/gretty/GrettyPlugin.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,16 @@ class GrettyPlugin implements Plugin<Project> {
203203

204204
onlyIf { getInplaceMode() != 'hard' }
205205

206-
from ProjectUtils.getWebAppDir(project)
206+
// Attention: call order is important here! Overlay files must be copied prior to this web-app files.
207207

208208
for (String overlay in project.gretty.overlays) {
209209
Project overlayProject = project.project(overlay)
210210
dependsOn { overlayProject.tasks.findByName('prepareInplaceWebAppFolder') }
211211
from "${overlayProject.buildDir}/inplaceWebapp"
212212
}
213213

214+
from ProjectUtils.getWebAppDir(project)
215+
214216
def closure = project.gretty.webappCopy
215217
closure = closure.rehydrate(it, closure.owner, closure.thisObject)
216218
closure()

0 commit comments

Comments
 (0)