Fix dependencies, migrated H2 to HSQLDB

H2 2.x is not compatible with 1.4.x, but 1.4.x has some vulnerabilities. It's easier to migrate to HSQLDB altogether. The H2 console is removed because HSQLDB does not have a console.
RADAR-base · Jan 19, 2022 · d559376 · d559376
1 parent c72b61d
commit d559376
Show file tree

Hide file tree

Showing 26 changed files with 52 additions and 90 deletions.
diff --git a/build.gradle b/build.gradle
@@ -188,7 +188,7 @@ dependencies {
     implementation "org.hibernate:hibernate-validator:7.0.1.Final"
 
     implementation "org.postgresql:postgresql:${postgresql_version}"
-    implementation "com.h2database:h2"
+    implementation "org.hsqldb:hsqldb:${hsqldb_version}"
 
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.security:spring-security-data"

diff --git a/gradle.properties b/gradle.properties
@@ -26,6 +26,7 @@ logback_version=1.2.10
 oauth_jwt_version=3.18.3
 junit_version=5.8.2
 okhttp_version=4.9.3
+hsqldb_version=2.6.1
 
 kotlin.code.style=official
 org.gradle.vfs.watch=true

diff --git a/proxy.conf.json b/proxy.conf.json
@@ -6,8 +6,7 @@
             "/management",
             "/api-docs",
             "/swagger-ui.html",
-            "/swagger-ui",
-            "/h2-console"
+            "/swagger-ui"
         ],
         "target": "http://127.0.0.1:8080",
         "secure": false

diff --git a/src/main/java/org/radarbase/management/config/DatabaseConfiguration.java b/src/main/java/org/radarbase/management/config/DatabaseConfiguration.java
@@ -2,14 +2,12 @@
 
 import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
 import liquibase.integration.spring.SpringLiquibase;
-import org.h2.tools.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Profiles;
 import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
@@ -19,7 +17,6 @@
 import tech.jhipster.config.JHipsterConstants;
 
 import javax.sql.DataSource;
-import java.sql.SQLException;
 
 @Configuration
 @EnableJpaRepositories(basePackages = "org.radarbase.management.repository",
@@ -33,18 +30,6 @@ public class DatabaseConfiguration {
     @Autowired
     private Environment env;
 
-    /**
-     * Open the TCP port for the H2 database, so it is available remotely.
-     *
-     * @return the H2 database TCP server
-     * @throws SQLException if the server failed to start
-     */
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    @Profile(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)
-    public Server h2TCPServer() throws SQLException {
-        return Server.createTcpServer("-tcp", "-tcpAllowOthers");
-    }
-
     @Bean
     public SpringLiquibase liquibase(DataSource dataSource,
             LiquibaseProperties liquibaseProperties) {

diff --git a/src/main/java/org/radarbase/management/config/SecurityConfiguration.java b/src/main/java/org/radarbase/management/config/SecurityConfiguration.java
@@ -99,7 +99,6 @@ public void configure(WebSecurity web) {
                 .antMatchers("/api/account/reset_password/init")
                 .antMatchers("/api/account/reset_password/finish")
                 .antMatchers("/test/**")
-                .antMatchers("/h2-console/**")
                 .antMatchers("/management/health")
                 .antMatchers(HttpMethod.GET, "/api/meta-token/**");
     }

diff --git a/src/main/java/org/radarbase/management/config/WebConfigurer.java b/src/main/java/org/radarbase/management/config/WebConfigurer.java
@@ -23,7 +23,6 @@
 import javax.servlet.DispatcherType;
 import javax.servlet.FilterRegistration;
 import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -55,9 +54,6 @@ public void onStartup(ServletContext servletContext) {
                     .of(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.ASYNC);
             initCachingHttpHeadersFilter(servletContext, disps);
         }
-        if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
-            initH2Console(servletContext);
-        }
         log.info("Web application fully configured");
     }
 
@@ -132,17 +128,4 @@ public CorsFilter corsFilter() {
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }
-
-    /**
-     * Initializes H2 console.
-     */
-    private void initH2Console(ServletContext servletContext) {
-        log.debug("Initialize H2 console");
-        ServletRegistration.Dynamic h2ConsoleServlet = servletContext
-                .addServlet("H2Console", new org.h2.server.web.WebServlet());
-        h2ConsoleServlet.addMapping("/h2-console/*");
-        h2ConsoleServlet.setInitParameter("-properties", "src/main/resources/");
-        h2ConsoleServlet.setLoadOnStartup(1);
-    }
-
 }
