[BAEL-9712] - Fixed conflicts

2018-11-25 00:18:37 +05:30
parent 96d121bcae 80566a89cc
commit e9fa7851a5
101 changed files with 3504 additions and 709 deletions
@@ -31,7 +31,7 @@
        </dependency>
        <dependency>
            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
        </dependency>

        <!-- oauth2 -->
@@ -64,5 +64,9 @@
            <scope>test</scope>
        </dependency>
    </dependencies>
+	
+    <properties>
+        <oauth-auto.version>2.0.5.RELEASE</oauth-auto.version>
+    </properties>

 </project>