瀏覽代碼

javax.servlet compileOnly remove

javax.servlet-api
MaxKey 4 年之前
父節點
當前提交
c47e5f2009

+ 2 - 3
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'

+ 0 - 2
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

+ 0 - 2
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

+ 0 - 2
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

+ 1 - 1
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