diff --git a/src/main/resources/.h2.server.properties b/src/main/resources/.h2.server.properties
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
@@ -23,16 +23,15 @@ spring:
     jackson:
         serialization.indent_output: true
     datasource:
-        url: jdbc:h2:mem:managementportal;DB_CLOSE_DELAY=-1
+        url: jdbc:hsqldb:mem:managementportal;DB_CLOSE_DELAY=-1
         username: ManagementPortal
         password:
     h2:
         console:
-            enabled: true
-            path: /h2-console
+            enabled: false
     jpa:
-        database-platform: org.hibernate.dialect.H2Dialect
-        database: H2
+        database-platform: org.hibernate.dialect.HSQLDialect
+        database: HSQL
         show-sql: true
         properties:
             hibernate.id.new_generator_mappings: true

diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
@@ -74,6 +74,8 @@ spring:
                 jdbc:
                     lob:
                         non_contextual_creation: true
+    main:
+        allow-circular-references: true
     messages:
         basename: i18n/messages
     thymeleaf:

diff --git a/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
@@ -6,11 +6,11 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <property name="now" value="now()" dbms="h2"/>
+    <property name="now" value="now()" dbms="hsqldb"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="autoIncrement" value="true"/>
 
-    <changeSet id="00000000000000" author="jhipster" dbms="postgresql,oracle,h2">
+    <changeSet id="00000000000000" author="jhipster" dbms="postgresql,oracle,hsqldb">
         <createSequence sequenceName="hibernate_sequence" startValue="1000" incrementBy="50"/>
     </changeSet>
     <!--

diff --git a/src/main/resources/config/liquibase/changelog/00000000000001_added_entity_Project.xml b/src/main/resources/config/liquibase/changelog/00000000000001_added_entity_Project.xml
@@ -4,12 +4,12 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
 
-    <property name="now" value="now()" dbms="h2"/>
+    <property name="now" value="now()" dbms="hsqldb"/>
 
     <property name="now" value="now()" dbms="mysql"/>
     <property name="autoIncrement" value="true"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
     <!--

diff --git a/src/main/resources/config/liquibase/changelog/00000000000002_added_entity_Source.xml b/src/main/resources/config/liquibase/changelog/00000000000002_added_entity_Source.xml
@@ -6,15 +6,15 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <property name="now" value="now()" dbms="h2"/>
+    <property name="now" value="now()" dbms="hsqldb"/>
 
     <property name="now" value="now()" dbms="mysql"/>
     <property name="autoIncrement" value="true"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
-    <property name="uuid_type" value="uuid" dbms="postgresql, h2"/>
+    <property name="uuid_type" value="uuid" dbms="postgresql,hsqldb"/>
     <property name="uuid_type" value="uniqueidentifier" dbms="mssql"/>
     <property name="uuid_type" value="RAW(32)" dbms="oracle"/>
 

diff --git a/src/main/resources/config/liquibase/changelog/00000000000003_added_entity_SourceType.xml b/src/main/resources/config/liquibase/changelog/00000000000003_added_entity_SourceType.xml
@@ -6,12 +6,12 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <property name="now" value="now()" dbms="h2"/>
+    <property name="now" value="now()" dbms="hsqldb"/>
 
     <property name="now" value="now()" dbms="mysql"/>
     <property name="autoIncrement" value="true"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
     <!--

