Merge branch 'master' into master

2018-07-03 21:40:13 +03:00
parent 1d94492e29 add380d17a
commit 42308063eb
1856 changed files with 33206 additions and 6443 deletions
@@ -111,6 +111,13 @@
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency> -->
+        
+        <!-- Spring data -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<version>${springFramework-data.version}</version>
+		</dependency>

    </dependencies>

@@ -132,7 +139,7 @@
                <configuration>
                    <wait>true</wait>
                    <container>
-                        <containerId>jetty8x</containerId>
+                        <containerId>jetty9x</containerId>
                        <type>embedded</type>
                        <systemProperties>
                        </systemProperties>
@@ -173,6 +180,7 @@
        <!-- spring -->
        <org.springframework-version>4.3.4.RELEASE</org.springframework-version>
        <springframework-security.version>4.2.0.RELEASE</springframework-security.version>
+        <springFramework-data.version>2.0.7.RELEASE</springFramework-data.version>
        <javax.servlet-version>3.1.0</javax.servlet-version>
        <!-- thymeleaf -->
        <org.thymeleaf-version>3.0.9.RELEASE</org.thymeleaf-version>