Commit Graph

146 Commits

Author SHA1 Message Date
wing328
804967eeed Merge remote-tracking branch 'origin/master' into 2.3.0 2017-07-14 16:31:44 +08:00
Johan Rouve
f90249caf4 Remove jetty server port (#6049) 2017-07-14 15:28:31 +08:00
wing328
ef5c6a939d Merge remote-tracking branch 'origin/master' into 2.3.0 2017-07-13 15:36:44 +08:00
wing328
1e53557570 run "mvn formatter:format" on swagger-generator 2017-07-13 15:36:04 +08:00
wing328
9269dac6cf Merge remote-tracking branch 'origin/master' into 2.3.0 2017-07-01 15:47:27 +08:00
Dennis Kieselhorst
e3da4f9fde updated maven-war-plugin (#5941) 2017-06-29 00:14:16 +08:00
wing328
87bbbc1a1b Merge remote-tracking branch 'origin/master' into 230_merge_master 2017-06-05 23:27:11 +08:00
sdoeringNew
ffc0d32b9c #5712 put @JsonValue to appropriate place in generated enum, add TypeAdapter for Gson enums, enhance tests (#5713) 2017-06-02 16:03:32 +08:00
wing328
98684d872c Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-01 07:10:03 +08:00
wing328
9070c7133c minor code format enhancement to ZipUtil.java 2017-05-31 23:14:37 +08:00
wing328
f7cbb2c0e6 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-23 15:26:15 +08:00
Tony Tam
247be2f140 fix cache skip 2017-04-20 16:51:15 -07:00
Tony Tam
456b54b24f fix cache skip 2017-04-20 16:49:58 -07:00
Tony Tam
6ea4b4d6f3 fixes #5446 2017-04-20 10:32:27 -07:00
Tony Tam
0382f39780 disable cache 2017-04-20 10:29:12 -07:00
Tony Tam
aff529c0a9 updated index file for new editor 2017-04-20 10:29:06 -07:00
Tony Tam
c6ee8226a2 updated base image 2017-04-20 10:15:20 -07:00
Paŭlo Ebermann
9be178b26a Merge branch 'master' into new-sync-master-to-2.3.0 2017-03-13 21:42:41 +01:00
Bernhard Döbler
bfa8d350b3 JS files were replaced in the lib folder; include new (#4985)
Fix https://github.com/swagger-api/swagger-codegen/issues/4983
2017-03-09 23:18:11 +08:00
wing328
775f108d4e update version to 2.2.3-SNAPSHOT (#4894) 2017-03-02 16:54:37 +08:00
Tony Tam
8504c12ce0 update to release versions 2017-03-01 14:22:34 -05:00
wing328
acd10318f7 Merge remote-tracking branch 'origin' into sync_master_230 2017-02-10 23:31:36 +08:00
Tony Tam
8fa2ef8ec2 merged 2017-02-09 13:17:22 -05:00
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
Tony Tam
0252d1a534 Update to latest swagger-core, parser versions (#4472)
* updated to release versions

* fixed defaultValue objects to strings

* added top-level jackson version

* added missing dependency, removed from swagger-core
2017-01-03 16:41:16 +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
wing328
766b04a2bd Merge remote-tracking branch 'origin/master' into 2.3.0 2016-09-12 23:30:15 +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
Ville Skyttä
b4c139f19b Spelling fixes 2016-08-27 02:34:33 +03: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
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
Tony Tam
20216a9418 added env variable override 2016-07-14 12:05:36 -07:00
wing328
3b780e30d8 change java default lib to okhttp-gson 2016-07-07 15:53:16 +08:00
cbornet
027ff93ae4 rename and remove dead code 2016-06-20 15:16:13 +02:00
Jim Schubert
fe66364f04 [docker] Runnable CLI, reduced container size 2016-05-24 19:58:26 -04:00
Jim Schubert
b2c14c98c9 Limit base image to 1.0 2016-05-24 14:11:57 -04:00
wing328
dbc3e418a9 udpate pom for other sub modules 2016-05-24 23:27:11 +08:00
Jim Schubert
1da350e819 [docker] Cleanup and reduce container sizes 2016-05-23 21:54:35 -04:00
abcsun
2a67161a3d move the lumen generator to corresponding folder 2016-04-20 20:57:04 +08:00
Tony Tam
1fe2d3a165 release prepare 2016-04-06 14:07:52 -07:00
Tony Tam
3ea911dd74 fix, tests for #2500 2016-04-05 14:48:37 -07:00
Tony Tam
f0c3870386 fixed output path 2016-03-29 00:01:31 -07:00
Tony Tam
5df69fd71e updated to work around https://github.com/swagger-api/swagger-core/issues/1714 2016-03-15 16:06:37 -07:00
wing328
5160ce9ac1 use case insensitive sort 2016-02-22 14:39:09 +08:00
Tony Tam
671c5880b9 added sort 2016-02-20 21:09:27 -08:00
Tony Tam
eafd79e8ea updated index file 2016-02-06 07:07:53 -08:00
Tony Tam
a4d7a97504 added json provider for https://github.com/swagger-api/swagger-core/releases 2016-02-06 06:41:43 -08:00
wing328
564fa04f7c Merge pull request #1988 from wing328/maven_build_quiet3
Rebase on latest master for "Using logger instead of System.out #1871"
2016-01-28 11:52:35 +08:00