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

# Conflicts:
#	services/build.gradle

build.gradle

@@ -70,9 +70,6 @@ subprojects {
         testCompile group: 'junit', name: 'junit', version: '4.11'
         testCompile group: 'junit', name: 'junit', version: '4.12'
         testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
-        testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.2.RELEASE'
-        testCompile 'javax.el:javax.el-api:3.0.0'
-
     }
 
     test {
@@ -112,6 +109,8 @@ dependencies {
     compile('org.springframework.boot:spring-boot-starter-web','org.apache.tomcat.embed:tomcat-embed-jasper'
             ,'javax.servlet:jstl')
 
+    testCompile 'javax.el:javax.el-api:3.0.0'
+    testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.3.RELEASE'
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile "org.springframework:spring-test:5.0.9.RELEASE"
     testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
@@ -140,13 +139,6 @@ testSets {
     integrationTest
 }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
 wrapper {
     gradleVersion = '5.2.1'
     distributionType = Wrapper.DistributionType.ALL