9140 Commits

Author SHA1 Message Date
Dennis Kieselhorst
7a9981b350 updated swagger-ui dependency (#5945) 2017-06-29 16:12:33 +08:00
wing328
b18e003d12 update petstore script usage 2017-06-29 15:32:10 +08:00
wing328
2d058aa925 add info message for mvn clean deploy 2017-06-29 14:59:46 +08:00
wing328
9f2d800435 Merge branch 'better_ci_conflicts' 2017-06-29 14:23:01 +08:00
wing328
8015744212 update java petstore samples 2017-06-29 13:53:37 +08:00
Jordan Zimmerman
b2efb70410 Support a true "java8" option (#5864)
* Closes #5863

The "dateLibrary" option for java, sadly, sets a mustache value "java8". This change updates this so that "java" in the mustache
libraries means what it should mean - use all java8 classes. In this case, there's no need for the third party Base64 library
as java8's JDK has this built in. In my view, the "dateLibrary" should be deprecated but that should be a separate PR.

* updated samples

* fixed tests for new CLI java8

* regenerated samples after master merge

* oops - left in an end tag after master merge

* rerun checks

* rerun checks
2017-06-29 13:23:44 +08:00
wing328
7b80557363 fix file not found 2017-06-29 13:22:26 +08:00
wing328
bced355191 better detection for unresolved merge conflicts 2017-06-29 13:01:40 +08:00
Dennis Kieselhorst
a64c7d7986 updated jackson-version (#5943) 2017-06-29 10:56:12 +08:00
Dennis Kieselhorst
eb6c6d0698 use enforcer-plugin to fix Maven warning (#5940) 2017-06-29 00:22:26 +08:00
Dennis Kieselhorst
e3da4f9fde updated maven-war-plugin (#5941) 2017-06-29 00:14:16 +08:00
Bernd
cbd7301f9c Update README.md (#5942)
Added Leanix as Company using swagger codegen
2017-06-28 22:28:16 +08:00
wing328
4f404a794d add stkrwork as the owner of apache2 template 2017-06-28 18:05:53 +08:00
wing328
fd44d01d9c Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-28 18:03:28 +08:00
Paŭlo Ebermann
d31d431071 #5147: allow multiple for other plural options, too (#5860)
* Issue #5147: allow multiple occurrences for other plural options, too.

* Use two --additionalProperties parameters in sample generation script.
2017-06-28 17:55:23 +08:00
wing328
5d7ff49658 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-28 16:23:55 +08:00
Dennis Kieselhorst
4f6e2857cc removed obsolete jersey2-version (#5933) 2017-06-28 16:22:29 +08:00
wing328
cd0ec4ed71 Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0 2017-06-28 15:36:14 +08:00
wing328
e7561a11f4 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-28 15:35:24 +08:00
Tony Tam
bc01c3c103 Merge pull request #5937 from swagger-api/enable-sonatype-push-2.3.0
enabled push to sonatype
2017-06-27 17:21:00 -07:00
Tony Tam
ad7422e2ff enabled push to sonatype 2017-06-27 13:03:38 -07:00
Tony Tam
a0e4a56026 Merge pull request #5934 from swagger-api/enable-snapshot-push
Enable snapshot push
2017-06-27 12:05:58 -07:00
stkrwork
3c0623cce1 ApacheConfGen for HTTP Basic Authentication Proposed implementation (#5800)
* - Added Restbed Generator

* - Added Json processing functions to model
- Removed unnused code from restbed codegen class
- Added response header processing to api template

* Changed it to respect alphabetical order

* Made the string joining java 7 compatible

* Added samples

* Auto stash before merge of "master" and "origin/master"

* added missing apache2 config gen in services file

* - Added new Config Type
- Added Samples
- Added sample generating scripts
- Renamed Apache2Confgen to Apache2ConfigCodegen

* - Added Samples
- Added new config type
- Added sample generating scripts
- Renamed Apache2Confgen to Apache2ConfigCodegen
2017-06-28 02:48:53 +08:00
Tony Tam
fae3f42ba8 Update .travis.yml 2017-06-27 10:44:25 -07:00
Tony Tam
8b03baf463 added local settings 2017-06-27 09:35:38 -07:00
Tony Tam
eabc13e468 added sonatype push 2017-06-27 09:35:08 -07:00
Brendan Burns
91f470e41f Add a function for injecting your own Authentication into the Typescript-node client (#5865) 2017-06-28 00:23:40 +08:00
Tony Tam
1e2465735b [2.3.0] Update Swagger Codegen to v1.5.15 (#5929)
* updated versions

* match fix in 2.2.x branch

* updated with 73df07d64c

* regenerate pom.xml for jaxrs-cxf-petstore-server-annotated-base-path

* regenerate pom.xml for jaxrs-cxf-petstore-server-non-spring-application
2017-06-28 00:13:52 +08:00
Tony Tam
62c0f17f98 Merge pull request #5858 from swagger-api/issue-5753
Update Swagger Codegen to v1.5.15
2017-06-26 14:20:20 -07:00
Tony Tam
73df07d64c Merge branch 'master' into issue-5753 2017-06-26 13:15:00 -07:00
Tony Tam
8237e491ac fixed order of checking 2017-06-26 13:10:31 -07:00
wing328
1011b3ae7c Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-27 00:42:19 +08:00
wing328
5fbb674cac fix retrofit okhttp version 2017-06-27 00:41:08 +08:00
wing328
e84b789f78 remove unused files from C# petstore folder 2017-06-26 23:41:22 +08:00
wing328
49dbb51957 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-26 23:39:04 +08:00
wing328
522d704f7a [Java] Update dependencies for Java clients (#5926)
* update dep for java jersey1, jersey2

* update sbt dependency for jersey2

* update dep for java okhttp-gson, resteasy, resttemplate

* update dep for java retrofit 1.x, 2.x

* update java petstore samples
2017-06-26 23:18:45 +08:00
wing328
6eb987919f minor fix to js promise test cases 2017-06-26 21:48:44 +08:00
Felix Becker
9e420f2149 Use id -g for determining the gid instead of -u (#5899)
fix wrong group id lookup in run-in-docker.sh
2017-06-26 18:29:47 +08:00
Dennis Kieselhorst
68d878c244 update to latest CXF release (#5923) 2017-06-26 15:55:34 +08:00
wing328
0c5ba727f9 fix typo in java generator help text 2017-06-26 03:33:03 +08:00
wing328
4d065e8823 [JavaScript] set ES6 as the default for JS generator in the 2.3.0 branch (#5915)
* set useES6 in all JS scripts/batch files

* set ES6 as the default in js generator
2017-06-25 15:17:09 +08:00
Rafał Petryka
65e888519a Added one presentation to README.md (#5921) 2017-06-25 15:03:37 +08:00
wing328
b9bd221ba9 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-23 22:23:17 +08:00
wing328
e08e9cfefe set useES6 in all JS scripts/batch files 2017-06-23 22:22:05 +08:00
wing328
02f30a27f9 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-23 22:09:45 +08:00
wing328
5b4e8a8ed5 [JavaScript] fix JS shell scripts, add log to show template version (#5907)
* fix JS shell script, add log to show es version

* change CLI option default value for useES6

* fix shell script in JS ES6 promise

* fix windows batch files

* set useES6 to false
2017-06-23 22:09:07 +08:00
wing328
f32dd6f7bc Merge remote-tracking branch 'origin/master' into 2.3.0 2017-06-23 15:24:04 +08:00
Stanislav Bondarenko
69ce921371 Python - Increase range of valid status codes (#5901)
swagger-client shouldn't throw ApiException if status code in range 200-299
2017-06-23 11:31:30 +08:00
Hugo Kiyodi Oshiro
d67cb9c30b Fix wrong es6 template path (#5904) 2017-06-23 02:27:50 +08:00
stkrwork
025bf3aa80 Final fix for cpprest for issue #5862 (#5893)
* - Added Restbed Generator

* - Added Json processing functions to model
- Removed unnused code from restbed codegen class
- Added response header processing to api template

* Changed it to respect alphabetical order

* Made the string joining java 7 compatible

* Added samples

* First step in fixing the cpp rest template
regenerated new samples

TODO: Fix the other functions

* Updated samples

* Added isMapContainer check

* Fixed item selection in json object for MapContainer

* - Fixed Syntax error in C++
- Fixed Syntax error in Mustache, that escaped characters
2017-06-22 23:00:54 +08:00