From 7d75c66180f21c146529a08dab701a87e8931e82 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 11 May 2018 15:28:32 +0800 Subject: [PATCH] Various updates (#419) * various updates * update pom.xml * update ci config with new location * Change "swagger-codegen" to "openapi-generator" in a comment * fix pom.xml for bash client * minor fix to github ID * fix pom for ios --- pom.xml.bash => CI/pom.xml.bash | 66 +++++-------------- pom.xml.circleci => CI/pom.xml.circleci | 30 +-------- .../pom.xml.circleci.java7 | 32 +-------- pom.xml.ios => CI/pom.xml.ios | 62 +++++------------ pom.xml.shippable => CI/pom.xml.shippable | 26 +------- .../client/petstore/kotlin-string/pom.xml | 0 .../client/petstore/kotlin-threetenbp/pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../java-play-framework-no-interface/pom.xml | 0 .../java-play-framework-no-swagger-ui/pom.xml | 0 .../java-play-framework-no-wrap-calls/pom.xml | 0 .../petstore/java-play-framework/pom.xml | 0 .../petstore/kotlin-server/ktor/pom.xml | 0 CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 2 +- Vagrantfile | 2 +- ...rk-petstore-server-api-package-override.sh | 2 +- ...amework-petstore-server-controller-only.sh | 2 +- ...ramework-petstore-server-fake-endpoints.sh | 2 +- ...work-petstore-server-no-bean-validation.sh | 2 +- ...k-petstore-server-no-exception-handling.sh | 2 +- ...-framework-petstore-server-no-interface.sh | 2 +- ...framework-petstore-server-no-swagger-ui.sh | 2 +- ...framework-petstore-server-no-wrap-calls.sh | 2 +- bin/java-play-framework-petstore-server.sh | 2 +- bin/kotlin-client-string.sh | 2 +- bin/kotlin-client-threetenbp.sh | 2 +- bin/kotlin-server-petstore.sh | 2 +- circle.yml | 8 +-- modules/openapi-generator-online/pom.xml | 2 +- pom.xml | 36 ++-------- shippable.yml | 2 +- 36 files changed, 66 insertions(+), 228 deletions(-) rename pom.xml.bash => CI/pom.xml.bash (94%) rename pom.xml.circleci => CI/pom.xml.circleci (97%) rename pom.xml.circleci.java7 => CI/pom.xml.circleci.java7 (97%) rename pom.xml.ios => CI/pom.xml.ios (94%) rename pom.xml.shippable => CI/pom.xml.shippable (97%) rename {samples.ci => CI/samples.ci}/client/petstore/kotlin-string/pom.xml (100%) rename {samples.ci => CI/samples.ci}/client/petstore/kotlin-threetenbp/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework-api-package-override/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework-controller-only/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework-fake-endpoints/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework-no-bean-validation/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework-no-exception-handling/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework-no-interface/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework-no-swagger-ui/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework-no-wrap-calls/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/java-play-framework/pom.xml (100%) rename {samples.ci => CI/samples.ci}/server/petstore/kotlin-server/ktor/pom.xml (100%) diff --git a/pom.xml.bash b/CI/pom.xml.bash similarity index 94% rename from pom.xml.bash rename to CI/pom.xml.bash index c8093f515853..4cf331554998 100644 --- a/pom.xml.bash +++ b/CI/pom.xml.bash @@ -5,16 +5,16 @@ 5 4.0.0 - io.swagger - swagger-codegen-project + org.openapitools + openapi-generator-project pom - swagger-codegen-project - 2.4.0-SNAPSHOT - https://github.com/swagger-api/swagger-codegen + openapi-generator-project + 3.0.0-SNAPSHOT + https://github.com/openapi-tools/openapi-generator - scm:git:git@github.com:swagger-api/swagger-codegen.git - scm:git:git@github.com:swagger-api/swagger-codegen.git - https://github.com/swagger-api/swagger-codegen + scm:git:git@github.com:openapi-tools/openapi-generator.git + scm:git:git@github.com:openapi-tools/openapi-generator.git + https://github.com/openapi-tools/openapi-generator @@ -58,14 +58,8 @@ github - https://github.com/swagger-api/swagger-codegen/issues + https://github.com/openapi-tools/openapi-generator/issues - - - swagger-swaggersocket - https://groups.google.com/forum/#!forum/swagger-swaggersocket - - Apache License 2.0 @@ -117,7 +111,7 @@ LF - + + Don't include generated sources a la http://stackoverflow.com/a/30406454 ${project.build.sourceDirectory} UTF-8 true @@ -146,7 +140,7 @@ 6.19 - + --> org.apache.maven.plugins maven-surefire-plugin @@ -201,7 +195,7 @@ development ${project.url} ${project.version} - io.swagger + org.openapi-tools @@ -544,30 +538,6 @@ samples/client/petstore/scala - - objc-client - - - env - objc - - - - samples/client/petstore/objc/default/SwaggerClientTests - - - - swift-client - - - env - swift - - - - samples/client/petstore/swift/default/SwaggerClientTests - - java-msf4j-server @@ -882,10 +852,10 @@ - modules/swagger-codegen - modules/swagger-codegen-cli - modules/swagger-codegen-maven-plugin - modules/swagger-generator + modules/openapi-generator + modules/openapi-generator-cli + modules/openapi-generator-maven-plugin + modules/openapi-generator-online target/site @@ -961,7 +931,7 @@ 3.4 1.7.12 3.2.1 - 1.12 + 1.14 6.9.6 2.19.1 1.25 diff --git a/pom.xml.circleci b/CI/pom.xml.circleci similarity index 97% rename from pom.xml.circleci rename to CI/pom.xml.circleci index 1001d07287d5..04576ac75195 100644 --- a/pom.xml.circleci +++ b/CI/pom.xml.circleci @@ -9,7 +9,7 @@ org.openapitools openapi-generator-project pom - openapi-genearator-project + openapi-generator-project 3.0.0-SNAPSHOT https://github.com/openapitools/openapi-generator @@ -199,7 +199,7 @@ development ${project.url} ${project.version} - io.swagger + org.openapitools @@ -498,30 +498,6 @@ samples/client/petstore/scala - - objc-client - - - env - objc - - - - samples/client/petstore/objc/default/SwaggerClientTests - - - - swift-client - - - env - swift - - - - samples/client/petstore/swift/default/SwaggerClientTests - - java-msf4j-server @@ -1004,7 +980,7 @@ 3.4 1.7.12 3.2.1 - 1.12 + 1.14 6.9.6 2.19.1 1.25 diff --git a/pom.xml.circleci.java7 b/CI/pom.xml.circleci.java7 similarity index 97% rename from pom.xml.circleci.java7 rename to CI/pom.xml.circleci.java7 index c01ea9efbc79..7545fd6e5cc6 100644 --- a/pom.xml.circleci.java7 +++ b/CI/pom.xml.circleci.java7 @@ -64,12 +64,6 @@ github https://github.com/openapitools/openapi-generator/issues - - - swagger-swaggersocket - https://groups.google.com/forum/#!forum/swagger-swaggersocket - - Apache License 2.0 @@ -205,7 +199,7 @@ development ${project.url} ${project.version} - io.swagger + org.openapitools @@ -504,30 +498,6 @@ samples/client/petstore/scala - - objc-client - - - env - objc - - - - samples/client/petstore/objc/default/SwaggerClientTests - - - - swift-client - - - env - swift - - - - samples/client/petstore/swift/default/SwaggerClientTests - - java-msf4j-server diff --git a/pom.xml.ios b/CI/pom.xml.ios similarity index 94% rename from pom.xml.ios rename to CI/pom.xml.ios index a23f715250ee..d1f106f01b0b 100644 --- a/pom.xml.ios +++ b/CI/pom.xml.ios @@ -5,16 +5,16 @@ 5 4.0.0 - io.swagger - swagger-codegen-project + org.openapitools + openapi-generator-project pom - swagger-codegen-project - 2.4.0-SNAPSHOT - https://github.com/swagger-api/swagger-codegen + openapi-generator-project + 3.0.0-SNAPSHOT + https://github.com/openapitools/openapi-generator - scm:git:git@github.com:swagger-api/swagger-codegen.git - scm:git:git@github.com:swagger-api/swagger-codegen.git - https://github.com/swagger-api/swagger-codegen + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://github.com/openapitools/openapi-generator @@ -58,14 +58,8 @@ github - https://github.com/swagger-api/swagger-codegen/issues + https://github.com/openapitools/openapi-generator/issues - - - swagger-swaggersocket - https://groups.google.com/forum/#!forum/swagger-swaggersocket - - Apache License 2.0 @@ -201,7 +195,7 @@ development ${project.url} ${project.version} - io.swagger + org.openapitools @@ -544,30 +538,6 @@ samples/client/petstore/scala - - objc-client - - - env - objc - - - - samples/client/petstore/objc/default/SwaggerClientTests - - - - swift-client - - - env - swift - - - - samples/client/petstore/swift/default/SwaggerClientTests - - java-msf4j-server @@ -885,15 +855,15 @@ samples/client/petstore/swift/rxswift/SwaggerClientTests + samples/client/petstore/objc/core-data/SwaggerClientTests--> - modules/swagger-codegen - modules/swagger-codegen-cli - modules/swagger-codegen-maven-plugin - modules/swagger-generator + modules/openapi-generator + modules/openapi-generator-cli + modules/openapi-generator-maven-plugin + modules/openapi-generator-online target/site @@ -969,7 +939,7 @@ 3.4 1.7.12 3.2.1 - 1.12 + 1.14 6.9.6 2.19.1 1.25 diff --git a/pom.xml.shippable b/CI/pom.xml.shippable similarity index 97% rename from pom.xml.shippable rename to CI/pom.xml.shippable index a4bca8cf9770..ac3536481d0c 100644 --- a/pom.xml.shippable +++ b/CI/pom.xml.shippable @@ -195,7 +195,7 @@ development ${project.url} ${project.version} - io.swagger + org.openapitools @@ -538,30 +538,6 @@ samples/client/petstore/scala - - objc-client - - - env - objc - - - - samples/client/petstore/objc/default/SwaggerClientTests - - - - swift-client - - - env - swift - - - - samples/client/petstore/swift/default/SwaggerClientTests - - java-msf4j-server diff --git a/samples.ci/client/petstore/kotlin-string/pom.xml b/CI/samples.ci/client/petstore/kotlin-string/pom.xml similarity index 100% rename from samples.ci/client/petstore/kotlin-string/pom.xml rename to CI/samples.ci/client/petstore/kotlin-string/pom.xml diff --git a/samples.ci/client/petstore/kotlin-threetenbp/pom.xml b/CI/samples.ci/client/petstore/kotlin-threetenbp/pom.xml similarity index 100% rename from samples.ci/client/petstore/kotlin-threetenbp/pom.xml rename to CI/samples.ci/client/petstore/kotlin-threetenbp/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml b/CI/samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework-controller-only/pom.xml b/CI/samples.ci/server/petstore/java-play-framework-controller-only/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework-controller-only/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework-controller-only/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml b/CI/samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml b/CI/samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml b/CI/samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework-no-interface/pom.xml b/CI/samples.ci/server/petstore/java-play-framework-no-interface/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework-no-interface/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework-no-interface/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml b/CI/samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml b/CI/samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml diff --git a/samples.ci/server/petstore/java-play-framework/pom.xml b/CI/samples.ci/server/petstore/java-play-framework/pom.xml similarity index 100% rename from samples.ci/server/petstore/java-play-framework/pom.xml rename to CI/samples.ci/server/petstore/java-play-framework/pom.xml diff --git a/samples.ci/server/petstore/kotlin-server/ktor/pom.xml b/CI/samples.ci/server/petstore/kotlin-server/ktor/pom.xml similarity index 100% rename from samples.ci/server/petstore/kotlin-server/ktor/pom.xml rename to CI/samples.ci/server/petstore/kotlin-server/ktor/pom.xml diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index c296b6c1a6af..b417192acb3c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at apiteam@swagger.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@openapitools.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 72bdb08ff417..07a6bb27b4b5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,7 +78,7 @@ For [Vendor Extensions](https://github.com/OAI/OpenAPI-Specification/blob/master To add test cases (optional) covering the change in the code generator, please refer to [modules/openapi-generator/src/test/java/org/openapitools/codegen](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/test/java/org/openapitools/codegen) To test the templates, please perform the following: -- Update the [Petstore](http://petstore.swagger.io/) sample by running the shell script under `bin` folder. For example, run `./bin/ruby-petstore.sh` to update the Ruby PetStore API client under [`samples/client/petstore/ruby`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/ruby) For Windows, the batch files can be found under `bin\windows` folder. (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI/Swagger spec from time to time. If you've questions or concerns, please open a ticket to start a discussion) +- Update the Petstore sample by running the shell script under `bin` folder. For example, run `./bin/ruby-petstore.sh` to update the Ruby PetStore API client under [`samples/client/petstore/ruby`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/ruby) For Windows, the batch files can be found under `bin\windows` folder. (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec from time to time. If you've questions or concerns, please open a ticket to start a discussion) - Run the tests in the sample folder, e.g. in `samples/client/petstore/ruby`, run `mvn integration-test -rf :RubyPetstoreClientTests`. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests) - Finally, git commit the updated samples files: `git commit -a` (`git add -A` if added files with new test cases) diff --git a/Vagrantfile b/Vagrantfile index 3abbb54ea080..03735a6b6af9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,7 +9,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = "ubuntu/trusty64" config.vm.provider "virtualbox" do |v| - v.name = "swagger-codegen" + v.name = "openapi-generator" v.memory = 2048 v.cpus = 2 end diff --git a/bin/java-play-framework-petstore-server-api-package-override.sh b/bin/java-play-framework-petstore-server-api-package-override.sh index f6c5c4057035..836654f288bd 100755 --- a/bin/java-play-framework-petstore-server-api-package-override.sh +++ b/bin/java-play-framework-petstore-server-api-package-override.sh @@ -31,4 +31,4 @@ ags="$@ generate -t modules/openapi-generator/src/main/resources/JavaPlayFramewo java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml samples/server/petstore/java-play-framework-api-package-override/pom.xml \ No newline at end of file +cp CI/samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml samples/server/petstore/java-play-framework-api-package-override/pom.xml diff --git a/bin/java-play-framework-petstore-server-controller-only.sh b/bin/java-play-framework-petstore-server-controller-only.sh index 6d8baf1c431f..4e96b4553089 100755 --- a/bin/java-play-framework-petstore-server-controller-only.sh +++ b/bin/java-play-framework-petstore-server-controller-only.sh @@ -31,4 +31,4 @@ ags="$@ generate -t modules/openapi-generator/src/main/resources/JavaPlayFramewo java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework-controller-only/pom.xml samples/server/petstore/java-play-framework-controller-only/pom.xml \ No newline at end of file +cp CI/samples.ci/server/petstore/java-play-framework-controller-only/pom.xml samples/server/petstore/java-play-framework-controller-only/pom.xml diff --git a/bin/java-play-framework-petstore-server-fake-endpoints.sh b/bin/java-play-framework-petstore-server-fake-endpoints.sh index 07504c40d8d1..21e24f308c81 100755 --- a/bin/java-play-framework-petstore-server-fake-endpoints.sh +++ b/bin/java-play-framework-petstore-server-fake-endpoints.sh @@ -31,4 +31,4 @@ ags="generate -t modules/openapi-generator/src/main/resources/JavaPlayFramework java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml samples/server/petstore/java-play-framework-fake-endpoints/pom.xml +cp CI/samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml samples/server/petstore/java-play-framework-fake-endpoints/pom.xml diff --git a/bin/java-play-framework-petstore-server-no-bean-validation.sh b/bin/java-play-framework-petstore-server-no-bean-validation.sh index 8eb083089e85..044d8354ca87 100755 --- a/bin/java-play-framework-petstore-server-no-bean-validation.sh +++ b/bin/java-play-framework-petstore-server-no-bean-validation.sh @@ -31,4 +31,4 @@ ags="$@ generate -t modules/openapi-generator/src/main/resources/JavaPlayFramewo java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml samples/server/petstore/java-play-framework-no-bean-validation/pom.xml \ No newline at end of file +cp CI/samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml samples/server/petstore/java-play-framework-no-bean-validation/pom.xml diff --git a/bin/java-play-framework-petstore-server-no-exception-handling.sh b/bin/java-play-framework-petstore-server-no-exception-handling.sh index 430d083a2599..1c64272c0fc8 100755 --- a/bin/java-play-framework-petstore-server-no-exception-handling.sh +++ b/bin/java-play-framework-petstore-server-no-exception-handling.sh @@ -31,4 +31,4 @@ ags="$@ generate -t modules/openapi-generator/src/main/resources/JavaPlayFramewo java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml samples/server/petstore/java-play-framework-no-exception-handling/pom.xml \ No newline at end of file +cp CI/samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml samples/server/petstore/java-play-framework-no-exception-handling/pom.xml diff --git a/bin/java-play-framework-petstore-server-no-interface.sh b/bin/java-play-framework-petstore-server-no-interface.sh index 71ddf06c541e..4d0ff100ee2a 100755 --- a/bin/java-play-framework-petstore-server-no-interface.sh +++ b/bin/java-play-framework-petstore-server-no-interface.sh @@ -31,4 +31,4 @@ ags="$@ generate -t modules/openapi-generator/src/main/resources/JavaPlayFramewo java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework-no-interface/pom.xml samples/server/petstore/java-play-framework-no-interface/pom.xml \ No newline at end of file +cp CI/samples.ci/server/petstore/java-play-framework-no-interface/pom.xml samples/server/petstore/java-play-framework-no-interface/pom.xml diff --git a/bin/java-play-framework-petstore-server-no-swagger-ui.sh b/bin/java-play-framework-petstore-server-no-swagger-ui.sh index 7bec978d67b5..433b2753a45e 100755 --- a/bin/java-play-framework-petstore-server-no-swagger-ui.sh +++ b/bin/java-play-framework-petstore-server-no-swagger-ui.sh @@ -31,4 +31,4 @@ ags="$@ generate -t modules/openapi-generator/src/main/resources/JavaPlayFramewo java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml samples/server/petstore/java-play-framework-no-swagger-ui/pom.xml \ No newline at end of file +cp CI/samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml samples/server/petstore/java-play-framework-no-swagger-ui/pom.xml diff --git a/bin/java-play-framework-petstore-server-no-wrap-calls.sh b/bin/java-play-framework-petstore-server-no-wrap-calls.sh index 28b58355b9fc..0457396136e5 100755 --- a/bin/java-play-framework-petstore-server-no-wrap-calls.sh +++ b/bin/java-play-framework-petstore-server-no-wrap-calls.sh @@ -31,4 +31,4 @@ ags="$@ generate -t modules/openapi-generator/src/main/resources/JavaPlayFramewo java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml samples/server/petstore/java-play-framework-no-wrap-calls/pom.xml \ No newline at end of file +cp CI/samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml samples/server/petstore/java-play-framework-no-wrap-calls/pom.xml diff --git a/bin/java-play-framework-petstore-server.sh b/bin/java-play-framework-petstore-server.sh index 207aa6ec6daf..39994f9a79bf 100755 --- a/bin/java-play-framework-petstore-server.sh +++ b/bin/java-play-framework-petstore-server.sh @@ -31,4 +31,4 @@ ags="generate -t modules/openapi-generator/src/main/resources/JavaPlayFramework java $JAVA_OPTS -jar $executable $ags -cp samples.ci/server/petstore/java-play-framework/pom.xml samples/server/petstore/java-play-framework/pom.xml \ No newline at end of file +cp CI/samples.ci/server/petstore/java-play-framework/pom.xml samples/server/petstore/java-play-framework/pom.xml diff --git a/bin/kotlin-client-string.sh b/bin/kotlin-client-string.sh index 8df299339657..8976de9dfdbd 100755 --- a/bin/kotlin-client-string.sh +++ b/bin/kotlin-client-string.sh @@ -31,4 +31,4 @@ ags="generate -t modules/openapi-generator/src/main/resources/kotlin-client -i m java ${JAVA_OPTS} -jar ${executable} ${ags} -cp samples.ci/client/petstore/kotlin-string/pom.xml samples/client/petstore/kotlin-string/pom.xml \ No newline at end of file +cp CI/samples.ci/client/petstore/kotlin-string/pom.xml samples/client/petstore/kotlin-string/pom.xml diff --git a/bin/kotlin-client-threetenbp.sh b/bin/kotlin-client-threetenbp.sh index 395ebca14cf4..66a4bd954590 100755 --- a/bin/kotlin-client-threetenbp.sh +++ b/bin/kotlin-client-threetenbp.sh @@ -31,4 +31,4 @@ ags="generate -t modules/openapi-generator/src/main/resources/kotlin-client -i m java ${JAVA_OPTS} -jar ${executable} ${ags} -cp samples.ci/client/petstore/kotlin-threetenbp/pom.xml samples/client/petstore/kotlin-threetenbp/pom.xml +cp CI/samples.ci/client/petstore/kotlin-threetenbp/pom.xml samples/client/petstore/kotlin-threetenbp/pom.xml diff --git a/bin/kotlin-server-petstore.sh b/bin/kotlin-server-petstore.sh index 0bd084a085b4..b5317ca80dfe 100755 --- a/bin/kotlin-server-petstore.sh +++ b/bin/kotlin-server-petstore.sh @@ -31,4 +31,4 @@ ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml java ${JAVA_OPTS} -jar ${executable} ${ags} -cp samples.ci/server/petstore/kotlin-server/ktor/pom.xml samples/server/petstore/kotlin-server/ktor/pom.xml +cp CI/samples.ci/server/petstore/kotlin-server/ktor/pom.xml samples/server/petstore/kotlin-server/ktor/pom.xml diff --git a/circle.yml b/circle.yml index 356611b3ad6c..93321ef349c9 100644 --- a/circle.yml +++ b/circle.yml @@ -8,8 +8,8 @@ machine: hosts: petstore.swagger.io: 127.0.0.1 environment: - DOCKER_GENERATOR_IMAGE_NAME: swaggerapi/openapi-generator - DOCKER_CODEGEN_CLI_IMAGE_NAME: swaggerapi/openapi-generator-cli + DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator + DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli dependencies: cache_directories: @@ -29,7 +29,7 @@ dependencies: # show host table to confirm petstore.swagger.io is mapped to localhost - cat /etc/hosts override: - - cp pom.xml.circleci pom.xml + - cp CI/pom.xml.circleci pom.xml test: override: @@ -42,7 +42,7 @@ test: ## test with jdk7 - sudo update-java-alternatives -s java-1.7.0-openjdk-amd64 - java -version - - cp pom.xml.circleci.java7 pom.xml # use jdk7 pom + - cp CI/pom.xml.circleci.java7 pom.xml # use jdk7 pom - mvn clean install - mvn -q verify -Psamples # skip the rest if previous mvn task fails diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 77ed6817b014..df6110365d92 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -123,7 +123,7 @@ net.revelc.code formatter-maven-plugin - + ${project.basedir}${file.separator}${project.parent.relativePath}${file.separator}eclipse-formatter.xml diff --git a/pom.xml b/pom.xml index 930a59f73e58..a0c2ff1cbd98 100644 --- a/pom.xml +++ b/pom.xml @@ -10,11 +10,11 @@ pom openapi-generator-project 3.0.0-SNAPSHOT - https://github.com/openapi-tools/openapi-generator + https://github.com/openapitools/openapi-generator - scm:git:git@github.com:openapi-tools/openapi-generator.git - scm:git:git@github.com:openapi-tools/openapi-generator.git - https://github.com/openapi-tools/openapi-generator + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://github.com/openapitools/openapi-generator @@ -58,7 +58,7 @@ github - https://github.com/openapi-tools/openapi-generator/issues + https://github.com/openapitools/openapi-generator/issues @@ -195,7 +195,7 @@ development ${project.url} ${project.version} - org.openapi-tools + org.openapitools @@ -538,30 +538,6 @@ samples/client/petstore/scala - - objc-client - - - env - objc - - - - samples/client/petstore/objc/default/SwaggerClientTests - - - - swift-client - - - env - swift - - - - samples/client/petstore/swift/default/SwaggerClientTests - - java-msf4j-server diff --git a/shippable.yml b/shippable.yml index bb3e645c8b49..2795fa6d18d4 100644 --- a/shippable.yml +++ b/shippable.yml @@ -25,7 +25,7 @@ build: - elixir --version - mix --version # test samples defined in pom.xml - - cp pom.xml.shippable pom.xml + - cp CI/pom.xml.shippable pom.xml - mvn clean install - mvn verify -P samples # generate all petstore sampless (client, servers, doc)