Merge remote-tracking branch 'origin/master' into 3.2.x

* Solve Conflicts
* Activate "ensure_up_to_date" script
* Remove references to the "3.2.x" branch

# Conflicts:
#	CI/pom.xml.bash
#	CI/pom.xml.circleci
#	CI/pom.xml.circleci.java7
#	CI/pom.xml.ios
#	modules/openapi-generator-cli/pom.xml
#	modules/openapi-generator-gradle-plugin/gradle.properties
#	modules/openapi-generator-gradle-plugin/pom.xml
#	modules/openapi-generator-maven-plugin/pom.xml
#	modules/openapi-generator-online/Dockerfile
#	modules/openapi-generator-online/pom.xml
#	modules/openapi-generator/pom.xml
#	pom.xml
This commit is contained in:
Jeremie Bresson
2018-07-25 18:19:37 +02:00
7 changed files with 12 additions and 17 deletions

View File

@@ -34,7 +34,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.openapitools:openapi-generator-gradle-plugin:3.1.1"
classpath "org.openapitools:openapi-generator-gradle-plugin:3.1.2"
}
}

View File

@@ -16,5 +16,5 @@ gradle buildGoSdk
The samples can be tested against other versions of the plugin using the `openApiGeneratorVersion` property. For example:
```bash
gradle -PopenApiGeneratorVersion=3.1.1 openApiValidate
gradle -PopenApiGeneratorVersion=3.1.2 openApiValidate
```

View File

@@ -1 +1 @@
openApiGeneratorVersion=3.1.1
openApiGeneratorVersion=3.1.2