diff --git a/.gitignore b/.gitignore index 92bc54302..6ef0e036e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,8 @@ # Compiled class file #.gitignore *.class -bin/* */bin/* - -/.gradle/ -.gradle/* +bin/* /.gradle/* # Log file @@ -13,14 +10,13 @@ bin/* *.log.* */logs/* -jdk/* + */jdk/* +*/.settings/* - -org/apache/mybatis/jpa/* */org/apache/mybatis/jpa/* -/build/ -build/* */build/* +build/* +maxkey*/build/libs/* diff --git a/build.gradle b/build.gradle index 899870fab..66d2b633b 100644 --- a/build.gradle +++ b/build.gradle @@ -300,7 +300,7 @@ subprojects { compile fileTree(dir: "${rootDir}/maxkey-lib/", include: '*/*.jar') 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.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' //compile group: 'javax.el', name: 'javax.el-api', version: '3.0.0'