Merge remote-tracking branch 'upstream/master' into BAEL-2809

# Conflicts: # persistence-modules/spring-data-jpa-2/pom.xml
2019-04-21 07:59:16 +03:00
parent 004b2cc5a8 b2b80c89e1
commit c0c5a64b10
28 changed files with 715 additions and 46 deletions
@@ -3,6 +3,7 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
+
    <groupId>com.baeldung</groupId>
    <artifactId>spring-data-jpa-2</artifactId>
    <name>spring-data-jpa</name>
@@ -30,6 +31,15 @@
            <artifactId>datasource-proxy</artifactId>
            <version>1.4.1</version>
        </dependency>
-    </dependencies>

+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-oxm</artifactId>
+        </dependency>
+    </dependencies>
 </project>