diff --git a/RELEASENOTES.adoc b/RELEASENOTES.adoc index c5ec799c..83737781 100644 --- a/RELEASENOTES.adoc +++ b/RELEASENOTES.adoc @@ -132,3 +132,9 @@ === Version 1.3.1 * PR #247: Fix request path and query params example support. + +=== Version 1.3.2 +* PR #290: Fixed list parsing in properties file +* PR #293: Fixed crash on empty tables +* Updated markup-document-builder from 1.1.1 to 1.1.2 + diff --git a/build.gradle b/build.gradle index ec47f64c..9c914b77 100644 --- a/build.gradle +++ b/build.gradle @@ -23,8 +23,8 @@ apply from: 'gradle/coverage.gradle' apply from: 'gradle/documentation.gradle' tasks.withType(JavaCompile) { - sourceCompatibility = "1.8" - targetCompatibility = "1.8" + sourceCompatibility = "1.9" + targetCompatibility = "1.9" options.deprecation = true options.encoding = 'UTF-8' options.compilerArgs << "-Xlint:unchecked" @@ -39,7 +39,7 @@ repositories { } dependencies { - compile 'io.github.swagger2markup:markup-document-builder:1.1.1' + compile 'io.github.swagger2markup:markup-document-builder:1.1.2' compile 'io.swagger:swagger-compat-spec-parser:1.0.31' compile 'org.apache.commons:commons-configuration2:2.1' compile 'commons-beanutils:commons-beanutils:1.9.2' @@ -64,5 +64,5 @@ test { task wrapper(type: Wrapper) { - gradleVersion = '4.2' + gradleVersion = '4.3.1' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 6ffa2378..964ac3a3 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 3baaaf6d..b05a1021 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jan 05 14:27:30 CET 2017 +#Mon Dec 04 10:24:38 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip diff --git a/gradlew b/gradlew index 9aa616c2..4453ccea 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -154,16 +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 +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then cd "$(dirname "$0")" fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@"