diff --git a/conf/logback.xml b/conf/logback.xml
index 74ae6c0..1a61aa3 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -20,9 +20,9 @@
-
-
-
+
+
+
io.sinistral.proteus.services
diff --git a/pom.xml b/pom.xml
index 64b2797..63fb7a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,9 +33,9 @@
1.8
1.8
UTF-8
- 2.8.8.1
3.0.0
1.4.13.Final
+ 2.9.6
@@ -247,35 +247,35 @@
com.fasterxml.jackson.core
jackson-annotations
- 2.9.6
+ ${version.jackson}
com.fasterxml.jackson.core
jackson-core
- 2.9.6
+ ${version.jackson}
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
- 2.9.6
+ ${version.jackson}
com.fasterxml.jackson.module
jackson-module-afterburner
- 2.9.6
+ ${version.jackson}
com.fasterxml.jackson.datatype
jackson-datatype-jdk8
- 2.9.6
+ ${version.jackson}
com.fasterxml.jackson.core
jackson-databind
- 2.9.6
+ ${version.jackson}
io.swagger
diff --git a/src/main/java/io/sinistral/proteus/ProteusApplication.java b/src/main/java/io/sinistral/proteus/ProteusApplication.java
index f844fe3..9eb9b8c 100644
--- a/src/main/java/io/sinistral/proteus/ProteusApplication.java
+++ b/src/main/java/io/sinistral/proteus/ProteusApplication.java
@@ -126,9 +126,24 @@ public void start()
return;
}
- log.info("Configuring modules...");
+ log.info("Configuring modules: " + registeredModules);
Set modules = registeredModules.stream().map(mc -> injector.getInstance(mc)).collect(Collectors.toSet());
+
+ //boolean needsMappingModule = true;
+
+// for(Module m : modules)
+// {
+// if(m.getClass().getSuperclass().equals(MappingModule.class))
+// {
+// needsMappingModule = false;
+// }
+// }
+//
+// if(needsMappingModule)
+// {
+// modules.add(injector.getInstance(MappingModule.class));
+// }
injector = injector.createChildInjector(modules);