Merge branch 'release/1.2.1'

yasuflatland-lf · Feb 15, 2021 · 5a62859 · 5a62859
2 parents 192ad12 + 35df1f6
commit 5a62859
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/latest/damascus.jar b/latest/damascus.jar
diff --git a/src/main/java/com/liferay/damascus/cli/Damascus.java b/src/main/java/com/liferay/damascus/cli/Damascus.java
@@ -18,7 +18,7 @@
 @Slf4j
 public class Damascus {
 
-    public final static String VERSION = "1.2.0"; // + "_" + LocalDateTime.now().toString();
+    public final static String VERSION = "1.2.1";// + "_" + LocalDateTime.now().toString();
 
     /**
      * Main

diff --git a/src/main/resources/templates/7.0/valuables.ftl b/src/main/resources/templates/7.0/valuables.ftl
@@ -6,9 +6,9 @@
 
 <#assign camelcaseProjectName = "${damascus.projectName?replace(\"-\", \"\")}">
 <#assign dashcaseProjectName = "${caseUtil.camelCaseToDashCase(camelcaseProjectName)}">
-<#assign apiModulePath = "${createPath_val}/${dashcaseProjectName}-api">
-<#assign serviceModulePath = "${createPath_val}/${dashcaseProjectName}-service">
-<#assign webModulePath = "${createPath_val}/${dashcaseProjectName}-web">
+<#assign apiModulePath = "${dashcaseProjectName}-api">
+<#assign serviceModulePath = "${dashcaseProjectName}-service">
+<#assign webModulePath = "${dashcaseProjectName}-web">
 
 <#if application?exists>
 <#assign capFirstModel = "${application.model?cap_first}">

diff --git a/src/main/resources/templates/7.1/valuables.ftl b/src/main/resources/templates/7.1/valuables.ftl
@@ -7,9 +7,9 @@
 
 <#assign camelcaseProjectName = "${damascus.projectName?replace(\"-\", \"\")}">
 <#assign dashcaseProjectName = "${caseUtil.camelCaseToDashCase(camelcaseProjectName)}">
-<#assign apiModulePath = "${createPath_val}/${dashcaseProjectName}-api">
-<#assign serviceModulePath = "${createPath_val}/${dashcaseProjectName}-service">
-<#assign webModulePath = "${createPath_val}/${dashcaseProjectName}-web">
+<#assign apiModulePath = "${dashcaseProjectName}-api">
+<#assign serviceModulePath = "${dashcaseProjectName}-service">
+<#assign webModulePath = "${dashcaseProjectName}-web">
 
 <#if application?exists>
 <#assign capFirstModel = "${application.model?cap_first}">

diff --git a/src/main/resources/templates/7.2/valuables.ftl b/src/main/resources/templates/7.2/valuables.ftl
@@ -7,10 +7,9 @@
 
 <#assign camelcaseProjectName = "${damascus.projectName?replace(\"-\", \"\")}">
 <#assign dashcaseProjectName = "${caseUtil.camelCaseToDashCase(camelcaseProjectName)}">
-<#assign projectPath = "${createPath_val}/${dashcaseProjectName}">
-<#assign apiModulePath = "${projectPath}/${dashcaseProjectName}-api">
-<#assign serviceModulePath = "${projectPath}/${dashcaseProjectName}-service">
-<#assign webModulePath = "${projectPath}/${dashcaseProjectName}-web">
+<#assign apiModulePath = "${dashcaseProjectName}-api">
+<#assign serviceModulePath = "${dashcaseProjectName}-service">
+<#assign webModulePath = "${dashcaseProjectName}-web">
 
 <#if application?exists>
 <#assign capFirstModel = "${application.model?cap_first}">