Merge branch 'BAEL-633' of https://github.com/tomekl007/tutorials into BAEL-633

2017-02-22 15:37:53 +01:00 · 2017-02-22 15:37:53 +01:00 · 52417b5e62
parent 3962ef4ffa ed4ccd92f7
commit 52417b5e62
1 changed files with 7 additions and 1 deletions
--- a/spring-mvc-xml/pom.xml
+++ b/spring-mvc-xml/pom.xml
@ -116,7 +116,13 @@
            <groupId>com.maxmind.geoip2</groupId>
            <artifactId>geoip2</artifactId>
            <version>${geoip2.version}</version>
-    </dependency>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
    </dependencies>

    <build>