diff --git a/jOOQ-checker/src/main/java/module-info.java.invalid b/jOOQ-checker/src/main/java/module-info.java.invalid
index 261026f231..5fef7d21ab 100644
--- a/jOOQ-checker/src/main/java/module-info.java.invalid
+++ b/jOOQ-checker/src/main/java/module-info.java.invalid
@@ -1,4 +1,4 @@
-/* [java-9] */
+
/**
* The jOOQ checker module
*/
@@ -10,4 +10,3 @@ module org.jooq.checker {
requires checker;
}
*/
-/* [/java-9] */
\ No newline at end of file
diff --git a/jOOQ-codegen-maven/src/main/java/module-info.java.invalid b/jOOQ-codegen-maven/src/main/java/module-info.java.invalid
index 6aecc2297e..09bcd82ff0 100644
--- a/jOOQ-codegen-maven/src/main/java/module-info.java.invalid
+++ b/jOOQ-codegen-maven/src/main/java/module-info.java.invalid
@@ -1,4 +1,4 @@
-/* [java-9] */
+
/**
* The jOOQ code generation maven plugin module.
*/
@@ -14,4 +14,3 @@ module org.jooq.codegen.maven {
requires maven.core;
requires maven.plugin.api;
}
-/* [/java-9] */
\ No newline at end of file
diff --git a/jOOQ-codegen/src/main/java/module-info.java.invalid b/jOOQ-codegen/src/main/java/module-info.java.invalid
index 95442a24aa..a466f6916e 100644
--- a/jOOQ-codegen/src/main/java/module-info.java.invalid
+++ b/jOOQ-codegen/src/main/java/module-info.java.invalid
@@ -1,4 +1,4 @@
-/* [java-9] */
+
/**
* The jOOQ code generation module.
*/
@@ -12,4 +12,3 @@ module org.jooq.codegen {
exports org.jooq.codegen;
exports org.jooq.codegen.example;
}
-/* [/java-9] */
\ No newline at end of file
diff --git a/jOOQ-examples/jOOQ-academy/pom.xml b/jOOQ-examples/jOOQ-academy/pom.xml
index 5c71aab6e2..b3e6d82e97 100644
--- a/jOOQ-examples/jOOQ-academy/pom.xml
+++ b/jOOQ-examples/jOOQ-academy/pom.xml
@@ -84,9 +84,9 @@
1024m
256m
UTF-8
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml
index 67579ab91a..a09b17bb6b 100644
--- a/jOOQ-examples/jOOQ-flyway-example/pom.xml
+++ b/jOOQ-examples/jOOQ-flyway-example/pom.xml
@@ -88,9 +88,9 @@
1024m
256m
UTF-8
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-javaee-example/pom.xml b/jOOQ-examples/jOOQ-javaee-example/pom.xml
index f12ded0629..c8f12a91f2 100644
--- a/jOOQ-examples/jOOQ-javaee-example/pom.xml
+++ b/jOOQ-examples/jOOQ-javaee-example/pom.xml
@@ -126,9 +126,9 @@
maven-compiler-plugin
${version.compiler.plugin}
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-javafx-example/pom.xml b/jOOQ-examples/jOOQ-javafx-example/pom.xml
index 0846dfc90e..c715bd36fb 100644
--- a/jOOQ-examples/jOOQ-javafx-example/pom.xml
+++ b/jOOQ-examples/jOOQ-javafx-example/pom.xml
@@ -80,9 +80,9 @@
1024m
256m
UTF-8
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml b/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml
index fb4e483184..c11f8c1e3a 100644
--- a/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml
+++ b/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml
@@ -38,9 +38,9 @@
maven-compiler-plugin
3.8.0
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-jpa-example-entities/src/main/java/module-info.java.invalid b/jOOQ-examples/jOOQ-jpa-example-entities/src/main/java/module-info.java.invalid
index 851330f697..db9e98bc29 100644
--- a/jOOQ-examples/jOOQ-jpa-example-entities/src/main/java/module-info.java.invalid
+++ b/jOOQ-examples/jOOQ-jpa-example-entities/src/main/java/module-info.java.invalid
@@ -1,4 +1,4 @@
-/* [java-9] */
+
/**
* The jOOQ example JPA entities module.
*/
@@ -10,4 +10,3 @@ module org.jooq.example.jpa.entities {
exports org.jooq.example.jpa.embeddables;
exports org.jooq.example.jpa.entity;
}
-/* [/java-9] */
\ No newline at end of file
diff --git a/jOOQ-examples/jOOQ-jpa-example/pom.xml b/jOOQ-examples/jOOQ-jpa-example/pom.xml
index e51af14959..fcf05496de 100644
--- a/jOOQ-examples/jOOQ-jpa-example/pom.xml
+++ b/jOOQ-examples/jOOQ-jpa-example/pom.xml
@@ -100,9 +100,9 @@
1024m
256m
UTF-8
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/module-info.java.invalid b/jOOQ-examples/jOOQ-jpa-example/src/main/java/module-info.java.invalid
index f8b078ff5e..eb5d16f3f8 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/module-info.java.invalid
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/module-info.java.invalid
@@ -1,4 +1,4 @@
-/* [java-9] */
+
/**
* The jOOQ example JPA entities module.
*/
@@ -12,4 +12,3 @@ module org.jooq.example.jpa {
requires spring.jdbc;
requires spring.orm;
}
-/* [/java-9] */
\ No newline at end of file
diff --git a/jOOQ-examples/jOOQ-kotlin-example/pom.xml b/jOOQ-examples/jOOQ-kotlin-example/pom.xml
index dd06861284..2a4b52010d 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/pom.xml
+++ b/jOOQ-examples/jOOQ-kotlin-example/pom.xml
@@ -182,9 +182,9 @@
maven-compiler-plugin
3.8.0
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml
index 654c0ceefa..7b0e323418 100644
--- a/jOOQ-examples/jOOQ-oracle-example/pom.xml
+++ b/jOOQ-examples/jOOQ-oracle-example/pom.xml
@@ -66,9 +66,9 @@
1024m
256m
UTF-8
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml
index 859a017cc1..4b440484c8 100644
--- a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml
@@ -41,9 +41,9 @@
maven-compiler-plugin
3.8.0
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-spark-example/pom.xml b/jOOQ-examples/jOOQ-spark-example/pom.xml
index 726aa74006..d0e24738af 100644
--- a/jOOQ-examples/jOOQ-spark-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spark-example/pom.xml
@@ -92,9 +92,9 @@
1024m
256m
UTF-8
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-spring-example/pom.xml b/jOOQ-examples/jOOQ-spring-example/pom.xml
index d1cdaa3c01..a701283a22 100644
--- a/jOOQ-examples/jOOQ-spring-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-example/pom.xml
@@ -102,9 +102,9 @@
1024m
256m
UTF-8
-
+
11
-
+
11
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
index d7e5048f97..41cab133ad 100644
--- a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
@@ -89,9 +89,9 @@
1024m
256m
UTF-8
-
+
11
-
+
11
diff --git a/jOOQ-meta-extensions/src/main/java/module-info.java.invalid b/jOOQ-meta-extensions/src/main/java/module-info.java.invalid
index 6b3f1e967a..f796ec1a07 100644
--- a/jOOQ-meta-extensions/src/main/java/module-info.java.invalid
+++ b/jOOQ-meta-extensions/src/main/java/module-info.java.invalid
@@ -1,4 +1,4 @@
-/* [java-9] */
+
/**
* The jOOQ code generation meta model extensions module.
*/
@@ -16,4 +16,3 @@ module org.jooq.meta.extensions {
exports org.jooq.meta.extensions.ddl;
exports org.jooq.meta.extensions.jpa;
}
-/* [/java-9] */
\ No newline at end of file
diff --git a/jOOQ-meta/src/main/java/module-info.java.invalid b/jOOQ-meta/src/main/java/module-info.java.invalid
index f50f5cc8ee..85ca1da0ca 100644
--- a/jOOQ-meta/src/main/java/module-info.java.invalid
+++ b/jOOQ-meta/src/main/java/module-info.java.invalid
@@ -1,4 +1,4 @@
-/* [java-9] */
+
/**
* The jOOQ code generation meta model module.
*/
@@ -41,4 +41,3 @@ module org.jooq.meta {
exports org.jooq.meta.postgres;
exports org.jooq.meta.sqlite;
}
-/* [/java-9] */
\ No newline at end of file
diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index e06829e9e7..df49084c8e 100644
--- a/jOOQ-release/build.xml
+++ b/jOOQ-release/build.xml
@@ -15,9 +15,9 @@
-
+
-
+
@@ -29,9 +29,9 @@
-
+
-
+
@@ -43,9 +43,9 @@
-
+
-
+
@@ -58,9 +58,9 @@
-
+
-
+
@@ -77,9 +77,9 @@
-
+
-
+
@@ -99,9 +99,9 @@
-
+
-
+
@@ -138,9 +138,9 @@
-
-
-
+
+
+
diff --git a/jOOQ-scala_2.12/pom.xml b/jOOQ-scala_2.12/pom.xml
index 4f7422f162..c9d80d5b4b 100644
--- a/jOOQ-scala_2.12/pom.xml
+++ b/jOOQ-scala_2.12/pom.xml
@@ -22,7 +22,6 @@
src/test/scala
-
@@ -126,7 +125,8 @@
-
+
+
diff --git a/jOOQ/src/main/java/module-info.java.invalid b/jOOQ/src/main/java/module-info.java.invalid
index 2363630ade..f6362c3020 100644
--- a/jOOQ/src/main/java/module-info.java.invalid
+++ b/jOOQ/src/main/java/module-info.java.invalid
@@ -1,4 +1,4 @@
-/* [java-9] */
+
/**
* The jOOQ runtime module.
*/
@@ -71,4 +71,3 @@ module org.jooq {
exports org.jooq.util.postgres;
exports org.jooq.util.sqlite;
}
-/* [/java-9] */
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
index d6c417f574..cd75adf671 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
@@ -760,7 +760,7 @@ class DefaultRenderContext extends AbstractContext implements Ren
"WHERE"
));
- /* [trial] */
+
/*
* So, you've found the piece of logic that displays our beautifully-crafted ASCII-art logo that
@@ -824,7 +824,7 @@ class DefaultRenderContext extends AbstractContext implements Ren
"\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ " + message +
"\n ");
}
- /* [/trial] */
+
}
/**
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java
index 389ba085eb..39f22a840c 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java
@@ -357,7 +357,7 @@ public class DefaultConnection extends JDBC41Connection implements Connection {
- /* [java-9] */
+
// ------------------------------------------------------------------------
// JDBC 4.3
@@ -393,5 +393,5 @@ public class DefaultConnection extends JDBC41Connection implements Connection {
getDelegate().setShardingKey(shardingKey);
}
- /* [/java-9] */
+
}
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java
index 4377f170fe..c480286c38 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java
@@ -351,7 +351,7 @@ public class DefaultStatement extends JDBC41Statement implements Statement {
- /* [java-9] */
+
// ------------------------------------------------------------------------
// JDBC 4.3
@@ -377,6 +377,6 @@ public class DefaultStatement extends JDBC41Statement implements Statement {
return getDelegate().enquoteNCharLiteral(val);
}
- /* [/java-9] */
+
}
diff --git a/jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java b/jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java
index bbe53cf515..6f77fe2dc0 100644
--- a/jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java
+++ b/jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java
@@ -100,7 +100,7 @@ class Compile {
byte[] b = fileManager.o.getBytes();
result = Reflect.on(cl).call("defineClass", className, b, 0, b.length).get();
}
- /* [java-9] */
+
// Lookup.defineClass() has only been introduced in Java 9. It is
// required to get private-access to interfaces in the class hierarchy
@@ -137,7 +137,7 @@ class Compile {
}.loadClass(className);
}
}
- /* [/java-9] */
+
return result;
}
diff --git a/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java b/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java
index 3956cb8b02..f3d36581df 100644
--- a/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java
+++ b/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java
@@ -238,11 +238,11 @@ public class Reflect {
static {
Constructor result;
- /* [java-9] */
+
if (true)
result = null;
else
- /* [/java-9] */
+
try {
result = MethodHandles.Lookup.class.getDeclaredConstructor(Class.class);
@@ -702,7 +702,7 @@ public class Reflect {
if (method.isDefault()) {
- /* [java-9] */
+
// Java 9 version
if (CACHED_LOOKUP_CONSTRUCTOR == null) {
return MethodHandles
@@ -712,7 +712,7 @@ public class Reflect {
.bindTo(proxy)
.invokeWithArguments(args);
}
- /* [/java-9] */
+
// Java 8 version
return CACHED_LOOKUP_CONSTRUCTOR
diff --git a/pom.xml b/pom.xml
index 0d0e79a1ef..11f6dd0e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,9 +214,9 @@
512m
256m
UTF-8
-
+
11
-
+
11
@@ -336,9 +336,9 @@
jOOQ
-
+
jOOQ-checker
-
+
jOOQ-meta
jOOQ-meta-extensions
jOOQ-codegen