diff --git a/src/main/resources/config/liquibase/changelog/00000000000004_added_entity_SourceData.xml b/src/main/resources/config/liquibase/changelog/00000000000004_added_entity_SourceData.xml
@@ -4,12 +4,12 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
 
-    <property name="now" value="now()" dbms="h2"/>
+    <property name="now" value="now()" dbms="hsqldb"/>
 
     <property name="now" value="now()" dbms="mysql"/>
     <property name="autoIncrement" value="true"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
     <!--

diff --git a/src/main/resources/config/liquibase/changelog/00000000000005_added_entity_Role.xml b/src/main/resources/config/liquibase/changelog/00000000000005_added_entity_Role.xml
@@ -16,14 +16,14 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <property name="now" value="now()" dbms="mysql,h2"/>
+    <property name="now" value="now()" dbms="mysql,hsqldb"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="now" value="sysdate" dbms="oracle"/>
     <property name="now" value="GETDATE()" dbms="mssql"/>
 
     <property name="autoIncrement" value="true" dbms="mysql,h2,postgresql,oracle,mssql"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
     <!--

diff --git a/src/main/resources/config/liquibase/changelog/00000000000006_added_entity_Subject.xml b/src/main/resources/config/liquibase/changelog/00000000000006_added_entity_Subject.xml
@@ -16,14 +16,14 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <property name="now" value="now()" dbms="mysql,h2"/>
+    <property name="now" value="now()" dbms="mysql,hsqldb"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="now" value="sysdate" dbms="oracle"/>
     <property name="now" value="GETDATE()" dbms="mssql"/>
 
     <property name="autoIncrement" value="true" dbms="mysql,h2,postgresql,oracle,mssql"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
     <!--

diff --git a/...main/resources/config/liquibase/changelog/00000000000007_added_source_metadata_entity.xml b/...main/resources/config/liquibase/changelog/00000000000007_added_source_metadata_entity.xml
@@ -16,14 +16,14 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <property name="now" value="now()" dbms="mysql,h2"/>
+    <property name="now" value="now()" dbms="mysql,hsqldb"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="now" value="sysdate" dbms="oracle"/>
     <property name="now" value="GETDATE()" dbms="mssql"/>
 
     <property name="autoIncrement" value="true" dbms="mysql,h2,postgresql,oracle,mssql"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
     <!--

diff --git a/...ain/resources/config/liquibase/changelog/00000000000008_added_subject_metadata_entity.xml b/...ain/resources/config/liquibase/changelog/00000000000008_added_subject_metadata_entity.xml
@@ -16,14 +16,14 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <property name="now" value="now()" dbms="mysql,h2"/>
+    <property name="now" value="now()" dbms="mysql,hsqldb"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="now" value="sysdate" dbms="oracle"/>
     <property name="now" value="GETDATE()" dbms="mssql"/>
 
     <property name="autoIncrement" value="true" dbms="mysql,h2,postgresql,oracle,mssql"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
     <!--

diff --git a/...ain/resources/config/liquibase/changelog/00000000000009_added_project_metadata_entity.xml b/...ain/resources/config/liquibase/changelog/00000000000009_added_project_metadata_entity.xml
@@ -16,14 +16,14 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <property name="now" value="now()" dbms="mysql,h2"/>
+    <property name="now" value="now()" dbms="mysql,hsqldb"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="now" value="sysdate" dbms="oracle"/>
     <property name="now" value="GETDATE()" dbms="mssql"/>
 
     <property name="autoIncrement" value="true" dbms="mysql,h2,postgresql,oracle,mssql"/>
 
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float4" dbms="postgresql,hsqldb"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
 
     <!--

diff --git a/src/main/resources/config/liquibase/changelog/20180313103735_enable_envers_revisions.xml b/src/main/resources/config/liquibase/changelog/20180313103735_enable_envers_revisions.xml
@@ -1,10 +1,16 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
-    <property name="now" value="now()" dbms="h2"/>
+    <property name="now" value="now()" dbms="hsqldb"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
-    <property name="revtype" value="tinyint" dbms="h2"/>
+    <property name="revtype" value="tinyint" dbms="hsqldb"/>
     <property name="revtype" value="smallint" dbms="postgresql"/>
 
