diff --git a/build.gradle b/build.gradle index c82a69f51fe98b654e1a9de3b0e0f75584c3ae58..574bd8c0037cd2855bfd685bdfe69b027577506f 100644 --- a/build.gradle +++ b/build.gradle @@ -267,6 +267,8 @@ subprojects { // https://mvnrepository.com/artifact/org.eclipse.persistence/javax.persistence // for mybatis-jpa-extra implementation group: 'org.eclipse.persistence', name: 'javax.persistence', version: "${javaxpersistenceVersion}" + implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: "${jakartaannotationVersion}" + implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: "${jakartavalidationapiVersion}" implementation group: 'javax.activation', name: 'activation', version: "${activationVersion}" implementation group: 'javax.annotation', name: 'javax.annotation-api', version: "${javaxannotationapiVersion}" implementation group: 'javax.transaction', name: 'jta', version: "${jtaVersion}" diff --git a/gradle.properties b/gradle.properties index ec40a9557bf4ee4ce262bbf255e192348dd12c2e..7fb8ea5c8d8b57ffc6892a478d9d7e6b21e5a1e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -83,7 +83,8 @@ thymeleafVersion =3.0.12.RELEASE springbootadminVersion =2.5.0 nettyVersion =4.1.66.Final hazelcastVersion =4.2.2 -jakartaannotationVersion =2.0.0 +jakartaannotationVersion =3.0.0 +jakartavalidationapiVersion =3.0.0 attoparserVersion =2.0.5.RELEASE unbescapeVersion =1.1.6.RELEASE jhlabsfiltersVersion =2.0.235-1 diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml index 2c3e8bd3a2e0e03e4da4cf0a505e092eec21159b..15cd4d91c09c31360bdeb7891a43b631879595df 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml @@ -24,7 +24,6 @@ from mxk_userinfo where online = 1 and now() - lastlogintime between 1 and 10000 - and lastlogintime > lastlogofftime