From 768f5033b4cbc498ee24f9f061ec81e921a04ff8 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 31 May 2022 12:29:08 +0200
Subject: [PATCH] [jOOQ/jOOQ#13619] Revert this for now, until compilation
 issues are understood

---
 jOOQ-codegen/pom.xml                                    | 6 ------
 jOOQ-codegen/src/main/java/module-info.java             | 3 ---
 jOOQ-meta/src/main/java/module-info.java                | 2 +-
 jOOQ-postgres-extensions/src/main/java/module-info.java | 2 +-
 jOOQ/src/main/java/module-info.java                     | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml
index 1f29d09dc3..2ea85ee0af 100644
--- a/jOOQ-codegen/pom.xml
+++ b/jOOQ-codegen/pom.xml
@@ -53,12 +53,6 @@
             <groupId>org.jooq</groupId>
             <artifactId>jooq-meta</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
 
 
 
diff --git a/jOOQ-codegen/src/main/java/module-info.java b/jOOQ-codegen/src/main/java/module-info.java
index b11f7a04e5..88b118c6c2 100644
--- a/jOOQ-codegen/src/main/java/module-info.java
+++ b/jOOQ-codegen/src/main/java/module-info.java
@@ -6,9 +6,6 @@ module org.jooq.codegen {
     // Other jOOQ modules
     requires transitive org.jooq.meta;
 
-    // Nullability annotations for better Kotlin interop
-    requires static transitive org.jetbrains.annotations;
-
     // JAXB is used optionally for loading a variety of XML content, including
     // - Settings (org.jooq.conf)
     // - InformationSchema (org.jooq.util.xml.jaxb)
diff --git a/jOOQ-meta/src/main/java/module-info.java b/jOOQ-meta/src/main/java/module-info.java
index d346cbc645..431f40fc8b 100644
--- a/jOOQ-meta/src/main/java/module-info.java
+++ b/jOOQ-meta/src/main/java/module-info.java
@@ -7,7 +7,7 @@ module org.jooq.meta {
     requires transitive org.jooq;
 
     // Nullability annotations for better Kotlin interop
-    requires static transitive org.jetbrains.annotations;
+    requires static org.jetbrains.annotations;
 
     // JAXB is used optionally for loading a variety of XML content, including
     // - Settings (org.jooq.conf)
diff --git a/jOOQ-postgres-extensions/src/main/java/module-info.java b/jOOQ-postgres-extensions/src/main/java/module-info.java
index 33e63abe03..897b70ed2d 100644
--- a/jOOQ-postgres-extensions/src/main/java/module-info.java
+++ b/jOOQ-postgres-extensions/src/main/java/module-info.java
@@ -7,7 +7,7 @@ module org.jooq.postgres.extensions {
     requires transitive org.jooq;
 
     // Nullability annotations for better Kotlin interop
-    requires static transitive org.jetbrains.annotations;
+    requires static org.jetbrains.annotations;
 
     // Vendor specific JDBC drivers
     requires static org.postgresql.jdbc;
diff --git a/jOOQ/src/main/java/module-info.java b/jOOQ/src/main/java/module-info.java
index abbc8dcd82..01a612c50a 100644
--- a/jOOQ/src/main/java/module-info.java
+++ b/jOOQ/src/main/java/module-info.java
@@ -33,7 +33,7 @@ module org.jooq {
     requires static java.logging;
 
     // Nullability annotations for better Kotlin interop
-    requires static transitive org.jetbrains.annotations;
+    requires static org.jetbrains.annotations;
 
     requires transitive org.reactivestreams;
     requires transitive r2dbc.spi;