hsqldb update

Author: Omur

.gitignore

@@ -357,4 +357,6 @@ jdk_8_maven/em/external/rest/spring-batch-rest/target
 /jdk_8_maven/em/external/rest/spring-actuator-demo/target
 
 /jdk_21_maven/cs/rest-gui/webgoat/target
+/jdk_21_maven/cs/rest-gui/webgoat/tmp
 /jdk_21_maven/em/embedded/rest-gui/webgoat/target
+/jdk_21_maven/em/external/rest-gui/webgoat/target

jdk_21_maven/em/embedded/rest-gui/webgoat/pom.xml

@@ -30,11 +30,6 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
             <version>2.17.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.195</version>
-        </dependency>
     </dependencies>
 
 

jdk_21_maven/em/embedded/rest-gui/webgoat/src/main/java/em/embedded/webgoat/EmbeddedEvoMasterController.java

@@ -60,17 +60,13 @@ public String startSut() {
         app.main(new String[]{
                 "--server.port=0",
                 "--spring.profiles.active=dev",
-                "--spring.datasource.driver-class-name=org.h2.Driver",
-                "--spring.datasource.url=jdbc:h2:mem:testdb;INIT=CREATE SCHEMA IF NOT EXISTS CONTAINER;DB_CLOSE_DELAY=-1;",
-                "--spring.jpa.database-platform=org.hibernate.dialect.H2Dialect",
                 "--spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true",
                 "--spring.datasource.username=sa",
                 "--spring.datasource.password",
                 "--spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=none",
                 "--spring.sql.init.mode=never"
         });
 
-
         ctx = (ConfigurableApplicationContext) app.getApplicationContext();
 
         if (sqlConnection != null) {
@@ -87,7 +83,7 @@ public String startSut() {
         } catch (SQLException e) {
             e.printStackTrace();
         }
-        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2, sqlConnection)
+        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.OTHER, sqlConnection)
                 .withInitSqlOnResourcePath("/data.sql"));
 
 
@@ -110,6 +106,13 @@ public boolean isSutRunning() {
     public void stopSut() {
         ctx.stop();
         ctx.close();
+        if (sqlConnection != null) {
+            try {
+                sqlConnection.close();
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     @Override

jdk_21_maven/em/embedded/rest-gui/webgoat/src/main/resources/data.sql

@@ -1,3 +1,6 @@
+TRUNCATE SCHEMA CONTAINER AND COMMIT
+
+
 INSERT INTO CONTAINER.WEB_GOAT_USER (PASSWORD, ROLE, USERNAME) VALUES ('testuser', 'WEBGOAT_USER', 'testuser');
 INSERT INTO CONTAINER.WEB_GOAT_USER (PASSWORD, ROLE, USERNAME) VALUES ('testuser', 'WEBGOAT_USER', 'testuser2');