Start upgrading the app

build.gradle

@@ -5,8 +5,8 @@ buildscript {
  }
  dependencies {
  classpath "org.grails:grails-gradle-plugin:$grailsVersion"
- //classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.1"
  classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
+// classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.15.1"
  }
 }
 
@@ -17,8 +17,8 @@ apply plugin:"eclipse"
 apply plugin:"idea"
 apply plugin:"war"
 apply plugin:"org.grails.grails-web"
-apply plugin:"org.grails.grails-gsp"
 //apply plugin:"asset-pipeline"
+apply plugin:"org.grails.grails-gsp"
 
 repositories {
  mavenLocal()
@@ -32,47 +32,57 @@ dependencies {
  //compile "com.stripe:stripe-java:1.32.1"
  compile "com.google.code.gson:gson:2.3.1"
  compile "org.grails.plugins:spring-security-shiro:3.0.0"
- compile "org.grails.plugins:quartz:2.0.12"
+ compile "org.grails.plugins:quartz:2.0.12"
  //compile files("lib/easypost-java-2.1.2.jar")
  compile files("lib/easypost-api-client-3.4.0.jar")
  compile files("lib/stripe-java-4.9.0.jar")
- //compile files("lib/postgresql-42.1.1.jar")
+ //compile files("lib/postgresql-42.1.1.jar")
  /*************************************************************/
 
  compile "org.springframework.boot:spring-boot-starter-logging"
  compile "org.springframework.boot:spring-boot-autoconfigure"
  compile "org.grails:grails-core"
  compile "org.springframework.boot:spring-boot-starter-actuator"
  compile "org.springframework.boot:spring-boot-starter-tomcat"
- compile "org.grails:grails-dependencies"
  compile "org.grails:grails-web-boot"
+ compile "org.grails:grails-logging"
+ compile "org.grails:grails-plugin-rest"
+ compile "org.grails:grails-plugin-databinding"
+ compile "org.grails:grails-plugin-i18n"
+ compile "org.grails:grails-plugin-services"
+ compile "org.grails:grails-plugin-url-mappings"
+ compile "org.grails:grails-plugin-interceptors"
  compile "org.grails.plugins:cache"
+ compile "org.grails.plugins:async"
  compile "org.grails.plugins:scaffolding"
+ compile "org.grails.plugins:events"
  compile "org.grails.plugins:hibernate5"
- compile "org.hibernate:hibernate-core:5.1.3.Final"
- compile "org.hibernate:hibernate-ehcache:5.1.3.Final"
+ compile "org.hibernate:hibernate-core:5.1.16.Final"
+ compile "org.grails.plugins:gsp"
  console "org.grails:grails-console"
  profile "org.grails.profiles:web"
- //runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.1"
+ runtime "org.glassfish.web:el-impl:2.1.2-b03"
  runtime "com.h2database:h2"
- testCompile "org.grails:grails-plugin-testing"
+ runtime "org.apache.tomcat:tomcat-jdbc"
+ runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.15.1"
+ testCompile "org.grails:grails-gorm-testing-support"
  testCompile "org.grails.plugins:geb"
+ testCompile "org.grails:grails-web-testing-support"
  testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
  testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
- testCompile "org.grails:grails-gorm-testing-support:1.1.5"
- testCompile "org.grails:grails-web-testing-support:1.1.5"
 }
 
 bootRun {
  jvmArgs('-Dspring.output.ansi.enabled=always')
  addResources = true
+ String springProfilesActive = 'spring.profiles.active'
+ systemProperty springProfilesActive, System.getProperty(springProfilesActive)
 }
 
 //TODO:uncomment
 //assets {
- // minifyJs = true
- // minifyCss = true
- // includes = ["js/*", "css/**", "bootstrap/**", "images/**"]
+// minifyJs = true
+// minifyCss = true
 //}
 
 String.metaClass.uncapitalize = {

gradle.properties

@@ -1,3 +1,3 @@
-grailsVersion=3.2.8
-gormVersion=6.0.9.RELEASE
-gradleWrapperVersion=3.4.1
+grailsVersion=3.3.9
+gormVersion=6.1.11.RELEASE
+gradleWrapperVersion=3.5

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-3.4.1-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-3.5-bin.zip

gradlew.bat

@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

grailsw

@@ -102,6 +102,7 @@ fi
 if $cygwin ; then
  APP_HOME=`cygpath --path --mixed "$APP_HOME"`
  JAVACMD=`cygpath --unix "$JAVACMD"`
+ JAR_PATH=`cygpath --path --mixed "$JAR_PATH"`
 
  # We build the pattern for arguments to be converted via cygpath
  ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`