From 2ab921f75a29982e33699b2d5937efd812ed7415 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 23 Jun 2022 11:20:13 +0200
Subject: [PATCH 1/2] [jOOQ/jOOQ#13706] OnError.FAIL should log a message about
 the user's option how to handle the problem

---
 .../java/org/jooq/meta/AbstractDatabase.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
index 7bb84e7662..ce3e25546b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
@@ -91,6 +91,7 @@ import org.jooq.ExecuteContext;
 import org.jooq.ExecuteListener;
 import org.jooq.Field;
 import org.jooq.Log;
+import org.jooq.Log.Level;
 import org.jooq.Meta;
 import org.jooq.MetaProvider;
 import org.jooq.Name;
@@ -3755,6 +3756,22 @@ public abstract class AbstractDatabase implements Database {
                     log.log(level, message, e);
                     break;
                 case FAIL:
+                    log.log(ERROR, "Code generation error",
+                        """
+                        An error was encountered during code generation. This can have various reasons:
+
+                        - There's a bug in jOOQ. Please report it here: https://github.com/jOOQ/jOOQ/issues/new/choose
+                        - Your database user doesn't have the necessary privileges to access a metadata table
+                        - The database connection suffered a failure
+
+                        There are other reasons. If the error can be ignored, you can either:
+
+                        - Turn off the relevant feature in the code generator to avoid running into the error
+                        - Avoid fetching the relevant meta data by excluding the object from code generation
+                        - Use the <onError/> code generation configuration to specify the severity of such errors (for all errors!)
+
+                        See https://www.jooq.org/doc/latest/manual/code-generation/codegen-advanced/codegen-config-onerror/
+                        """);
                     throw new RuntimeException(e);
             }
         }

From 3bb4d719a3e4bc3fe11289b343767f6976782f6f Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 23 Jun 2022 11:20:29 +0200
Subject: [PATCH 2/2] [jOOQ/jOOQ#13700] Upgrading
 org.owasp:dependency-check-maven

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9827309cb2..700299436e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -831,7 +831,7 @@
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
-                    <version>6.3.1</version>
+                    <version>7.1.1</version>
                     <configuration>
                         <failBuildOnCVSS>0</failBuildOnCVSS>
                         <skipTestScope>true</skipTestScope>