github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#8491] Remove unnecessary marker tokens in source code

Browse Source
This commit is contained in:
lukaseder 2019-04-05 11:52:34 +02:00
parent 420b4d28d3
commit 2785bc84ae
28 changed files with 65 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jOOQ-checker/src/main/java/module-info.java.invalid
View File

@ -1,4 +1,4 @@
/* [java-9] */
/**
* The jOOQ checker module
*/
@ -10,4 +10,3 @@ module org.jooq.checker {
requires checker;
}
*/
/* [/java-9] */

3
jOOQ-codegen-maven/src/main/java/module-info.java.invalid
View File

@ -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] */

3
jOOQ-codegen/src/main/java/module-info.java.invalid
View File

@ -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] */

4
jOOQ-examples/jOOQ-academy/pom.xml
View File

@ -84,9 +84,9 @@
<maxmem>1024m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-flyway-example/pom.xml
View File

@ -88,9 +88,9 @@
<maxmem>1024m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-javaee-example/pom.xml
View File

@ -126,9 +126,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
<configuration>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-javafx-example/pom.xml
View File

@ -80,9 +80,9 @@
<maxmem>1024m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-jpa-example-entities/pom.xml
View File

@ -38,9 +38,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

3
jOOQ-examples/jOOQ-jpa-example-entities/src/main/java/module-info.java.invalid
View File

@ -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] */

4
jOOQ-examples/jOOQ-jpa-example/pom.xml
View File

@ -100,9 +100,9 @@
<maxmem>1024m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

3
jOOQ-examples/jOOQ-jpa-example/src/main/java/module-info.java.invalid
View File

@ -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] */

4
jOOQ-examples/jOOQ-kotlin-example/pom.xml
View File

@ -182,9 +182,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-oracle-example/pom.xml
View File

@ -66,9 +66,9 @@
<maxmem>1024m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-spark-chart-example/pom.xml
View File

@ -41,9 +41,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-spark-example/pom.xml
View File

@ -92,9 +92,9 @@
<maxmem>1024m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-spring-example/pom.xml
View File

@ -102,9 +102,9 @@
<maxmem>1024m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

4
jOOQ-examples/jOOQ-spring-guice-example/pom.xml
View File

@ -89,9 +89,9 @@
<maxmem>1024m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>

3
jOOQ-meta-extensions/src/main/java/module-info.java.invalid
View File

@ -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] */

3
jOOQ-meta/src/main/java/module-info.java.invalid
View File

@ -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] */

30
jOOQ-release/build.xml
View File

@ -15,9 +15,9 @@
<mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-meta"/>
<mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-codegen"/>
<mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-codegen-maven"/>
<!-- [java-8] -->
<mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-checker"/>
<!-- [/java-8] -->
@ -29,9 +29,9 @@
<copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version-prefix}.jar"/>
<copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version-prefix}.jar"/>
<copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version-prefix}.jar"/>
<!-- [java-8] -->
<copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}.jar"/>
<!-- [/java-8] -->
@ -43,9 +43,9 @@
<copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version-prefix}-javadoc.jar"/>
<copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version-prefix}-javadoc.jar"/>
<copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version-prefix}-javadoc.jar"/>
<!-- [java-8] -->
<copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}-javadoc.jar"/>
<!-- [/java-8] -->
@ -58,9 +58,9 @@
<copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-meta-extensions" file="${dir.workspace}/jOOQ-meta-extensions/pom.xml"/>
<copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-codegen" file="${dir.workspace}/jOOQ-codegen/pom.xml"/>
<copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-codegen-maven" file="${dir.workspace}/jOOQ-codegen-maven/pom.xml"/>
<!-- [java-8] -->
<copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-checker" file="${dir.workspace}/jOOQ-checker/pom.xml"/>
<!-- [/java-8] -->
@ -77,9 +77,9 @@
<copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version-prefix}-sources.jar"/>
<copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version-prefix}-sources.jar"/>
<copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version-prefix}-sources.jar"/>
<!-- [java-8] -->
<copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}-sources.jar"/>
<!-- [/java-8] -->
@ -99,9 +99,9 @@
<include name="jOOQ-examples/**"/>
<include name="jOOQ-meta/**"/>
<include name="jOOQ-meta-extensions/**"/>
<!-- [java-8] -->
<include name="jOOQ-checker/**"/>
<!-- [/java-8] -->
@ -138,9 +138,9 @@
<delete dir="${dir.release}/${dir.version}"/>
</target>
<!-- [java-9] -->
<!-- [java-8] -->
<!-- [trial] -->
<target name="release-oss" description="Release a new version">
<property name="version" value="${version-prefix}"/>
<property name="dir.version" value="jOOQ-${version-prefix}"/>

4
jOOQ-scala_2.12/pom.xml
View File

@ -22,7 +22,6 @@
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<!-- [trial] -->
@ -126,7 +125,8 @@
<!-- [/trial] -->
<!-- The Scala compiler plugin -->
<plugin>

3
jOOQ/src/main/java/module-info.java.invalid
View File

@ -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] */

4
jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
View File

@ -760,7 +760,7 @@ class DefaultRenderContext extends AbstractContext<RenderContext> 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<RenderContext> implements Ren
"\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ " + message +
"\n ");
}
/* [/trial] */
}
/**

4
jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java
View File

@ -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] */
}

4
jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java
View File

@ -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] */
}

4
jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java
View File

@ -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;
}

8
jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java
View File

@ -238,11 +238,11 @@ public class Reflect {
static {
Constructor<MethodHandles.Lookup> 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

8
pom.xml
View File

@ -214,9 +214,9 @@
<maxmem>512m</maxmem>
<meminitial>256m</meminitial>
<encoding>UTF-8</encoding>
<!-- [java-9] -->
<release>11</release>
<!-- [/java-9] -->
<!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
<source>11</source>
@ -336,9 +336,9 @@
<modules>
<module>jOOQ</module>
<!-- [java-8] -->
<module>jOOQ-checker</module>
<!-- [/java-8] -->
<module>jOOQ-meta</module>
<module>jOOQ-meta-extensions</module>
<module>jOOQ-codegen</module>