diff --git a/.gitignore b/.gitignore index 310ab32cde1dee1c675585a9a0a81cf921f08205..92bc5430262a85ce7e42fb54169732b57df9bfa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ # Compiled class file #.gitignore *.class -*/bin/* bin/* -*/build/* -build/* +*/bin/* + +/.gradle/ .gradle/* /.gradle/* @@ -12,10 +12,15 @@ build/* *.log *.log.* */logs/* -*/jdk/* + jdk/* +*/jdk/* + + -*/org/apache/mybatis/jpa/* org/apache/mybatis/jpa/* -/.gradle/ +*/org/apache/mybatis/jpa/* + /build/ +build/* +*/build/* diff --git a/build.gradle b/build.gradle index b6147933fc38fbf9429f52fc3de08721573066b5..899870fab42d34f0bd602b2b86e83f49f5f195ef 100644 --- a/build.gradle +++ b/build.gradle @@ -8,9 +8,9 @@ defaultTasks "clean", "build" ext { jackson2Version = "2.9.8" log4jVersion = "2.12.0" - springVersion = "5.1.9.RELEASE" - springBootVersion = "2.1.9.RELEASE" - springSecurityVersion= "5.2.0.RELEASE" + springVersion = "5.2.2.RELEASE" + springBootVersion = "2.2.1.RELEASE" + springSecurityVersion= "5.2.1.RELEASE" hibernateVersion = "5.4.2.Final" slf4jVersion = "1.7.26" jacksonVersion = "2.9.9" @@ -299,8 +299,8 @@ subprojects { //local jars compile fileTree(dir: "${rootDir}/maxkey-lib/", include: '*/*.jar') - compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.5.47' - compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.29' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '9.0.29' //compile group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.6.1' //compile group: 'javax.el', name: 'javax.el-api', version: '3.0.0' diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl index 63eb258842779de869a9e378ec2060b92f76cf10..168e59fd6067cf756c4ebfcf52326d0242f14c7e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl @@ -125,10 +125,10 @@ $(function(){