chore(all): h2 1.4.200 -> 2.2.224 version up

gmoon92 · May 26, 2024 · 43d9d03 · 43d9d03
1 parent 58e9adf
commit 43d9d03
Show file tree

Hide file tree

Showing 21 changed files with 56 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,8 +20,12 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>17</java.version>
-        <mysql-connector-java.version>8.0.28</mysql-connector-java.version>
         <spring-boot.version>3.3.0</spring-boot.version>
+
+        <mysql-connector-java.version>8.0.28</mysql-connector-java.version>
+        <h2.version>2.2.224</h2.version>
+        <hibernate.version>6.5.2.Final</hibernate.version>
+        <querydsl-core.version>5.0.0</querydsl-core.version>
     </properties>
 
     <modules>

diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml
@@ -12,9 +12,6 @@
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-batch</name>
     <description>spring-batch</description>
-    <properties>
-        <h2.version>2.1.214</h2.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/spring-cache/jpa-second-level-cache/pom.xml b/spring-cache/jpa-second-level-cache/pom.xml
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
         </dependency>
         <!-- persistence end -->
 

diff --git a/spring-cache/jpa-second-level-cache/src/main/resources/application.yml b/spring-cache/jpa-second-level-cache/src/main/resources/application.yml
@@ -33,8 +33,12 @@ spring:
     defer-datasource-initialization: true
     open-in-view: false
     show-sql: true
+    generate-ddl: true
     properties:
       hibernate:
+        globally_quoted_identifiers: true
+        #        auto_quote_keyword: true
+        "[hbm2ddl.auto]": create-drop
         show_sql: true
         # format_sql: true
         use_sql_comments: true
@@ -52,3 +56,7 @@ spring:
 #            "[provider]": *jcache-provider
             # fail, create-warn(default), create
             "[missing_cache_strategy]": create
+
+logging:
+  level:
+    "[org.hibernate.type.descriptor.sql]": trace
diff --git a/spring-cache/jpa-second-level-cache/src/main/resources/data.sql b/spring-cache/jpa-second-level-cache/src/main/resources/data.sql
@@ -1,4 +1,8 @@
-INSERT INTO tb_common_code (code, value) VALUES ('c1', 'value');
-INSERT INTO tb_common_code (code, value) VALUES ('c2', 'value');
-INSERT INTO tb_common_code (code, value) VALUES ('c3', 'value');
-INSERT INTO tb_common_code (code, value) VALUES ('c4', 'value');
+INSERT INTO "tb_common_code" ("code", "value")
+VALUES ('c1', 'value');
+INSERT INTO "tb_common_code" ("code", "value")
+VALUES ('c2', 'value');
+INSERT INTO "tb_common_code" ("code", "value")
+VALUES ('c3', 'value');
+INSERT INTO "tb_common_code" ("code", "value")
+VALUES ('c4', 'value');
diff --git a/spring-cache/spring-data-redis/pom.xml b/spring-cache/spring-data-redis/pom.xml
@@ -49,6 +49,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/spring-event/spring-async/pom.xml b/spring-event/spring-async/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

diff --git a/spring-event/spring-event-listener/pom.xml b/spring-event/spring-event-listener/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.200</version>
+            <version>${h2.version}</version>
 		</dependency>
 
 		<!-- test -->

diff --git a/spring-event/spring-quartz-cluster/pom.xml b/spring-event/spring-quartz-cluster/pom.xml
@@ -74,6 +74,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/spring-jooq/pom.xml b/spring-jooq/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.2.224</version>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/spring-jpa/doc/db-reserved-word.md b/spring-jpa/doc/db-reserved-word.md
@@ -0,0 +1,19 @@
+# H2 2 버전 마이그레이션시 쿼리 예약어 이슈
+
+DML 쿼리 수행시 테이블 또는 컬럼 예약어 이슈.
+
+## double quotes
+
+- globally_quoted_identifiers
+    - 테이블명과 모든 컬럼에 대해 따옴표(double quotes)를 추가하는 설정
+- auto_quote_keyword
+    - 모든 예약어에 대해 따옴표(double quotes)를 추가하는 설정
+
+```yaml
+spring:
+  jpa:
+    properties:
+      hibernate:
+        globally_quoted_identifiers: true
+        auto_quote_keyword: true
+```
diff --git a/spring-jpa/hibernate-annotation/pom.xml b/spring-jpa/hibernate-annotation/pom.xml
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/spring-jpa/hibernate-performance/pom.xml b/spring-jpa/hibernate-performance/pom.xml
@@ -73,13 +73,13 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-web</artifactId>
-            <version>${log4j-web.version}</version>
+            <version>2.14.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.bgee.log4jdbc-log4j2/log4jdbc-log4j2-jdbc4.1 -->
         <dependency>
             <groupId>org.bgee.log4jdbc-log4j2</groupId>
             <artifactId>log4jdbc-log4j2-jdbc4.1</artifactId>
-            <version>${log4jdbc-log4j2-jdbc4.1.version}</version>
+            <version>1.16</version>
         </dependency>
 
         <dependency>

diff --git a/spring-jpa/hibernate-sequence-generator/pom.xml b/spring-jpa/hibernate-sequence-generator/pom.xml
@@ -24,6 +24,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml
@@ -29,12 +29,8 @@
     </modules>
 
     <properties>
-        <mysql-connector-java.version>8.0.28</mysql-connector-java.version>
         <hibernate.version>6.5.2.Final</hibernate.version>
         <querydsl-core.version>5.0.0</querydsl-core.version>
-        <h2.version>2.2.224</h2.version>
-        <log4j-web.version>2.14.0</log4j-web.version>
         <commons-lang3.version>3.9</commons-lang3.version>
-        <log4jdbc-log4j2-jdbc4.1.version>1.16</log4jdbc-log4j2-jdbc4.1.version>
     </properties>
 </project>
diff --git a/spring-jpa/spring-jpa-pagination/pom.xml b/spring-jpa/spring-jpa-pagination/pom.xml
@@ -49,6 +49,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/spring-jpa/spring-jpa-specs/pom.xml b/spring-jpa/spring-jpa-specs/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>com.gmoon</groupId>

diff --git a/spring-security/spring-security-jwt/pom.xml b/spring-security/spring-security-jwt/pom.xml
@@ -44,6 +44,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/spring-security/spring-security-whiteship/pom.xml b/spring-security/spring-security-whiteship/pom.xml
@@ -79,6 +79,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/testing/junit5/pom.xml b/testing/junit5/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

diff --git a/testing/quickperf/pom.xml b/testing/quickperf/pom.xml
@@ -27,6 +27,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>