From c37cd653aa60d2ec5e289572b9f6ff751d891217 Mon Sep 17 00:00:00 2001 From: Dean Hiller Date: Sun, 22 Jul 2018 06:58:32 -0600 Subject: [PATCH] tweaks --- release.sh | 16 ++++++++++------ .../templating/impl/tags/TemplateLoaderTag.java | 3 +-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/release.sh b/release.sh index 01a5556c3..a7aa5d988 100755 --- a/release.sh +++ b/release.sh @@ -20,6 +20,16 @@ else exit $test_result fi +echo "##################################" +echo "next copy over legacy project to upgrade it(auto-upgrade)" +echo "##################################" + +cp -r webserver/output/webpiecesexample-all/* ../webpiecesexample-all + +echo "##################################" +echo "next release to maven repositories" +echo "##################################" + #MUST turn parallel builds off for release or it fails!!! #We skip tests since those are done in runAllTesting.sh AND that script ALSO test legacy compatibility and building a fake project from the new release AND starting the server ./gradlew --stacktrace -Dorg.gradle.parallel=false -Dorg.gradle.configureondemand=false -PprojVersion=$@ clean release -x test @@ -38,12 +48,6 @@ fi git tag v1.9.$@ -echo "##################################" -echo "DONE tagging, next copy over legacy project to upgrade it(auto-upgrade)" -echo "##################################" - -cp -r webserver/output/webpiecesexample-all/* ../webpiecesexample-all - end=`date +%s` runtime=$((end-start)) echo "###################################" diff --git a/webserver/http-templating/src/main/java/org/webpieces/templating/impl/tags/TemplateLoaderTag.java b/webserver/http-templating/src/main/java/org/webpieces/templating/impl/tags/TemplateLoaderTag.java index f748d19fb..a7a6854c8 100644 --- a/webserver/http-templating/src/main/java/org/webpieces/templating/impl/tags/TemplateLoaderTag.java +++ b/webserver/http-templating/src/main/java/org/webpieces/templating/impl/tags/TemplateLoaderTag.java @@ -42,13 +42,12 @@ protected String getFilePath(GroovyTemplateSuperclass callingTemplate, Map HtmlTagLookup -> HtmlFileTag -> TemplateService * - * @param svc */ public void initialize(TemplateService svc) { this.svc = svc;