Update gradle plugin (#2)

* update gradle plugin

* update circleci config

Author: wing328

.circleci/config.yml

@@ -71,7 +71,6 @@ commands: # a reusable command with parameters
             - ~/.cache/bower
             - ".git"
             - ~/.stack
-            - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
             - ~/R
       # save "default" cache using the key "source-v2-"
       - save_cache:
@@ -92,7 +91,7 @@ commands: # a reusable command with parameters
             - ~/.cache/bower
             - ".git"
             - ~/.stack
-            - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
+            - /home/circleci/OpenAPITools/openapi-json-schema-generator/samples/client/petstore/haskell-http-client/.stack-work
             - ~/R
       # Teardown
       #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
@@ -142,66 +141,56 @@ jobs:
   node0:
     machine:
       image: ubuntu-2004:202201-02
-    working_directory: ~/OpenAPITools/openapi-generator
+    working_directory: ~/OpenAPITools/openapi-json-schema-generator
     shell: /bin/bash --login
     environment:
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
     steps:
       - command_build_and_test:
           nodeNo: "0"
   node1:
     machine:
       image: ubuntu-2004:202201-02
-    working_directory: ~/OpenAPITools/openapi-generator
+    working_directory: ~/OpenAPITools/openapi-json-schema-generator
     shell: /bin/bash --login
     environment:
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
     steps:
       - command_build_and_test:
           nodeNo: "1"
   node2:
     machine:
       image: ubuntu-2004:202201-02
-    working_directory: ~/OpenAPITools/openapi-generator
+    working_directory: ~/OpenAPITools/openapi-json-schema-generator
     shell: /bin/bash --login
     environment:
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
     steps:
       - command_build_and_test:
           nodeNo: "2"
   node3:
     machine:
       image: ubuntu-2004:202201-02
-    working_directory: ~/OpenAPITools/openapi-generator
+    working_directory: ~/OpenAPITools/openapi-json-schema-generator
     shell: /bin/bash --login
     environment:
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
     steps:
       - checkout
       - command_build_and_test:
           nodeNo: "3"
   node4:
     docker:
       - image: fkrull/multi-python
-    working_directory: ~/OpenAPITools/openapi-generator
+    working_directory: ~/OpenAPITools/openapi-json-schema-generator
     shell: /bin/bash --login
     environment:
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
     steps:
       - checkout
       - command_docker_build_and_test:

CI/circle_parallel.sh

@@ -19,31 +19,11 @@ function cleanup {
 trap cleanup EXIT
 
 if [ "$NODE_INDEX" = "1" ]; then
-  echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
-  java -version
-
-  mvn --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  echo "Running node $NODE_INDEX"
 
 elif [ "$NODE_INDEX" = "2" ]; then
-  echo "Running node $NODE_INDEX to test Go"
-  # install haskell
-  #curl -sSLk https://get.haskellstack.org/ | sh
-  #stack upgrade
-  #stack --version
-
-  # install curl
-  #sudo apt-get -y build-dep libcurl4-gnutls-dev
-  #sudo apt-get -y install libcurl4-gnutls-dev
-
-  # Install golang version 1.14
-  go version
-  sudo mkdir /usr/local/go1.14
-  wget -c https://dl.google.com/go/go1.14.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local/go1.14
-  export PATH="/usr/local/go1.14/go/bin:$PATH"
-  go version
-
-  # run integration tests
-  mvn --no-snapshot-updates --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+  echo "Running node $NODE_INDEX"
+
 elif [ "$NODE_INDEX" = "3" ]; then
 
   echo "Running node $NODE_INDEX to test 'samples.circleci.node3' defined in pom.xml ..."
@@ -83,11 +63,8 @@ elif [ "$NODE_INDEX" = "4" ]; then
   (cd samples/openapi3/client/3_0_3_unit_test/python && make test)
 
 else
-  echo "Running node $NODE_INDEX to test 'samples.circleci.others' defined in pom.xml ..."
-  java -version
+  echo "Running node $NODE_INDEX"
 
-  mvn --no-snapshot-updates --quiet verify -Psamples.circleci.others -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-  mvn --no-snapshot-updates --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 fi
 
 

modules/openapi-json-schema-generator-gradle-plugin/README.adoc

@@ -97,7 +97,7 @@ task validateGoodSpec(type: org.openapitools.generator.gradle.plugin.tasks.Valid
 [source,group]
 ----
 plugins {
-  id "org.openapi.generator" version "6.1.0"
+  id "org.openapi.json-schema-generator" version "1.0.0"
 }
 ----
 
@@ -113,11 +113,11 @@ buildscript {
     // url "https://plugins.gradle.org/m2/"
   }
   dependencies {
-    classpath "org.openapitools:openapi-generator-gradle-plugin:6.1.0"
+    classpath "org.openapitools:openapi-json-schema-generator-gradle-plugin:6.1.0"
   }
 }
 
-apply plugin: 'org.openapi.generator'
+apply plugin: 'org.openapi.json-schema-generator'
 ----
 //# /RELEASE_VERSION
 
@@ -272,7 +272,7 @@ apply plugin: 'org.openapi.generator'
 |gitRepoId
 |String
 |None
-|Git repo ID, e.g. openapi-generator.
+|Git repo ID, e.g. openapi-json-schema-generator.
 
 |releaseNote
 |String
@@ -347,7 +347,7 @@ apply plugin: 'org.openapi.generator'
 |configOptions
 |Map(String,String)
 |None
-|A map of options specific to a generator. To see the full list of generator-specified parameters, please refer to [generators docs](https://github.com/OpenAPITools/openapi-generator/blob/master/docs/generators.md). Note that any config options from a generator specific document may go here, and some generators may duplicate other options which are siblings to `configOptions`.
+|A map of options specific to a generator. To see the full list of generator-specified parameters, please refer to [generators docs](https://github.com/OpenAPITools/openapi-json-schema-generator/blob/master/docs/generators.md). Note that any config options from a generator specific document may go here, and some generators may duplicate other options which are siblings to `configOptions`.
 
 |logToStderr
 |Boolean
@@ -565,18 +565,18 @@ BUILD SUCCESSFUL in 0s
 [source,groovy]
 ----
 openApiValidate {
-   inputSpec = "/src/openapi-generator/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
+   inputSpec = "/src/openapi-json-schema-generator/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml"
    recommend = true
 }
 ----
 
 .Example output of openApiValidate task (success)
 [source,terminal]
 ----
-$ ./gradlew openApiValidate --input=/Users/jim/projects/openapi-generator/modules/openapi-generator/src/test/resources/3_0/ping.yaml
+$ ./gradlew openApiValidate --input=/Users/jim/projects/openapi-json-schema-generator/modules/openapi-json-schema-generator/src/test/resources/3_0/ping.yaml
 
 > Task :openApiValidate
-Validating spec /Users/jim/projects/openapi-generator/modules/openapi-generator/src/test/resources/3_0/ping.yaml
+Validating spec /Users/jim/projects/openapi-json-schema-generator/modules/openapi-json-schema-generator/src/test/resources/3_0/ping.yaml
 Spec is valid.
 
 BUILD SUCCESSFUL in 0s
@@ -589,7 +589,7 @@ BUILD SUCCESSFUL in 0s
 $ ./gradlew openApiValidate
 
 > Task :openApiValidate FAILED
-Validating spec /Users/jim/projects/openapi-generator/modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+Validating spec /Users/jim/projects/openapi-json-schema-generator/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
 
 Spec is invalid.
 Issues:
@@ -613,13 +613,13 @@ Run with --stacktrace option to get the stack trace. Run with --info or --debug
 .in terminal (alternate)
 [source,terminal]
 ----
-$ ./gradlew openApiValidate --input=/Users/jim/projects/openapi-generator/modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+$ ./gradlew openApiValidate --input=/Users/jim/projects/openapi-json-schema-generator/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
 ----
 
 === Generate multiple sources
 
 If you want to perform multiple generation tasks, you'd want to create a task that inherits from the `GenerateTask`.
-Examples can be found in https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle[samples/local-spec/build.gradle].
+Examples can be found in https://github.com/OpenAPITools/openapi-json-schema-generator/blob/master/modules/openapi-json-schema-generator-gradle-plugin/samples/local-spec/build.gradle[samples/local-spec/build.gradle].
 
 You can define any number of generator tasks; the generated code does _not_ need to be a JVM language.
 
@@ -682,7 +682,7 @@ You can run `gradle tasks --debug` to see this registration.
 
 === Android Studio
 
-Android Studio may experience a Windows-specific Guava dependency conflict with openapi-generator-gradle-plugin versions greater than 3.0.0.
+Android Studio may experience a Windows-specific Guava dependency conflict with openapi-json-schema-generator-gradle-plugin versions greater than 3.0.0.
 
 As a workaround, you may force exclude conflicting Guava dependencies.
 
@@ -695,7 +695,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath('org.openapitools:openapi-generator-gradle-plugin:6.1.0') {
+        classpath('org.openapitools:openapi-json-schema-generator-gradle-plugin:1.0.0') {
             exclude group: 'com.google.guava'
         }
     }
@@ -706,7 +706,7 @@ configurations {
     compile.exclude module: 'guava-jdk5'
 }
 // …
-apply plugin: 'org.openapi.generator'
+apply plugin: 'org.openapi.json-schema-generator'
 ```
 //# /RELEASE_VERSION
 

modules/openapi-json-schema-generator-gradle-plugin/build.gradle

@@ -59,7 +59,7 @@ repositories {
 dependencies {
     compile gradleApi()
     // Shared OpenAPI Generator version be passed via command line arg as -PopenApiGeneratorVersion=VERSION
-    compile "org.openapitools:openapi-generator:$openApiGeneratorVersion"
+    compile "org.openapitools:openapi-json-schema-generator:$openApiGeneratorVersion"
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     testCompile 'org.testng:testng:6.9.6',
@@ -109,9 +109,9 @@ publishing {
             artifact sourcesJar
             artifact javadocJar
             pom {
-                name = 'OpenAPI-Generator Contributors'
+                name = 'openapi-json-schema-generator Contributors'
                 description = project.description
-                url = 'https://openapi-generator.tech'
+                url = 'https://github.com/OpenAPITools/openapi-json-schema-generator'
                 organization {
                     name = 'org.openapitools'
                     url = 'https://github.com/OpenAPITools'
@@ -126,18 +126,18 @@ publishing {
                 developers {
                     developer {
                         id = "openapitools"
-                        name = "OpenAPI-Generator Contributors"
+                        name = "openapi-json-schema-generator Contributors"
                         email = "team@openapitools.org"
                     }
                 }
                 scm {
-                    url = 'https://github.com/OpenAPITools/openapi-generator'
-                    connection = 'scm:git:git://github.com/OpenAPITools/openapi-generator.git'
-                    developerConnection = 'scm:git:ssh://git@github.com:OpenAPITools/openapi-generator.git'
+                    url = 'https://github.com/OpenAPITools/openapi-json-schema-generator'
+                    connection = 'scm:git:git://github.com/OpenAPITools/openapi-json-schema-generator.git'
+                    developerConnection = 'scm:git:ssh://git@github.com:OpenAPITools/openapi-json-schema-generator.git'
                 }
                 issueManagement {
                     system = 'GitHub'
-                    url = 'https://github.com/OpenAPITools/openapi-generator/issues'
+                    url = 'https://github.com/OpenAPITools/openapi-json-schema-generator/issues'
                 }
             }
         }
@@ -157,23 +157,23 @@ nexusPublishing {
 gradlePlugin {
     plugins {
         openApiGenerator {
-            id = 'org.openapi.generator'
+            id = 'org.openapi.json-schema-generator'
             implementationClass = 'org.openapitools.generator.gradle.plugin.OpenApiGeneratorPlugin'
         }
     }
 }
 
 pluginBundle {
     // These settings are set for the whole plugin bundle
-    website = 'https://openapi-generator.tech/'
-    vcsUrl = 'https://github.com/OpenAPITools/openapi-generator'
+    website = 'https://github.com/OpenAPITools/openapi-json-schema-generator'
+    vcsUrl = 'https://github.com/OpenAPITools/openapi-json-schema-generator'
     description = 'OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)'
 
     plugins {
         // first plugin
         openApiGenerator {
-            id = 'org.openapi.generator'
-            displayName = 'OpenAPI Generator Gradle Plugin'
+            id = 'org.openapi.json-schema-generator'
+            displayName = 'OpenAPI Json Sshema Generator Gradle Plugin'
             tags = ['openapi-3.0', 'openapi-2.0', 'openapi', 'swagger', 'codegen', 'sdk']
             version = "$openApiGeneratorVersion"
             group = "org.openapitools"

modules/openapi-json-schema-generator-gradle-plugin/samples/local-spec/README.md

@@ -2,7 +2,7 @@
 
 This example assumes you have Gradle 6.8.3+ installed. No gradle wrapper is provided in samples.
 
-First, publish the openapi-generator-gradle-plugin locally via `./gradlew assemble publishToMavenLocal` in the module directory.
+First, publish the openapi-json-schema-generator-gradle-plugin locally via `./gradlew assemble publishToMavenLocal` in the module directory.
 
 Then, run the following tasks in this example directory.
 

modules/openapi-json-schema-generator-gradle-plugin/samples/local-spec/build.gradle

@@ -14,11 +14,11 @@ buildscript {
     }
     dependencies {
         // Updated version can be passed via command line arg as -PopenApiGeneratorVersion=VERSION
-        classpath "org.openapitools:openapi-generator-gradle-plugin:$openApiGeneratorVersion"
+        classpath "org.openapitools:openapi-json-schema-generator-gradle-plugin:$openApiGeneratorVersion"
     }
 }
 
-apply plugin: 'org.openapi.generator'
+apply plugin: 'org.openapi.json-schema-generator'
 
 openApiMeta {
     generatorName = "Sample"

modules/openapi-json-schema-generator-gradle-plugin/settings.gradle

@@ -1,3 +1,3 @@
-rootProject.name = 'openapi-generator-gradle-plugin'
+rootProject.name = 'openapi-json-schema-generator-gradle-plugin'
 enableFeaturePreview('STABLE_PUBLISHING')
 

modules/openapi-json-schema-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt

@@ -191,7 +191,7 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
     val gitUserId = project.objects.property<String?>()
 
     /**
-     * Git repo ID, e.g. openapi-generator.
+     * Git repo ID, e.g. openapi-json-schema-generator.
      */
     val gitRepoId = project.objects.property<String?>()