diff --git a/build.gradle b/build.gradle index 64d65dfc2..6a08dac8c 100644 --- a/build.gradle +++ b/build.gradle @@ -211,4 +211,4 @@ subprojects { task wrapper(type: Wrapper) { gradleVersion = '2.4' -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b5166dad4..f6b961fd5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8594981ae..9584e54e8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun May 24 07:45:02 CEST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/gradlew b/gradlew index 91a7e269e..cccdd3d51 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null 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="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; 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 ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282aa..f9553162f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @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 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= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows 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. @@ -60,11 +59,6 @@ set _SKIP=2 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 diff --git a/monolithic/repository/cart/build.gradle b/monolithic/repository/cart/build.gradle index 2225fb46a..d37a25edf 100644 --- a/monolithic/repository/cart/build.gradle +++ b/monolithic/repository/cart/build.gradle @@ -1,3 +1,6 @@ +apply plugin: 'jacoco' +apply plugin: 'java' + jar.baseName = "redis-cart-microservice-repository" idea { @@ -32,3 +35,46 @@ dependencies { testCompile testDeps } + +jacoco { + toolVersion = "0.8.3" +} + +jacocoTestReport { + reports { + xml.enabled true + html.enabled true + csv.enabled true + } +} + +jacocoTestCoverageVerification { + Map env = System.getenv() + def coverage = (env.get('COVERAGE') != null ? Float.parseFloat(env.get('COVERAGE')) : 0.5 ) + // This module testing dev is still WIP, lets validate when + // coverage check is less than 0.15, otherwise we always have 0 validation + coverage = (coverage < 0.25) ? coverage : 0.0 + + violationRules { + rule { + limit { + minimum = coverage + } + } + + rule { + enabled = false + element = 'CLASS' + includes = ['org.gradle.*'] + + limit { + counter = 'LINE' + value = 'TOTALCOUNT' + maximum = 0.3 + } + } + } +} + +check.dependsOn jacocoTestReport +check.dependsOn jacocoTestCoverageVerification diff --git a/monolithic/repository/order/build.gradle b/monolithic/repository/order/build.gradle index e37323a91..898318539 100644 --- a/monolithic/repository/order/build.gradle +++ b/monolithic/repository/order/build.gradle @@ -1,3 +1,6 @@ +apply plugin: 'jacoco' +apply plugin: 'java' + jar.baseName = "order-repository" idea { @@ -34,3 +37,43 @@ dependencies { testCompile testDeps } + +jacoco { + toolVersion = "0.8.3" +} + +jacocoTestReport { + reports { + xml.enabled true + html.enabled true + csv.enabled true + } +} + +jacocoTestCoverageVerification { + Map env = System.getenv() + def coverage = (env.get('COVERAGE') != null ? Float.parseFloat(env.get('COVERAGE')) : 0.5 ) + + violationRules { + rule { + limit { + minimum = coverage + } + } + + rule { + enabled = false + element = 'CLASS' + includes = ['org.gradle.*'] + + limit { + counter = 'LINE' + value = 'TOTALCOUNT' + maximum = 0.3 + } + } + } +} + +check.dependsOn jacocoTestReport +check.dependsOn jacocoTestCoverageVerification diff --git a/monolithic/repository/product/build.gradle b/monolithic/repository/product/build.gradle index e4015d46c..7c6bbf17d 100644 --- a/monolithic/repository/product/build.gradle +++ b/monolithic/repository/product/build.gradle @@ -1,3 +1,6 @@ +apply plugin: 'jacoco' +apply plugin: 'java' + jar.baseName = "product-repository" idea { @@ -32,3 +35,46 @@ dependencies { testCompile testDeps } + +jacoco { + toolVersion = "0.8.3" +} + +jacocoTestReport { + reports { + xml.enabled true + html.enabled true + csv.enabled true + } +} + +jacocoTestCoverageVerification { + Map env = System.getenv() + def coverage = (env.get('COVERAGE') != null ? Float.parseFloat(env.get('COVERAGE')) : 0.5 ) + // This module testing dev is still WIP, lets validate when + // coverage check is less than 0.15, otherwise we always have 0 validation + coverage = (coverage < 0.25) ? coverage : 0.0 + + violationRules { + rule { + limit { + minimum = coverage + } + } + + rule { + enabled = false + element = 'CLASS' + includes = ['org.gradle.*'] + + limit { + counter = 'LINE' + value = 'TOTALCOUNT' + maximum = 0.3 + } + } + } +} + +check.dependsOn jacocoTestReport +check.dependsOn jacocoTestCoverageVerification diff --git a/monolithic/repository/user/build.gradle b/monolithic/repository/user/build.gradle index 6e7caea78..7671846ef 100644 --- a/monolithic/repository/user/build.gradle +++ b/monolithic/repository/user/build.gradle @@ -1,3 +1,6 @@ +apply plugin: 'jacoco' +apply plugin: 'java' + jar.baseName = "user-repository" idea { @@ -32,3 +35,43 @@ dependencies { testCompile testDeps } + +jacoco { + toolVersion = "0.8.3" +} + +jacocoTestReport { + reports { + xml.enabled true + html.enabled true + csv.enabled true + } +} + +jacocoTestCoverageVerification { + Map env = System.getenv() + def coverage = (env.get('COVERAGE') != null ? Float.parseFloat(env.get('COVERAGE')) : 0.5 ) + + violationRules { + rule { + limit { + minimum = coverage + } + } + + rule { + enabled = false + element = 'CLASS' + includes = ['org.gradle.*'] + + limit { + counter = 'LINE' + value = 'TOTALCOUNT' + maximum = 0.3 + } + } + } +} + +check.dependsOn jacocoTestReport +check.dependsOn jacocoTestCoverageVerification diff --git a/monolithic/service/cart/build.gradle b/monolithic/service/cart/build.gradle index 187351853..98b293371 100644 --- a/monolithic/service/cart/build.gradle +++ b/monolithic/service/cart/build.gradle @@ -1,4 +1,5 @@ - +apply plugin: 'jacoco' +apply plugin: 'java' idea { module { @@ -35,3 +36,46 @@ dependencies { testCompile testDeps } + +jacoco { + toolVersion = "0.8.3" +} + +jacocoTestReport { + reports { + xml.enabled true + html.enabled true + csv.enabled true + } +} + +jacocoTestCoverageVerification { + Map env = System.getenv() + def coverage = (env.get('COVERAGE') != null ? Float.parseFloat(env.get('COVERAGE')) : 0.5 ) + // This module testing dev is still WIP, lets validate when + // coverage check is less than 0.15, otherwise we always have 0 validation + coverage = (coverage < 0.25) ? coverage : 0.0 + + violationRules { + rule { + limit { + minimum = coverage + } + } + + rule { + enabled = false + element = 'CLASS' + includes = ['org.gradle.*'] + + limit { + counter = 'LINE' + value = 'TOTALCOUNT' + maximum = 0.3 + } + } + } +} + +check.dependsOn jacocoTestReport +check.dependsOn jacocoTestCoverageVerification diff --git a/monolithic/service/user/build.gradle b/monolithic/service/user/build.gradle index 08f9be64c..25193645d 100644 --- a/monolithic/service/user/build.gradle +++ b/monolithic/service/user/build.gradle @@ -1,3 +1,6 @@ +apply plugin: 'jacoco' +apply plugin: 'java' + jar.baseName = "user-service" idea { @@ -33,3 +36,46 @@ dependencies { testCompile testDeps } + +jacoco { + toolVersion = "0.8.3" +} + +jacocoTestReport { + reports { + xml.enabled true + html.enabled true + csv.enabled true + } +} + +jacocoTestCoverageVerification { + Map env = System.getenv() + def coverage = (env.get('COVERAGE') != null ? Float.parseFloat(env.get('COVERAGE')) : 0.5 ) + // This module testing dev is still WIP, lets validate when + // coverage check is less than 0.15, otherwise we always have 0 validation + coverage = (coverage < 0.25) ? coverage : 0.0 + + violationRules { + rule { + limit { + minimum = coverage + } + } + + rule { + enabled = false + element = 'CLASS' + includes = ['org.gradle.*'] + + limit { + counter = 'LINE' + value = 'TOTALCOUNT' + maximum = 0.3 + } + } + } +} + +check.dependsOn jacocoTestReport +check.dependsOn jacocoTestCoverageVerification diff --git a/monolithic/ui/build.gradle b/monolithic/ui/build.gradle index 3fd3d5d0d..bc3f7cc41 100644 --- a/monolithic/ui/build.gradle +++ b/monolithic/ui/build.gradle @@ -3,6 +3,8 @@ apply plugin: 'war' apply plugin: 'jettyEclipse' apply plugin: 'jmeter' apply plugin: 'docker' +apply plugin: 'jacoco' +apply plugin: 'java' def warName = "monolithic-shop.war" @@ -160,3 +162,46 @@ task packageToContainer(type: Docker) { addFile("$buildDir/libs/$warName", "/opt/tomcat7/webapps/shop.war") } + +jacoco { + toolVersion = "0.8.3" +} + +jacocoTestReport { + reports { + xml.enabled true + html.enabled true + csv.enabled true + } +} + +jacocoTestCoverageVerification { + Map env = System.getenv() + def coverage = (env.get('COVERAGE') != null ? Float.parseFloat(env.get('COVERAGE')) : 0.5 ) + // This module testing dev is still WIP, lets validate when + // coverage check is less than 0.15, otherwise we always have 0 validation + coverage = (coverage < 0.25) ? coverage : 0.0 + + violationRules { + rule { + limit { + minimum = coverage + } + } + + rule { + enabled = false + element = 'CLASS' + includes = ['org.gradle.*'] + + limit { + counter = 'LINE' + value = 'TOTALCOUNT' + maximum = 0.3 + } + } + } +} + +check.dependsOn jacocoTestReport +check.dependsOn jacocoTestCoverageVerification diff --git a/settings.gradle b/settings.gradle index 5be0bea90..5dc9f7eb9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,15 +1,15 @@ -include 'microservice:frontend:catalog' -include 'microservice:frontend:checkout' -include 'microservice:frontend:registration' - -include 'microservice:service:cart' -include 'microservice:service:dataloader' -include 'microservice:service:user' -include 'microservice:service:product' -//include 'microservice:service:product-go' -include 'microservice:service:order' -include 'microservice:service:navigation' -include 'microservice:service:recommendation' +// include 'microservice:frontend:catalog' +// include 'microservice:frontend:checkout' +// include 'microservice:frontend:registration' +// +// include 'microservice:service:cart' +// include 'microservice:service:dataloader' +// include 'microservice:service:user' +// include 'microservice:service:product' +// //include 'microservice:service:product-go' +// include 'microservice:service:order' +// include 'microservice:service:navigation' +// include 'microservice:service:recommendation' include 'monolithic:common:util' include 'monolithic:common:dataloader'