diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
index 9c0b6af1bcd..5193e39531a 100644
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -98,12 +98,6 @@
${jmockit-version}
test
-
- org.reflections
- reflections
- ${reflections-version}
- test
-
\ No newline at end of file
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
index 5a7c46eefeb..f7a128613b9 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
@@ -4,11 +4,7 @@ import io.airlift.airline.Command;
import io.airlift.airline.Option;
import io.swagger.codegen.CliOption;
import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.cmd.utils.CodegenConfigLoader;
-
-import java.util.ServiceLoader;
-
-import static java.util.ServiceLoader.load;
+import io.swagger.codegen.CodegenConfigLoader;
@Command(name = "config-help", description = "Config help for chosen lang")
public class ConfigHelp implements Runnable {
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java
index 9e4754f9a1d..d6790a6aa8f 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java
@@ -8,9 +8,9 @@ import io.swagger.codegen.CliOption;
import io.swagger.codegen.ClientOptInput;
import io.swagger.codegen.ClientOpts;
import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConfigLoader;
import io.swagger.codegen.CodegenConstants;
import io.swagger.codegen.DefaultGenerator;
-import io.swagger.codegen.cmd.utils.CodegenConfigLoader;
import io.swagger.codegen.cmd.utils.OptionUtils;
import io.swagger.models.Swagger;
import io.swagger.parser.SwaggerParser;
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static java.util.ServiceLoader.load;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
/**
diff --git a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java
index 2fc414e884e..94a397df700 100644
--- a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java
+++ b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java
@@ -8,7 +8,7 @@ import io.swagger.codegen.CodegenConfig;
import io.swagger.codegen.CodegenConstants;
import io.swagger.codegen.DefaultGenerator;
import io.swagger.codegen.SwaggerCodegen;
-import io.swagger.codegen.cmd.utils.CodegenConfigLoader;
+import io.swagger.codegen.CodegenConfigLoader;
import io.swagger.codegen.languages.JavaClientCodegen;
import io.swagger.models.Swagger;
import io.swagger.models.auth.AuthorizationValue;
diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
index 41737ca0968..7500fcfeb39 100644
--- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
+++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
@@ -20,6 +20,7 @@ import io.swagger.codegen.CliOption;
import io.swagger.codegen.ClientOptInput;
import io.swagger.codegen.ClientOpts;
import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConfigLoader;
import io.swagger.codegen.DefaultGenerator;
import io.swagger.models.Swagger;
import io.swagger.parser.SwaggerParser;
@@ -121,7 +122,7 @@ public class CodeGenMojo extends AbstractMojo {
public void execute() throws MojoExecutionException {
Swagger swagger = new SwaggerParser().read(inputSpec);
- CodegenConfig config = forName(language);
+ CodegenConfig config = CodegenConfigLoader.forName(language);
config.setOutputDir(output.getAbsolutePath());
if (null != templateDirectory) {
@@ -167,20 +168,4 @@ public class CodeGenMojo extends AbstractMojo {
project.addCompileSourceRoot(output.toString());
}
}
-
- private CodegenConfig forName(String name) {
- ServiceLoader loader = ServiceLoader.load(CodegenConfig.class);
- for (CodegenConfig config : loader) {
- if (config.getName().equals(name)) {
- return config;
- }
- }
-
- // else try to load directly
- try {
- return (CodegenConfig) Class.forName(name).newInstance();
- } catch (Exception e) {
- throw new RuntimeException("Can't load config class with name ".concat(name), e);
- }
- }
}
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 0f640d577ad..b6caa0a684a 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -340,6 +340,12 @@
${testng-version}
test
+
+ org.reflections
+ reflections
+ ${reflections-version}
+ test
+
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/CodegenConfigLoader.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfigLoader.java
similarity index 91%
rename from modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/CodegenConfigLoader.java
rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfigLoader.java
index 7b8e8883ca1..c578ab75912 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/CodegenConfigLoader.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfigLoader.java
@@ -1,6 +1,4 @@
-package io.swagger.codegen.cmd.utils;
-
-import io.swagger.codegen.CodegenConfig;
+package io.swagger.codegen;
import java.util.ServiceLoader;
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
index bfcbdfb1aa6..20d5aaf30c6 100644
--- a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
@@ -84,7 +84,7 @@
1.0.0
1.5.3
- 9.2.13.v20150730
+ 9.2.9.v20150224
1.0.1
4.8.2
1.6.3
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
index 9c881d47cc2..ba58d23ca7f 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
@@ -169,7 +169,7 @@
1.5.3
- 9.2.13.v20150730
+ 9.2.9.v20150224
1.18.1
1.6.3
4.8.1
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
index dad6fd88846..ffbb0e43516 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
@@ -151,7 +151,7 @@
1.5.3
- 9.2.13.v20150730
+ 9.2.9.v20150224
1.13
1.6.3
1.6.1
diff --git a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/CodegenConfigLoaderTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenConfigLoaderTest.java
similarity index 94%
rename from modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/CodegenConfigLoaderTest.java
rename to modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenConfigLoaderTest.java
index 0bfd6175f8d..b91e506a4f9 100644
--- a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/CodegenConfigLoaderTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenConfigLoaderTest.java
@@ -1,7 +1,5 @@
-package io.swagger.codegen.cmd.utils;
+package io.swagger.codegen;
-import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.DefaultCodegen;
import org.reflections.Reflections;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index e631cb789c1..dbb092e9816 100644
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@@ -271,7 +271,7 @@
1.0.0
2.5
1.3.2
- 9.2.13.v20150730
+ 9.2.9.v20150224
2.4.1
diff --git a/pom.xml b/pom.xml
index 1dd80dcb1b9..2ff111c5745 100644
--- a/pom.xml
+++ b/pom.xml
@@ -518,6 +518,6 @@
6.9.6
2.18.1
1.18
- 0.9.9
+ 0.9.10
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
index e3bb1ba541b..7b7ec1d8b3d 100644
--- a/samples/server/petstore/java-inflector/pom.xml
+++ b/samples/server/petstore/java-inflector/pom.xml
@@ -84,7 +84,7 @@
1.0.0
1.5.3
- 9.2.13.v20150730
+ 9.2.9.v20150224
1.0.1
4.8.2
1.6.3
diff --git a/samples/server/petstore/jaxrs/pom.xml b/samples/server/petstore/jaxrs/pom.xml
index 667bbd934f1..ae9f3e06162 100644
--- a/samples/server/petstore/jaxrs/pom.xml
+++ b/samples/server/petstore/jaxrs/pom.xml
@@ -169,7 +169,7 @@
1.5.3
- 9.2.13.v20150730
+ 9.2.9.v20150224
1.18.1
1.6.3
4.8.1
diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml
index 102ebbd498e..ad0b2c04acf 100644
--- a/samples/server/petstore/spring-mvc/pom.xml
+++ b/samples/server/petstore/spring-mvc/pom.xml
@@ -151,7 +151,7 @@
1.5.3
- 9.2.13.v20150730
+ 9.2.9.v20150224
1.13
1.6.3
1.6.1