From a48c24009a6710f6a66b019bbf8b90c24ffb65c6 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 16 Dec 2021 16:28:44 +0100
Subject: [PATCH] Avoid CVE-2021-23463 from outdated H2 reference in other
 examples

---
 jOOQ-examples/jOOQ-javafx-example/pom.xml              |  3 +--
 .../jOOQ-javafx-example/src/main/resources/db-h2.sql   |  4 ++--
 jOOQ-examples/jOOQ-kotlin-example/pom.xml              |  3 +--
 jOOQ-examples/jOOQ-spark-example/pom.xml               | 10 ++++++++--
 .../jOOQ-spark-example/src/main/resources/db-h2.sql    |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/jOOQ-examples/jOOQ-javafx-example/pom.xml b/jOOQ-examples/jOOQ-javafx-example/pom.xml
index 4b55337c94..a0ac4a9cc7 100644
--- a/jOOQ-examples/jOOQ-javafx-example/pom.xml
+++ b/jOOQ-examples/jOOQ-javafx-example/pom.xml
@@ -23,7 +23,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.h2.version>1.4.199</org.h2.version>
     </properties>
 
     <dependencies>
@@ -169,7 +168,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>${org.h2.version}</version>
+                        <version>${h2.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/jOOQ-examples/jOOQ-javafx-example/src/main/resources/db-h2.sql b/jOOQ-examples/jOOQ-javafx-example/src/main/resources/db-h2.sql
index 1dc4616dcd..800b22e0df 100644
--- a/jOOQ-examples/jOOQ-javafx-example/src/main/resources/db-h2.sql
+++ b/jOOQ-examples/jOOQ-javafx-example/src/main/resources/db-h2.sql
@@ -4,11 +4,11 @@ CREATE SCHEMA world;
 
 CREATE TABLE world.countries (
   code CHAR(2) NOT NULL,
-  year INT NOT NULL,
+  "YEAR" INT NOT NULL,
   gdp_per_capita DECIMAL(10, 2) NOT NULL,
   govt_debt DECIMAL(10, 2) NOT NULL,
 
-  CONSTRAINT pk_countries PRIMARY KEY (code, year)
+  CONSTRAINT pk_countries PRIMARY KEY (code, "YEAR")
 );
 
 INSERT INTO world.countries
diff --git a/jOOQ-examples/jOOQ-kotlin-example/pom.xml b/jOOQ-examples/jOOQ-kotlin-example/pom.xml
index 3cc89be6f8..12f4e91a4b 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/pom.xml
+++ b/jOOQ-examples/jOOQ-kotlin-example/pom.xml
@@ -23,7 +23,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.h2.version>1.4.199</org.h2.version>
     </properties>
 
     <dependencies>
@@ -137,7 +136,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>${org.h2.version}</version>
+                        <version>${h2.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/jOOQ-examples/jOOQ-spark-example/pom.xml b/jOOQ-examples/jOOQ-spark-example/pom.xml
index 72636a0821..30dc06f730 100644
--- a/jOOQ-examples/jOOQ-spark-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spark-example/pom.xml
@@ -23,7 +23,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.h2.version>1.4.199</org.h2.version>
     </properties>
 
     <dependencies>
@@ -54,6 +53,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j18-impl</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>compile</scope>
         </dependency>
         
         <!-- Testing -->
@@ -165,7 +170,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>${org.h2.version}</version>
+                        <version>${h2.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -217,6 +222,7 @@
                         </goals>
                         <configuration>
                             <mainClass>org.jooq.example.spark.SparkCRUD</mainClass>
+<classpathScope>compile</classpathScope>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/jOOQ-examples/jOOQ-spark-example/src/main/resources/db-h2.sql b/jOOQ-examples/jOOQ-spark-example/src/main/resources/db-h2.sql
index bfe252bb76..1784f0fde6 100644
--- a/jOOQ-examples/jOOQ-spark-example/src/main/resources/db-h2.sql
+++ b/jOOQ-examples/jOOQ-spark-example/src/main/resources/db-h2.sql
@@ -14,7 +14,7 @@ CREATE TABLE book (
   title VARCHAR(400) NOT NULL,
 
   CONSTRAINT pk_t_book PRIMARY KEY (id),
-  CONSTRAINT fk_t_book_author_id FOREIGN KEY (author_id) REFERENCES author(id) ON DELETE CASCADE,
+  CONSTRAINT fk_t_book_author_id FOREIGN KEY (author_id) REFERENCES author(id) ON DELETE CASCADE
 );
 
 INSERT INTO author VALUES (DEFAULT, 'George Orwell');