Skip to content

Merge 3.3.x into master #938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmini merged 11 commits into from
Aug 30, 2018
Merged

Merge 3.3.x into master #938

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6985212
prepare 3.3.x branch
wing328 Aug 6, 2018
546b54b
Merge branch 'master' into 3.3.x
stkrwork Aug 7, 2018
f22e9c2
Merge remote-tracking branch 'origin/master' into 3.3.x
wing328 Aug 15, 2018
8be06bc
Merge remote-tracking branch 'origin/master' into 3.3.x
wing328 Aug 23, 2018
704c1b8
update petstore samples
wing328 Aug 23, 2018
267ffc0
Merge remote-tracking branch 'origin/master' into 3.3.x
jmini Aug 26, 2018
e75b115
[Slim] Add PHPLint tool to check syntax (#898)
ybelenko Aug 26, 2018
3b2951b
Merge remote-tracking branch 'origin/master' into 3.3.x
wing328 Aug 30, 2018
9e45fbb
Merge branch '3.3.x' of https://github.com/openapitools/openapi-gener…
wing328 Aug 30, 2018
f664938
add back phplint tool: e75b115
wing328 Aug 30, 2018
e7c05f1
update samples, re-enable ensure-up-to-date
wing328 Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update samples, re-enable ensure-up-to-date
  • Loading branch information
@wing328
wing328 committed Aug 30, 2018
commit e7c05f16db468c12da796e49f44f5b7b88ab0e9a
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.3-SNAPSHOT
3.3.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/meta-codegen/lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openapi-generator-version>3.2.3</openapi-generator-version>
<openapi-generator-version>3.3.0-SNAPSHOT</openapi-generator-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.8.1</junit-version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion samples/meta-codegen/usage/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.3-SNAPSHOT
3.3.0-SNAPSHOT
2 changes: 1 addition & 1 deletion shippable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:
ci:
- mvn --quiet clean install
# ensure all modifications created by 'mature' generators are in the git repo
#- ./bin/utils/ensure-up-to-date
- ./bin/utils/ensure-up-to-date
# prepare environment for tests
- sudo apt-get update -qq
# install stack
Expand Down