From fc66a52232b12dc9478d6346965185626172f9a5 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sun, 21 Jan 2024 17:36:56 -0800
Subject: [PATCH] More fixes

---
 pom.xml                                       |  5 --
 wise-webapp/pom.xml                           | 58 +++++--------------
 .../src/main/resources/application.properties |  6 +-
 .../resources/{data-hsqldb.sql => data.sql}   |  0
 .../{schema-hsqldb.sql => schema.sql}         |  0
 5 files changed, 17 insertions(+), 52 deletions(-)
 rename wise-webapp/src/main/resources/{data-hsqldb.sql => data.sql} (100%)
 rename wise-webapp/src/main/resources/{schema-hsqldb.sql => schema.sql} (100%)

diff --git a/pom.xml b/pom.xml
index f6a2477d..286e4f10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,11 +61,6 @@
                     <groupId>org.codehaus.mojo</groupId>
                     <version>3.0.0</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.16</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 537d1cfc..36ba177c 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -47,15 +47,22 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <optional>true</optional>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -215,46 +222,11 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.4.0</version>
-                <configuration>
-                    <warName>wisemapping</warName>
-                    <overlays>
-                        <overlay>
-                            <groupId>org.wisemapping</groupId>
-                            <artifactId>wise-ui</artifactId>
-                            <targetPath>/static/mindplot/</targetPath>
-                            <includes>
-                                <include>wisemapping-mindplot/package/dist/*</include>
-                            </includes>
-                        </overlay>
-                        <overlay>
-                            <groupId>org.wisemapping</groupId>
-                            <artifactId>wise-ui</artifactId>
-                            <targetPath>/static/webapp/</targetPath>
-                            <includes>
-                                <include>wisemapping-webapp/package/dist/*</include>
-                            </includes>
-                        </overlay>
-                    </overlays>
-                    <archiveClasses>true</archiveClasses>
-                    <packagingExcludes>
-                        WEB-INF/lib/commons-logging-*.jar,
-                    </packagingExcludes>
-                    <webResources>
-                        <resource>
-                            <directory>src/main/resources</directory>
-                            <targetPath>WEB-INF</targetPath>
-                            <includes>
-                                <include>*.wsdl</include>
-                                <include>*.xsd</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
+                <!--                <configuration>-->
+                <!--                    <jvmArguments>-->
+                <!--                        -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005-->
+                <!--                    </jvmArguments>-->
+                <!--                </configuration>-->
             </plugin>
         </plugins>
     </build>
diff --git a/wise-webapp/src/main/resources/application.properties b/wise-webapp/src/main/resources/application.properties
index 48ebe3f5..dd106d7f 100755
--- a/wise-webapp/src/main/resources/application.properties
+++ b/wise-webapp/src/main/resources/application.properties
@@ -3,9 +3,7 @@ SpringBoot Common
 ##################################################################################
 
 # JPA
-spring.datasource.initialize=true
 spring.main.allow-circular-references=true
-
 spring.jpa.open-in-view=true
 spring.jpa.hibernate.ddl-auto=none
 spring.jpa.properties.hibernate.current_session_context_class=thread
@@ -13,8 +11,7 @@ spring.jpa.properties.hibernate.format_sql=true
 spring.sql.init.mode=always
 
 # LOG
-
-logging.level.root=TRACE
+logging.level.root=INFO
 logging.level.org.apache.tomcat=INFO
 
 ##################################################################################
@@ -130,5 +127,6 @@ database.base.url=/Users/veigap/
 spring.datasource.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping
 spring.datasource.username=sa
 spring.datasource.password=
+
 spring.datasource.driver-class-name = org.hsqldb.jdbc.JDBCDriver
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect
diff --git a/wise-webapp/src/main/resources/data-hsqldb.sql b/wise-webapp/src/main/resources/data.sql
similarity index 100%
rename from wise-webapp/src/main/resources/data-hsqldb.sql
rename to wise-webapp/src/main/resources/data.sql
diff --git a/wise-webapp/src/main/resources/schema-hsqldb.sql b/wise-webapp/src/main/resources/schema.sql
similarity index 100%
rename from wise-webapp/src/main/resources/schema-hsqldb.sql
rename to wise-webapp/src/main/resources/schema.sql