diff --git a/build.gradle b/build.gradle index f9057362..b4bae979 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ defaultTasks "clean", "build" ext { jackson2Version = "2.9.8" log4jVersion = "2.12.0" - springVersion = "5.2.0.RELEASE" - springBootVersion = "2.2.0.RELEASE" + springVersion = "5.1.9.RELEASE" + springBootVersion = "2.1.9.RELEASE" springSecurityVersion= "5.2.0.RELEASE" hibernateVersion = "5.4.2.Final" slf4jVersion = "1.7.26" @@ -294,8 +294,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.43' - compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.5.43' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.5.47' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.5.47' compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2' //compile group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.6.1' diff --git a/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore deleted file mode 100644 index cf1db2ee..00000000 --- a/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org/ diff --git a/maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore b/maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore deleted file mode 100644 index c2d9872a..00000000 --- a/maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/com/ diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore deleted file mode 100644 index cf1db2ee..00000000 --- a/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org/