From 4967a5b930c3651f72ef83ce1dc5838a3280bfe9 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sat, 1 Apr 2023 14:10:51 -0700
Subject: [PATCH] Revert spring lib update.

---
 wise-webapp/pom.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index ddef5427..e07f5909 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -13,8 +13,8 @@
     </parent>
 
     <properties>
-        <org.springframework.version>5.3.26</org.springframework.version>
-        <org.springframework.addons>5.7.7</org.springframework.addons>
+        <org.springframework.version>5.3.24</org.springframework.version>
+        <org.springframework.addons>5.7.3</org.springframework.addons>
         <hibernate.version>5.6.12.Final</hibernate.version>
         <hibernate-validator.version>6.0.21.Final</hibernate-validator.version>
         <spring-security-taglibs.version>5.6.1</spring-security-taglibs.version>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.7.0</version>
+            <version>6.9.8</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.5.4</version>
+            <version>42.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -358,7 +358,7 @@
                         <configuration>
                             <driver>com.mysql.jdbc.Driver</driver>
                             <username>root</username>
-                            <password/>
+                            <password></password>
                             <url>jdbc:mysql://127.0.0.1:3306/?useUnicode=true&amp;characterEncoding=UTF-8</url>
                             <autocommit>false</autocommit>
                             <srcFiles>
@@ -556,9 +556,11 @@
                             <useTestClasspath>true</useTestClasspath>
                             <useTestScope>true</useTestScope>
                             <scanIntervalSeconds>0</scanIntervalSeconds>
+                            <daemon>true</daemon>
                             <waitForChild>false</waitForChild>
                             <maxStartupLines>200</maxStartupLines>
-                            <jvmArgs>-Ddatabase.base.url=${project.build.directory} -Djetty.port=8080
+                            <jvmArgs>${integrationTestArgLine} -Ddatabase.base.url=${project.build.directory}
+                                -Djetty.port=8080
                             </jvmArgs>
                         </configuration>
                     </execution>
@@ -568,6 +570,9 @@
                         <goals>
                             <goal>stop</goal>
                         </goals>
+                        <configuration>
+                            <stopWait>1</stopWait>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>