diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index aad0c1482..018cdda36 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -18,6 +18,7 @@ log4j 2.13.3 font-awesome 4.7.0 tomcat-embed 9.0.35 + mybatis-jpa-extra 2.1 MaxKey v 1.4.0 GA 2020/05/01 *(MAXKEY-200501) 登录错误修复 diff --git a/build.gradle b/build.gradle index 9b957c638..de90f156e 100644 --- a/build.gradle +++ b/build.gradle @@ -213,6 +213,9 @@ subprojects { compile group: 'org.javassist', name: 'javassist', version: '3.23.0-GA' compile group: 'org.owasp.esapi', name: 'esapi', version: '2.2.0.0' compile group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2' + // https://mvnrepository.com/artifact/org.eclipse.persistence/javax.persistence + // for mybatis-jpa-extra + compile group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1' compile group: 'javax.activation', name: 'activation', version: '1.1.1' compile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' compile group: 'javax.transaction', name: 'jta', version: '1.1' diff --git a/maxkey-lib/mybatis-jpa-extra-2.1-api-2.0.jar b/maxkey-lib/mybatis-jpa-extra-2.1-api-2.0.jar deleted file mode 100644 index c7e3f78d1..000000000 Binary files a/maxkey-lib/mybatis-jpa-extra-2.1-api-2.0.jar and /dev/null differ diff --git a/maxkey-lib/mybatis-jpa-extra-2.0.jar b/maxkey-lib/mybatis-jpa-extra-2.1.jar similarity index 71% rename from maxkey-lib/mybatis-jpa-extra-2.0.jar rename to maxkey-lib/mybatis-jpa-extra-2.1.jar index e6f675e41..001a26243 100644 Binary files a/maxkey-lib/mybatis-jpa-extra-2.0.jar and b/maxkey-lib/mybatis-jpa-extra-2.1.jar differ diff --git a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.0.jar b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.0.jar deleted file mode 100644 index 6064fe0a1..000000000 Binary files a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.0.jar and /dev/null differ diff --git a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.1.jar b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.1.jar new file mode 100644 index 000000000..66b59b835 Binary files /dev/null and b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.1.jar differ