From e917dd0c98b66ddef50dd018dcd9fd7dc0ec9ae3 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 10 May 2022 11:54:01 -0700
Subject: [PATCH] SHIBUI-2264

Backend tests updated to truncate time accuracy.
Updated JDBC libs
---
 backend/build.gradle                                     | 9 +++------
 .../shibboleth/admin/ui/domain/AbstractAuditable.java    | 7 ++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/backend/build.gradle b/backend/build.gradle
index cd9fe04fb..ad51cedb7 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -169,8 +169,8 @@ dependencies {
 
     compile "com.h2database:h2"
     runtimeOnly 'org.postgresql:postgresql:42.3.4'
-    runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:2.2.0'
-    runtimeOnly 'mysql:mysql-connector-java:8.0.28'
+    runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.0.4'
+    runtimeOnly 'mysql:mysql-connector-java:8.0.29'
 
     //Swagger
     compile 'io.springfox:springfox-swagger2:2.9.2'
@@ -180,10 +180,6 @@ dependencies {
     testImplementation platform("org.spockframework:spock-bom:2.1-groovy-3.0")
     testImplementation "org.spockframework:spock-core"
     testImplementation "org.spockframework:spock-spring"
-    //testImplementation "org.spockframework:spock-junit4"
-    //testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-    //testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-    //testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.8.2'
 
     testCompile 'org.springframework.boot:spring-boot-starter-test:2.6.7'
     testCompile 'org.springframework.security:spring-security-test:5.6.3'
@@ -224,6 +220,7 @@ dependencies {
     enversTestCompile sourceSets.test.output
     enversTestCompile configurations.compile
     enversTestCompile configurations.testCompile
+    enversTestCompile configurations.testImplementation
 
     enversTestRuntime configurations.runtime
     enversTestRuntime configurations.testRuntime
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java
index c1aed608a..0b77412d5 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java
@@ -18,8 +18,6 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
@@ -28,7 +26,6 @@
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 
-
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 @EqualsAndHashCode(exclude = {"current"})
@@ -80,7 +77,7 @@ public LocalDateTime getCreatedDate() {
 
     @Override
     public void setCreatedDate(LocalDateTime createdDate) {
-        this.createdDate = createdDate;
+        this.createdDate = createdDate == null ? null : createdDate.truncatedTo(ChronoUnit.NANOS);
     }
 
     @Override
@@ -90,7 +87,7 @@ public LocalDateTime getModifiedDate() {
 
     @Override
     public void setModifiedDate(LocalDateTime modifiedDate) {
-        this.modifiedDate = modifiedDate;
+        this.modifiedDate = modifiedDate == null ? null : modifiedDate.truncatedTo(ChronoUnit.NANOS);
     }
 
     public String getCreatedBy() {