Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15

# Conflicts: # build.gradle # persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java # persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java # services/src/main/java/edu/msudenver/tsp/services/RestService.java # services/src/main/java/edu/msudenver/tsp/services/dto/Account.java # services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java # services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java # services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java
2019-03-20 22:15:32 -06:00
parent 860e5379e6 b15ef858b0
commit 748781f10f
43 changed files with 1972 additions and 399 deletions
@@ -23,7 +23,8 @@ dependencies {
    compile group: 'org.apache.httpcomponents', name: 'fluent-hc', version: '4.5.7'
    compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
    compile fileTree(dir: 'lib', include: '**/*.jar')
-    
+
+    testCompile "org.springframework:spring-test:5.0.9.RELEASE"
    testCompile group: 'junit', name: 'junit', version: '4.12'
    testCompile group: 'org.springframework', name: 'spring-test', version: '5.1.5.RELEASE'
 }