Merge branch 'master' into dev-nullsafety

gibahjoe · gibahjoe · commit c3de19f8e776 · 2020-12-28T04:41:34.000+01:00
# Conflicts:
#	openapi-generator-annotations/CHANGELOG.md
#	openapi-generator-annotations/pubspec.yaml
#	openapi-generator-cli/CHANGELOG.md
#	openapi-generator-cli/pubspec.yaml
#	openapi-generator/CHANGELOG.md
#	openapi-generator/pubspec.yaml
diff --git a/openapi-generator-annotations/CHANGELOG.md b/openapi-generator-annotations/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0
+
+- Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
+
 ## 2.0.0-nullsafety.0
 
 - Added null safety
diff --git a/openapi-generator-cli/CHANGELOG.md b/openapi-generator-cli/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0
+
+- Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
+
 ## 2.0.0-nullsafety.0
 
 - Added null safety
diff --git a/openapi-generator-cli/README.md b/openapi-generator-cli/README.md
@@ -10,18 +10,23 @@ Please see [OpenAPITools/openapi-generator](https://github.com/OpenAPITools/open
 
 ## Usage
 
+### CLI
 Run
 
 ```cmd
 pub global activate openapi_generator_cli
 ```
 Then you can run the generator using the command below.
 ```cmd
-openapi-generator <command>
+openapi-generator generate -i http://127.0.0.1:8111/v3/api-docs -g dart
 ```
 
 See [OpenAPITools/openapi-generator](https://github.com/OpenAPITools/openapi-generator) for more commands
 
+### Dart/Flutter
+
+You can use this package also using the openapi-generator dart plugin that helps you configure the appropriate commands. You can find it [here](https://pub.dev/packages/openapi_generator) 
+
 ## Features and bugs
 
 Please file feature requests and bugs at the [issue tracker][tracker].
diff --git a/openapi-generator-cli/lib/openapi-generator.jar b/openapi-generator-cli/lib/openapi-generator.jar
diff --git a/openapi-generator-cli/pom.xml b/openapi-generator-cli/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>openapi-generator-cli</artifactId>
-            <version>4.3.1</version>
+            <version>5.0.0</version>
         </dependency>
         
         <dependency>
diff --git a/openapi-generator/CHANGELOG.md b/openapi-generator/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0
+
+- Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
+
 ## 2.0.0-nullsafety.0
 
 - Migrated to null safety
