Commit Graph

53 Commits

Author SHA1 Message Date
William Cheng
ce899e3776 Merge remote-tracking branch 'origin/master' into 2.3.0
Conflicts:
	appveyor.yml
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
	modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
	modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache
	modules/swagger-codegen/src/main/resources/go/api.mustache
	modules/swagger-codegen/src/main/resources/objc/api-body.mustache
	modules/swagger-codegen/src/main/resources/objc/api-header.mustache
	modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
	modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
	modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftModelTest.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/swift3/Swift3ModelTest.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java
	samples/client/petstore-security-test/typescript-angular2/configuration.ts
	samples/client/petstore/go/go-petstore/docs/FakeApi.md
	samples/client/petstore/go/go-petstore/fake_api.go
	samples/client/petstore/go/go-petstore/pet_api.go
	samples/client/petstore/java/feign/pom.xml
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/RFC3339DateFormat.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
	samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h
	samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONResponseSerializer.h
	samples/client/petstore/qt5cpp/client/SWGPetApi.h
	samples/client/petstore/qt5cpp/client/SWGStoreApi.h
	samples/client/petstore/qt5cpp/client/SWGUserApi.h
	samples/client/petstore/typescript-angular2/default/configuration.ts
	samples/client/petstore/typescript-angular2/npm/README.md
	samples/client/petstore/typescript-angular2/npm/configuration.ts
	samples/client/petstore/typescript-angular2/npm/package.json
	samples/client/petstore/typescript-angular2/npm/tsconfig.json
	samples/client/petstore/typescript-fetch/builds/default/api.ts
	samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
	samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
	samples/client/petstore/typescript-fetch/tests/default/test/PetApiFactory.ts
	samples/client/petstore/typescript-fetch/tests/default/test/StoreApiFactory.ts
	samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
	samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
	samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java
	samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
	samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java
2017-01-05 17:44:39 +08:00
Nick Maynard
4c05d5f098 Allow Java source formatting mvn formatter:format (#4214)
Uses Eclipse formatting tools with a configuration matching Google's style guide (plus our customisations).
2016-11-23 15:07:25 +08:00
Brent Ryan
95d63a6f1f Bump version of pom to 2.3.0-SNAPSHOT for the 2.3.x release 2016-09-07 09:22:56 -04:00
Tony Tam
c4f3cb1d9e updated dev versions 2016-08-07 23:03:44 +02:00
Tony Tam
c147cfde1b updated release versions 2016-08-07 11:49:01 +02:00
wing328
b3a6535d1e Merge pull request #3385 from wing328/fix_mvn_warning
Fix maven warning and update maven plug-ins to the latest version
2016-07-19 13:10:49 +08:00
Tony Tam
39cb6a24db updated dev versions 2016-07-17 15:43:30 -07:00
Tony Tam
c49db091ef updated versions for release 2016-07-15 13:45:22 -07:00
wing328
9056a5a56c fix mvn warning, update mvn plug-in version 2016-07-15 21:21:58 +08:00
wing328
0a724a3008 update pom for swagger codegen module 2016-05-25 17:25:18 +08:00
Kristof Vrolijkx
6e000cc2a1 Merge branches 'feature/integration-test' and 'master' of https://github.com/Vrolijkx/swagger-codegen into feature/integration-test 2016-05-11 21:59:16 +02:00
wing328
3a80a4ff1e fix double byte characters in description, upgrade to lang3 2016-05-06 16:36:45 +08:00
Kristof Vrolijkx
d78b5f1773 adding diff for files in integration test 2016-05-01 22:45:06 +02:00
wing328
8b45d88b93 Merge pull request #2322 from gibiansky/better-haskell-servant
Improve Haskell Code Generation
2016-04-16 17:26:52 +08:00
Tony Tam
1fe2d3a165 release prepare 2016-04-06 14:07:52 -07:00
Andrew Gibiansky
a694dfb8fb Create new Haskell codegen implementation. 2016-04-04 18:34:04 -07:00
Maelig Nantel
89ed3bdb75 New fix 2016-01-18 11:16:04 +01:00
Tony Tam
7c3406804d updated versions 2016-01-07 20:43:49 -08:00
Tony Tam
d4d4c43032 updated versions 2016-01-06 09:47:32 -08:00
davidkiss
340e8b3671 reverting changes to swagger-codegen pom.xml 2015-11-30 10:41:44 -05:00
317959997
83223ae6d0 rolling back previous accidental push on changes to pom.xml files 2015-11-30 10:25:12 -05:00
317959997
845dd22942 added missing JMeter files 2015-11-30 10:18:29 -05:00
Nadezhda Makarkina
81090bb4e2 Test data were moved to the separete classes and OnlineGeneratorOptionsTest has been refactored 2015-10-30 16:32:33 +03:00
Tony Tam
6b7ceab081 updated to dev version 2015-10-25 20:59:52 -07:00
Tony Tam
dd3b253e15 updated versions 2015-10-25 19:31:36 -07:00
Ivan Ushankin
4b62a94350 Fixed #1304: Migrate tests from the Scala to the plain Java. Part 3 2015-10-02 16:20:16 +03:00
wing328
d37cf6595a update pom.xml to get rid of the warning 2015-09-09 16:20:17 +08:00
russellb337
6d7557971b switch Generate to use CodegenConfigurator 2015-09-02 09:28:40 -07:00
russellb337
074ba1ea54 undo some of the debugging changes I made 2015-08-27 09:11:49 -07:00
russellb337
e5811ebdc7 expose more generate options in the cli 2015-08-26 17:38:51 -07:00
Tony Tam
617fa43a89 updated development version 2015-08-24 00:52:35 -07:00
Tony Tam
dd67287d63 updated development version 2015-08-24 00:51:18 -07:00
Tony Tam
9cc7615b71 rebuilt, updated versions 2015-08-24 00:32:58 -07:00
Toilal
189962208e Update scala maven plugin and fix issues in POM configuration 2015-07-29 15:15:12 +02:00
fehguy
672fcd5a14 updated dev version 2015-06-09 01:36:52 -07:00
fehguy
3d2f09a693 updated versions 2015-06-09 00:25:09 -07:00
Ron
1c2d0656b0 Code reformatting 2015-06-07 11:56:08 -04:00
Tony Tam
18eb3cde97 updated files 2015-06-06 23:11:20 -07:00
Tony Tam
0c1bdc0fd6 merged 2015-05-20 21:48:03 -07:00
Tony Tam
c96f5f6fa8 added excludes for logback.xml per https://github.com/swagger-api/swagger-codegen/issues/689 2015-04-27 22:51:52 -07:00
Alexey Nechaev
699973dcfe Group and version are avaiable from parent pom. 2015-04-22 16:11:16 +03:00
Tony Tam
e1a3540caf fixed version 2015-04-08 05:00:10 -06:00
Tony Tam
c04f947a85 prepare for release 2015-04-06 08:00:16 -06:00
Tony Tam
c82dfa3a64 updated version 2015-02-23 23:03:18 -08:00
Tony Tam
4bd227271a updated version 2015-02-23 22:45:06 -08:00
Tony Tam
784afee7b7 prepare for next dev version 2015-02-17 22:06:25 -08:00
Tony Tam
686f3656c5 updated to new patch 2015-02-17 21:38:02 -08:00
Tony Tam
ff94196295 updated to snapshot version 2015-02-16 22:16:40 -08:00
Tony Tam
66c6662f42 cleaned up poms 2015-02-16 21:53:51 -08:00
Tony Tam
2e88dea3ac updated versions 2015-02-16 20:44:22 -08:00