diff --git a/build.gradle b/build.gradle index 43873c3b7..e70cf4900 100644 --- a/build.gradle +++ b/build.gradle @@ -143,6 +143,7 @@ subprojects { //implementation group: 'org.apache.commons', name: 'commons-digester3', version: "${commonsdigester3Version}" //implementation group: 'commons-digester', name: 'commons-digester', version: "${commonsdigesterVersion}" implementation group: 'commons-io', name: 'commons-io', version: "${commonsioVersion}" + implementation group: 'commons-logging', name: 'commons-logging', version: "${commonsloggingVersion}" implementation group: 'commons-lang', name: 'commons-lang', version: "${commonslangVersion}" implementation group: 'org.apache.commons', name: 'commons-lang3', version: "${commonslang3Version}" implementation group: 'commons-logging', name: 'commons-logging', version: "${commonsloggingVersion}" diff --git a/gradle.properties b/gradle.properties index 90a4d0d08..b579d49a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,7 +64,7 @@ commonsdigesterVersion =2.1 commonsioVersion =2.16.1 commonslangVersion =2.6 commonslang3Version =3.14.0 -commonsloggingVersion =1.3.1 +commonsloggingVersion =1.3.5 commonspool2Version =2.12.0 commonshttpclientVersion =3.1 commonsfileuploadVersion =1.5 diff --git a/maxkey-starter/maxkey-starter-web-static/build.gradle b/maxkey-starter/maxkey-starter-web-static/build.gradle new file mode 100644 index 000000000..888156783 --- /dev/null +++ b/maxkey-starter/maxkey-starter-web-static/build.gradle @@ -0,0 +1,7 @@ + +description = "maxkey-starter-web-static" + + +dependencies { + +} \ No newline at end of file diff --git a/maxkey-commons/maxkey-core/src/main/resources/favicon.ico b/maxkey-starter/maxkey-starter-web-static/src/main/resources/favicon.ico similarity index 100% rename from maxkey-commons/maxkey-core/src/main/resources/favicon.ico rename to maxkey-starter/maxkey-starter-web-static/src/main/resources/favicon.ico diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/static/favicon.ico b/maxkey-starter/maxkey-starter-web-static/src/main/resources/static/favicon.ico similarity index 100% rename from maxkey-webs/maxkey-web-maxkey/src/main/resources/static/favicon.ico rename to maxkey-starter/maxkey-starter-web-static/src/main/resources/static/favicon.ico diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/static/jquery-3.6.0.min.js b/maxkey-starter/maxkey-starter-web-static/src/main/resources/static/jquery-3.6.0.min.js similarity index 100% rename from maxkey-webs/maxkey-web-maxkey/src/main/resources/static/jquery-3.6.0.min.js rename to maxkey-starter/maxkey-starter-web-static/src/main/resources/static/jquery-3.6.0.min.js diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/static/jquery-3.6.0.min.map b/maxkey-starter/maxkey-starter-web-static/src/main/resources/static/jquery-3.6.0.min.map similarity index 100% rename from maxkey-webs/maxkey-web-maxkey/src/main/resources/static/jquery-3.6.0.min.map rename to maxkey-starter/maxkey-starter-web-static/src/main/resources/static/jquery-3.6.0.min.map diff --git a/maxkey-webs/maxkey-gataway/build.gradle b/maxkey-webs/maxkey-gataway/build.gradle index 29ca8c11d..d82747ff8 100644 --- a/maxkey-webs/maxkey-gataway/build.gradle +++ b/maxkey-webs/maxkey-gataway/build.gradle @@ -6,6 +6,7 @@ apply plugin: 'java' dependencies { implementation project(":maxkey-commons:maxkey-common") + implementation project(":maxkey-starter:maxkey-starter-web-static") //spring-cloud gateway server implementation group: 'org.springframework.cloud', name: 'spring-cloud-gateway-server', version: "${springcloudVersion}" diff --git a/maxkey-webs/maxkey-web-maxkey/build.gradle b/maxkey-webs/maxkey-web-maxkey/build.gradle index e564e589c..b224198be 100644 --- a/maxkey-webs/maxkey-web-maxkey/build.gradle +++ b/maxkey-webs/maxkey-web-maxkey/build.gradle @@ -46,6 +46,7 @@ dependencies { implementation project(":maxkey-starter:maxkey-starter-sms") implementation project(":maxkey-starter:maxkey-starter-social") implementation project(":maxkey-starter:maxkey-starter-web") + implementation project(":maxkey-starter:maxkey-starter-web-static") implementation project(":maxkey-authentications:maxkey-authentication-core") implementation project(":maxkey-authentications:maxkey-authentication-provider") diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index cbd93945f..d8aeb034e 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -44,6 +44,7 @@ dependencies { implementation project(":maxkey-starter:maxkey-starter-otp") implementation project(":maxkey-starter:maxkey-starter-sms") implementation project(":maxkey-starter:maxkey-starter-web") + implementation project(":maxkey-starter:maxkey-starter-web-static") implementation project(":maxkey-authentications:maxkey-authentication-core") implementation project(":maxkey-authentications:maxkey-authentication-provider-mgt") diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/static/favicon.ico b/maxkey-webs/maxkey-web-mgt/src/main/resources/static/favicon.ico deleted file mode 100644 index 485a4a4ad..000000000 Binary files a/maxkey-webs/maxkey-web-mgt/src/main/resources/static/favicon.ico and /dev/null differ diff --git a/maxkey-webs/maxkey-web-openapi/build.gradle b/maxkey-webs/maxkey-web-openapi/build.gradle index ff8e8c9fa..6b462515e 100644 --- a/maxkey-webs/maxkey-web-openapi/build.gradle +++ b/maxkey-webs/maxkey-web-openapi/build.gradle @@ -43,6 +43,7 @@ dependencies { implementation project(":maxkey-starter:maxkey-starter-otp") implementation project(":maxkey-starter:maxkey-starter-sms") implementation project(":maxkey-starter:maxkey-starter-web") + implementation project(":maxkey-starter:maxkey-starter-web-static") implementation project(":maxkey-authentications:maxkey-authentication-core") implementation project(":maxkey-authentications:maxkey-authentication-provider") diff --git a/maxkey-webs/maxkey-web-openapi/src/main/resources/static/favicon.ico b/maxkey-webs/maxkey-web-openapi/src/main/resources/static/favicon.ico deleted file mode 100644 index 485a4a4ad..000000000 Binary files a/maxkey-webs/maxkey-web-openapi/src/main/resources/static/favicon.ico and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 47bab2168..8c3aa0d83 100644 --- a/settings.gradle +++ b/settings.gradle @@ -37,6 +37,7 @@ include ('maxkey-starter:maxkey-starter-otp') include ('maxkey-starter:maxkey-starter-sms') include ('maxkey-starter:maxkey-starter-social') include ('maxkey-starter:maxkey-starter-web') +include ('maxkey-starter:maxkey-starter-web-static') include ('maxkey-starter:maxkey-starter-passkey') //authentications