diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 417f34349f25..98052b055f5d 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -12,6 +12,7 @@ if [ "$NODE_INDEX" = "1" ]; then #cp CI/pom.xml.circleci pom.xml java -version mvn --quiet verify -Psamples.circleci + mvn --quiet javadoc:javadoc -Psamples.circleci # generate all petstore samples (client, servers, doc) ./bin/run-all-petstore diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index 6ca2e18a7cd6..08462012dd62 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -161,3 +161,7 @@ dependencies { {{/java8}} testCompile "junit:junit:$junit_version" } + +javadoc { + options.tags = [ "http.response.details:a:Http Response Details" ] +} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index d8b553a434a6..a6b6d039f806 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -170,17 +170,17 @@ jar - - - - http.response.details - a - Http Response Details: - - - + + + + http.response.details + a + Http Response Details: + + + org.apache.maven.plugins diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache index cb0e972ae376..f255d0123c8e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache @@ -143,3 +143,7 @@ dependencies { {{/threetenbp}} testCompile 'junit:junit:4.12' } + +javadoc { + options.tags = [ "http.response.details:a:Http Response Details" ] +} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index 6ac73ccff69d..7aa9c2c8a84d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -149,17 +149,17 @@ jar - - - - http.response.details - a - Http Response Details: - - - + + + + http.response.details + a + Http Response Details: + + + org.apache.maven.plugins diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/config/appconfig.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/config/appconfig.mustache index 67d99d563e85..d5c60cde0d86 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/config/appconfig.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/config/appconfig.mustache @@ -87,7 +87,7 @@ public class AppConfig extends WebMvcConfigurerAdapter { * .exposedHeaders("header1", "header2") * .allowCredentials(false).maxAge(3600); * - * @return + * @return a new WebMvcConfigurer instance */ @Bean public WebMvcConfigurer corsConfigurer() { diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/security/oAuth2SecurityConfiguration.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/security/oAuth2SecurityConfiguration.mustache index a84cd0ba5792..35d965a64652 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/security/oAuth2SecurityConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/security/oAuth2SecurityConfiguration.mustache @@ -18,7 +18,7 @@ import org.springframework.security.oauth2.provider.request.DefaultOAuth2Request import org.springframework.security.oauth2.provider.token.TokenStore; import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore; /** - * Provides a convenient base class for creating a {@link WebSecurityConfigurer} + * Provides a convenient base class for creating a WebSecurityConfigurer * instance. The implementation allows customization by overriding methods. * * @see EnableWebSecurity diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/security/resourceServerConfiguration.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/security/resourceServerConfiguration.mustache index 654fa1489106..4377494ec2d3 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/security/resourceServerConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/security/resourceServerConfiguration.mustache @@ -10,7 +10,7 @@ import org.springframework.http.HttpMethod; /** * Configurer class for @EnableResourceServer classes. This class adjust the access * rules and paths that are protected by OAuth2 security. If more than one configures the same property, then the last - * one wins. The configurers are sorted by {@link Order} before being applied. + * one wins. The configurers are sorted by Order before being applied. * * @author pkmst * diff --git a/samples/client/petstore/java/jersey2-java6/pom.xml b/samples/client/petstore/java/jersey2-java6/pom.xml index cb62cae054d3..8a80c6c15874 100644 --- a/samples/client/petstore/java/jersey2-java6/pom.xml +++ b/samples/client/petstore/java/jersey2-java6/pom.xml @@ -151,17 +151,17 @@ jar - - - - http.response.details - a - Http Response Details: - - - + + + + http.response.details + a + Http Response Details: + + + org.apache.maven.plugins diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index 68c097290421..5966274ea714 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -112,3 +112,7 @@ dependencies { compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" testCompile "junit:junit:$junit_version" } + +javadoc { + options.tags = [ "http.response.details:a:Http Response Details" ] +} diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml index 204ead7705de..75381cb9defd 100644 --- a/samples/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/client/petstore/java/jersey2-java8/pom.xml @@ -151,17 +151,17 @@ jar - - - - http.response.details - a - Http Response Details: - - - + + + + http.response.details + a + Http Response Details: + + + org.apache.maven.plugins diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle index fb535b4e085f..22f7fde908b7 100644 --- a/samples/client/petstore/java/jersey2/build.gradle +++ b/samples/client/petstore/java/jersey2/build.gradle @@ -114,3 +114,7 @@ dependencies { compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" } + +javadoc { + options.tags = [ "http.response.details:a:Http Response Details" ] +} diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml index 60ace064510a..51899df37ed3 100644 --- a/samples/client/petstore/java/jersey2/pom.xml +++ b/samples/client/petstore/java/jersey2/pom.xml @@ -151,17 +151,17 @@ jar - - - - http.response.details - a - Http Response Details: - - - + + + + http.response.details + a + Http Response Details: + + + org.apache.maven.plugins diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle index 229b37b48cc3..bef53f362595 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle @@ -108,3 +108,7 @@ dependencies { compile 'org.threeten:threetenbp:1.3.5' testCompile 'junit:junit:4.12' } + +javadoc { + options.tags = [ "http.response.details:a:Http Response Details" ] +} diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml index 4b08da3941bb..2f7acab2c8d9 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml @@ -142,17 +142,17 @@ jar - - - - http.response.details - a - Http Response Details: - - - + + + + http.response.details + a + Http Response Details: + + + org.apache.maven.plugins diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle index 0206cad9df47..72c122a5169b 100644 --- a/samples/client/petstore/java/okhttp-gson/build.gradle +++ b/samples/client/petstore/java/okhttp-gson/build.gradle @@ -108,3 +108,7 @@ dependencies { compile 'org.threeten:threetenbp:1.3.5' testCompile 'junit:junit:4.12' } + +javadoc { + options.tags = [ "http.response.details:a:Http Response Details" ] +} diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml index afc09099f672..733a77dee406 100644 --- a/samples/client/petstore/java/okhttp-gson/pom.xml +++ b/samples/client/petstore/java/okhttp-gson/pom.xml @@ -142,17 +142,17 @@ jar - - - - http.response.details - a - Http Response Details: - - - + + + + http.response.details + a + Http Response Details: + + + org.apache.maven.plugins diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/AppConfig.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/AppConfig.java index ba323306ce02..15f77addf672 100644 --- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/AppConfig.java +++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/AppConfig.java @@ -20,7 +20,7 @@ public class AppConfig extends WebMvcConfigurerAdapter { * .exposedHeaders("header1", "header2") * .allowCredentials(false).maxAge(3600); * - * @return + * @return a new WebMvcConfigurer instance */ @Bean public WebMvcConfigurer corsConfigurer() { diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/security/OAuth2SecurityConfiguration.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/security/OAuth2SecurityConfiguration.java index ed96778f0699..0c905a194178 100644 --- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/security/OAuth2SecurityConfiguration.java +++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/security/OAuth2SecurityConfiguration.java @@ -18,7 +18,7 @@ import org.springframework.security.oauth2.provider.token.TokenStore; import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore; /** - * Provides a convenient base class for creating a {@link WebSecurityConfigurer} + * Provides a convenient base class for creating a WebSecurityConfigurer * instance. The implementation allows customization by overriding methods. * * @see EnableWebSecurity diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/security/ResourceServerConfiguration.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/security/ResourceServerConfiguration.java index a45c1f356475..00d7467edefd 100644 --- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/security/ResourceServerConfiguration.java +++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/security/ResourceServerConfiguration.java @@ -10,7 +10,7 @@ /** * Configurer class for @EnableResourceServer classes. This class adjust the access * rules and paths that are protected by OAuth2 security. If more than one configures the same property, then the last - * one wins. The configurers are sorted by {@link Order} before being applied. + * one wins. The configurers are sorted by Order before being applied. * * @author pkmst *