From f798a51edc03c19e04ba0d055b4eca4b9df9feb9 Mon Sep 17 00:00:00 2001 From: Robert Winkler Date: Thu, 5 Jan 2017 14:27:53 +0100 Subject: [PATCH] Release v1.2.0 --- README.adoc | 2 +- RELEASENOTES.adoc | 4 +- build.gradle | 8 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 53639 -> 52928 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 51 +++++++++++++---------- gradlew.bat | 12 ++---- 7 files changed, 42 insertions(+), 39 deletions(-) diff --git a/README.adoc b/README.adoc index 309da3c3..19f37d76 100644 --- a/README.adoc +++ b/README.adoc @@ -27,7 +27,7 @@ image::src/docs/asciidoc/images/Swagger2Markup.PNG[] image::src/docs/asciidoc/images/Swagger2Markup_definitions.PNG[] == Reference documentation -- http://swagger2markup.github.io/swagger2markup/1.1.1/[Reference Documentation] +- http://swagger2markup.github.io/swagger2markup/1.2.0/[Reference Documentation] - https://github.com/Swagger2Markup/swagger2markup/blob/master/RELEASENOTES.adoc[Release notes] - https://github.com/Swagger2Markup/spring-swagger2markup-demo[Demo using Swagger2Markup, Spring Boot, Springfox and spring-restdocs] diff --git a/RELEASENOTES.adoc b/RELEASENOTES.adoc index 5f5f91b9..1e68f5bc 100644 --- a/RELEASENOTES.adoc +++ b/RELEASENOTES.adoc @@ -116,10 +116,10 @@ * Issue #207: Properties that start with an underscore are displayed correctly now * Refactored Swagger2Markup to use a Component-Based design. A document can be composed of components and components can be composed of other components. -=== Version 1.1.2 +=== Version 1.2.ß * Issue #214: Add page break locations * Issue #223: Improve example rendering * Issue #215: Add ability to group operations by RegEx * Added new configuration options: pageBreakLocations, headerRegex * Added new valid value for configuration headerRegex: REGEX -* Updated markup-document-builder from 1.1.0 to 1.1.1-SNAPSHOT \ No newline at end of file +* Updated markup-document-builder from 1.1.0 to 1.1.1 \ No newline at end of file diff --git a/build.gradle b/build.gradle index bd42d889..cc729f8b 100644 --- a/build.gradle +++ b/build.gradle @@ -13,8 +13,8 @@ buildscript { } } description = 'swagger2markup Build' -version = '1.2.0-SNAPSHOT' -ext.releaseVersion = '1.1.1' +version = '1.2.1' +ext.releaseVersion = '1.2.0' group = 'io.github.swagger2markup' apply plugin: 'java' @@ -41,7 +41,7 @@ repositories { } dependencies { - compile 'io.github.swagger2markup:markup-document-builder:1.1.1-SNAPSHOT' + compile 'io.github.swagger2markup:markup-document-builder:1.1.1' compile 'io.swagger:swagger-compat-spec-parser:1.0.23' compile 'org.apache.commons:commons-configuration2:2.1' compile 'commons-beanutils:commons-beanutils:1.9.2' @@ -66,5 +66,5 @@ test { task wrapper(type: Wrapper) { - gradleVersion = '3.1' + gradleVersion = '3.3' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c6137b87896c8f70315ae454e00a969ef5f6019..6ffa237849ef3607e39c3b334a92a65367962071 100644 GIT binary patch delta 13488 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 D6tYUE diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d9ed4106..3baaaf6d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 03 09:37:13 CET 2016 +#Thu Jan 05 14:27:30 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip diff --git a/gradlew b/gradlew index 9d82f789..9aa616c2 100755 --- a/gradlew +++ b/gradlew @@ -6,12 +6,30 @@ ## ############################################################################## -# 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" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# 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 - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,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 @@ -157,4 +161,9 @@ function splitJvmOpts() { eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# 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 "$@" diff --git a/gradlew.bat b/gradlew.bat index 72d362da..e95643d6 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 @@ -49,7 +49,6 @@ goto fail @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