+    <changeSet id="set hsqldb regular names to false" author="[email protected]" dbms="hsqldb">
+        <sql>
+            SET DATABASE SQL REGULAR NAMES FALSE;
+        </sql>
+    </changeSet>
+
     <!-- First we add the necessary tables, then we initialize a base revision which sets all
          currently existing entities in the database as being created by the system at the point
          of migration. Finally, we drop the old auditing columns. -->

diff --git a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml
@@ -17,7 +17,7 @@
                         http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
     <property name="autoIncrement" value="true" dbms="mysql,h2,postgresql,oracle,mssql"/>
-    <property name="revtype" value="tinyint" dbms="h2"/>
+    <property name="revtype" value="tinyint" dbms="hsqldb"/>
     <property name="revtype" value="smallint" dbms="postgresql"/>
 
     <!--

diff --git a/src/main/resources/config/liquibase/changelog/20211026_extra_demo_data.xml b/src/main/resources/config/liquibase/changelog/20211026_extra_demo_data.xml
@@ -10,19 +10,17 @@
   -->
 
 <databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
-                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.7.xsd">
 
     <changeSet id="20211026-1" author="[email protected]">
         <loadData encoding="UTF-8"
                   file="config/liquibase/group.csv"
                   separator=";"
                   tableName="radar_group">
         </loadData>
-        <!-- 
+        <!--
             We can add group_id to subject.csv, but I assume
             we'll switch to many-to-many subject-group relationship later on,
             and I want to keep the old 201708301031-2 changeset intact.
@@ -31,7 +29,8 @@
                   file="config/liquibase/subject_group.csv"
                   primaryKey="id"
                   separator=";"
-                  tableName="subject">
+                  tableName="subject"
+                  onlyUpdate="true">
         </loadUpdateData>
     </changeSet>
 </databaseChangeLog>
diff --git a/src/main/resources/config/liquibase/organization_roles.csv b/src/main/resources/config/liquibase/organization_roles.csv
@@ -1 +1 @@
-id;authority_name;project_id;organization_id;created_by
+id;authority_name;project_id;organization_id
diff --git a/src/main/resources/config/liquibase/organization_user.csv b/src/main/resources/config/liquibase/organization_user.csv
@@ -1 +1 @@
-"ID";"LOGIN";"PASSWORD_HASH";"FIRST_NAME";"LAST_NAME";"EMAIL";"ACTIVATED";"LANG_KEY";"CREATED_BY";"LAST_MODIFIED_BY"
+"ID";"LOGIN";"PASSWORD_HASH";"FIRST_NAME";"LAST_NAME";"EMAIL";"ACTIVATED";"LANG_KEY"
diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html
@@ -132,13 +132,6 @@
                             <span [translate]="'global.menu.admin.apidocs'"></span>
                         </a>
                     </li>
-                    <!-- jhipster-needle-add-element-to-admin-menu - JHipster will add entities to the admin menu here -->
-                    <li *ngIf="!inProduction">
-                        <a class="dropdown-item" href='/h2-console' target="_tab" (click)="collapseNavbar()">
-                            <i class="fa fa-fw fa-hdd-o" aria-hidden="true"></i>
-                            <span [translate]="'global.menu.admin.database'"></span>
-                        </a>
-                    </li>
                 </ul>
             </li>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		id;authority_name;project_id;organization_id;created_by
		id;authority_name;project_id;organization_id
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		"ID";"LOGIN";"PASSWORD_HASH";"FIRST_NAME";"LAST_NAME";"EMAIL";"ACTIVATED";"LANG_KEY";"CREATED_BY";"LAST_MODIFIED_BY"
		"ID";"LOGIN";"PASSWORD_HASH";"FIRST_NAME";"LAST_NAME";"EMAIL";"ACTIVATED";"LANG_KEY"