From c47e5f2009e0c8da98e70e22580f9278b4bb430a Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sat, 17 Apr 2021 10:01:19 +0800 Subject: [PATCH] javax.servlet compileOnly remove javax.servlet-api --- build.gradle | 5 ++--- config/build_docker.gradle | 2 -- config/build_jar.gradle | 2 -- config/build_standard.gradle | 2 -- .../src/main/resources/application-https.properties | 2 +- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index d21b0603..5e02bbb5 100644 --- a/build.gradle +++ b/build.gradle @@ -123,11 +123,10 @@ subprojects { dependencies { //for Test and Compile testImplementation 'junit:junit:4.11' - compileOnly 'junit:junit:4.11' - testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' + compileOnly 'junit:junit:4.11' testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19' testImplementation group: 'xmlunit', name: 'xmlunit', version: '1.6' + //apache implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3' implementation group: 'commons-codec', name: 'commons-codec', version: '1.15' diff --git a/config/build_docker.gradle b/config/build_docker.gradle index 589a2e86..5294fb66 100644 --- a/config/build_docker.gradle +++ b/config/build_docker.gradle @@ -123,8 +123,6 @@ subprojects { //for Test and Compile testImplementation 'junit:junit:4.11' compileOnly 'junit:junit:4.11' - testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19' testImplementation group: 'xmlunit', name: 'xmlunit', version: '1.6' //apache diff --git a/config/build_jar.gradle b/config/build_jar.gradle index c66925a3..5a588ebe 100644 --- a/config/build_jar.gradle +++ b/config/build_jar.gradle @@ -123,8 +123,6 @@ subprojects { //for Test and Compile testImplementation 'junit:junit:4.11' compileOnly 'junit:junit:4.11' - testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19' testImplementation group: 'xmlunit', name: 'xmlunit', version: '1.6' //apache diff --git a/config/build_standard.gradle b/config/build_standard.gradle index d21b0603..08b4cea4 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -124,8 +124,6 @@ subprojects { //for Test and Compile testImplementation 'junit:junit:4.11' compileOnly 'junit:junit:4.11' - testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19' testImplementation group: 'xmlunit', name: 'xmlunit', version: '1.6' //apache diff --git a/maxkey-web-maxkey/src/main/resources/application-https.properties b/maxkey-web-maxkey/src/main/resources/application-https.properties index 3fd44852..ff39ac41 100644 --- a/maxkey-web-maxkey/src/main/resources/application-https.properties +++ b/maxkey-web-maxkey/src/main/resources/application-https.properties @@ -26,7 +26,7 @@ spring.servlet.multipart.max-file-size=4194304 ############################################################################ #ssl configuration # ############################################################################ -server.ssl.key-store=maxkeyserver.keystore +server.ssl.key-store=classpath:maxkeyserver.keystore server.ssl.key-alias=maxkey server.ssl.enabled=true server.ssl.key-store-password=maxkey