Merge branch 'release/1.2.0'

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  gradle:
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest]
+        java: [1.8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: check
+      - name: Generate Coveralls Test Report
+        run: ./gradlew jacocoTestReport coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{secrets.COVERALLS_REPO_TOKEN}}
+          CI_NAME: Github Actions
+          CI_BRANCH: ${{github.ref}}
+          CI_PULL_REQUEST: ${{github.event.pull_request.html_url}}
+
+

README.md

@@ -1,11 +1,9 @@
 # Damascus
-
-[![Build Status](https://travis-ci.org/yasuflatland-lf/damascus.svg?branch=master)](https://travis-ci.org/yasuflatland-lf/damascus)
+![CI](https://github.com/yasuflatland-lf/damascus/workflows/CI/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/yasuflatland-lf/damascus/badge.svg?branch=master)](https://coveralls.io/github/yasuflatland-lf/damascus?branch=master)
-[![Build status](https://ci.appveyor.com/api/projects/status/qqpdw6drt8w07ljp?svg=true)](https://ci.appveyor.com/project/yasuflatland-lf/damascus)
 [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/liferay-damascus/community)
 
-Damascus is a Liferay Blade tool extension for generating scaffoldings of Service builder portlet with CRUD functionality based on a configuration json file, base.json. For more detailed usage, please see [this official document](https://yasuflatland-lf.github.io/damascus-doc/)
+Damascus is a Liferay Blade tool extension for generating scaffolding of Service builder portlet with CRUD functionality based on a configuration json file, base.json. For more detailed usage, please see [this official document](https://yasuflatland-lf.github.io/damascus-doc/)
 
 The list of what Damascus automatically generate is as follows
 * CRUD functionality with a model
@@ -25,12 +23,12 @@ The list of what Damascus automatically generate is as follows
 * Template generation
 
 ### Required environment
-* Liferay 7.3 CE GA2 and higher.
-* Liferay 7.2 CE GA1 and higher.
-* Liferay 7.1 CE GA1 and higher.
-* Liferay 7.0 CE GA7 and Liferay DXP SP11 or higher versions.
-* Java 1.8 or above
-* gradle 5.4.6 or above need to be installed
+* Liferay 7.3 CE GA2 and later.
+* Liferay 7.2 CE GA1 and later.
+* Liferay 7.1 CE GA1 and later.
+* Liferay 7.0 CE GA7 and Liferay DXP SP11 or later versions.
+* Java 1.8
+* gradle 6.7 or above need to be installed
 * jpm needs to be installed. (instruction to install is as follows)
 
 ### How to Install
@@ -88,8 +86,8 @@ A contribution is always welcome! In terms of an Enhancement request, please fol
 
 1. After implementing your feature, please add a test as well. Spock test is preferable because it's more readable and flexible to add tests later on. To add tests, tests are separated by classes, and in a test class, each test should be written each method basis.
 2. Run test locally with ```./gradlew clean test --info``` until your code pass all tests
-3. Send a PR to /development branch. According to the status of Travis CI / Appveyor, I may create a feature branch and request you to make it pass the test on Travis CI / Appveyor environment.
-4. After all tests pass on Travis CI / Appveyor, will merge into the development branch and release into master at some points according to the impact of the code.
+3. Send a PR to /development branch. According to the status of Github Action, I may create a feature branch and request you to make it pass the test on Github Action environment.
+4. After all tests pass on Github Action, will merge into the development branch and release into master at some points according to the impact of the code.
 
 ### What does Damascus stand for?
 Damascus is named after "Damascus blade", which is a strong/sharp blade made out from Damascus steel and forged with lost technology. Liferay has it's an official development tool, "Blade", so I gave this name in the hope of reinforcement or extension of Blade tool.

build.gradle

@@ -9,19 +9,19 @@ buildscript {
 }
 
 plugins {
-    id "io.freefair.lombok" version "5.1.0"
+    id "io.freefair.lombok" version "5.3.0"
     id 'java'
     id 'groovy'
     id 'eclipse'
     id 'idea'
     id 'jacoco'
     id 'antlr'
+    id "org.sonarqube" version "3.0"
+    id 'com.github.kt3k.coveralls' version '2.10.2'
 }
 
-apply plugin: 'com.github.kt3k.coveralls'
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 //Need for Windows
 def defaultEncoding = 'UTF-8'
@@ -64,24 +64,25 @@ jar {
 
 dependencies {
     compile 'com.beust:jcommander:1.72'
-    compile 'com.google.guava:guava:29.0-jre'
-    compile 'commons-io:commons-io:2.7'
-    compile 'org.apache.commons:commons-lang3:3.10'
+    compile 'com.google.guava:guava:30.1-jre'
+    compile 'commons-io:commons-io:2.8.+'
+    compile 'org.apache.commons:commons-lang3:3.11'
     compile 'org.apache.commons:commons-configuration2:2.7'
     compile 'commons-beanutils:commons-beanutils:1.9.4'
-	compile 'com.jayway.jsonpath:json-path:2.4.+'
+	compile 'com.jayway.jsonpath:json-path:2.5.+'
 
     compile 'org.freemarker:freemarker:2.3.30'
-    compile 'com.liferay:com.liferay.project.templates:5.0.32'
-    compile 'org.gradle:gradle-tooling-api:4.10.3'
+    compile 'org.gradle:gradle-tooling-api:6.7.1'
+    compile 'com.liferay:com.liferay.project.templates:5.0.101'
+
     compile 'org.slf4j:slf4j-api:1.7.+'
     compile 'org.slf4j:slf4j-log4j12:1.7.+'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.11.+'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.11.+'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.11.+'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.+'
+    compile 'com.fasterxml.jackson.core:jackson-core:2.12.+'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.12.+'
+    compile 'com.fasterxml.jackson.core:jackson-annotations:2.12.+'
+    compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.+'
     compile 'joda-time:joda-time:2.10.+'
-    compile 'org.codehaus.groovy:groovy-all:2.5.8'
+    compile 'org.codehaus.groovy:groovy-all:2.5.+'
 
     compile group: 'org.antlr', name: 'antlr4', version: '4.8-1'
     compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.8-1'
@@ -95,17 +96,22 @@ dependencies {
 
     testCompile group: 'org.hamcrest', name: 'hamcrest-core', version:'1.3'
     testCompile group: 'org.objenesis', name: 'objenesis', version:'2.6'
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
-    testCompile group: 'org.powermock', name: 'powermock-core', version: '1.6.6'
-    testCompile group: 'org.powermock', name: 'powermock-classloading-xstream', version:'1.6.6'
-    testCompile group: 'org.powermock', name: 'powermock-module-junit4', version:'1.6.6'
-    testCompile group: 'org.powermock', name: 'powermock-module-junit4-common', version:'1.6.6'
-    testCompile group: 'org.powermock', name: 'powermock-module-junit4-rule', version:'1.6.6'
-    testCompile group: 'org.powermock', name: 'powermock-api-mockito', version: '1.6.6'
-    testCompile group: 'org.powermock', name: 'powermock-api-mockito-common', version: '1.6.6'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.28.+'
+    testCompile group: 'org.powermock', name: 'powermock-core', version: '2.0.9'
+    testCompile group: 'org.powermock', name: 'powermock-classloading-xstream', version:'2.0.9'
+    testCompile group: 'org.powermock', name: 'powermock-module-junit4', version:'2.0.9'
+    testCompile group: 'org.powermock', name: 'powermock-module-junit4-common', version:'2.0.9'
+    testCompile group: 'org.powermock', name: 'powermock-module-junit4-rule', version:'2.0.9'
+    testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.9'
+
     testCompile('org.spockframework:spock-core:1.3-groovy-2.5') {
         exclude module: 'groovy-all'
     }
+
+    // you can use testRuntimeClasspath if you don't want to use spock-report-specific features in your Specs
+    testImplementation( 'com.athaydes:spock-reports:1.7.1' ) {
+        transitive = false // this avoids affecting your version of Groovy/Spock
+    }
 }
 
 test {
@@ -114,7 +120,7 @@ test {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
+        xml.enabled = true // coveralls plugin depends on xml format report
         html.enabled = true
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Nov 07 22:50:24 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,16 +44,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,35 +156,30 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"