[jOOQ#9732] Change default value of <generatedAnnotation/> to

"false"
wyddwps · Jan 15, 2020 · 54e8a53 · 54e8a53
1 parent 45097fd
commit 54e8a53
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 16 deletions.
diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java
@@ -64,7 +64,7 @@ abstract class AbstractGenerator implements Generator {
     boolean                            generateRelations                  = true;
     boolean                            generateImplicitJoinPathsToOne     = true;
     boolean                            generateInstanceFields             = true;
-    boolean                            generateGeneratedAnnotation        = true;
+    boolean                            generateGeneratedAnnotation        = false;
     GeneratedAnnotationType            generateGeneratedAnnotationType    = GeneratedAnnotationType.DETECT_FROM_JDK;
     boolean                            useSchemaVersionProvider           = false;
     boolean                            useCatalogVersionProvider          = false;

diff --git a/jOOQ-examples/jOOQ-jpa-example/pom.xml b/jOOQ-examples/jOOQ-jpa-example/pom.xml
@@ -144,9 +144,6 @@
                                     </properties>
                                     <includes>.*</includes>
                                 </database>
-                                <generate>
-                                    <generatedAnnotation>false</generatedAnnotation>
-                                </generate>
                                 <target>
                                     <packageName>org.jooq.example.jpa.jooq</packageName>
                                     <directory>src/main/java</directory>

diff --git a/jOOQ-examples/jOOQ-kotlin-example/pom.xml b/jOOQ-examples/jOOQ-kotlin-example/pom.xml
@@ -166,7 +166,6 @@
                                     <inputSchema>PUBLIC</inputSchema>
                                 </database>
                                 <generate>
-                                    <generatedAnnotation>false</generatedAnnotation>
                                     <instanceFields>true</instanceFields>
                                     <pojos>true</pojos>
                                 </generate>

diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml
@@ -190,7 +190,6 @@
                                 </database>
                                 <generate>
                                     <deprecated>false</deprecated>
-                                    <generatedAnnotation>false</generatedAnnotation>
                                 </generate>
                                 <target>
                                     <packageName>org.jooq.example.db.oracle</packageName>

diff --git a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml
@@ -101,9 +101,6 @@
                                       | pg_catalog\.generate_series
                                     </includes>
                                 </database>
-                                <generate>
-                                    <generatedAnnotation>false</generatedAnnotation>
-                                </generate>
                                 <target>
                                     <packageName>org.jooq.example.chart.db</packageName>
                                     <directory>src/main/java</directory>

diff --git a/jOOQ-examples/jOOQ-spark-example/pom.xml b/jOOQ-examples/jOOQ-spark-example/pom.xml
@@ -200,9 +200,6 @@
                                 <database>
                                     <inputSchema>PUBLIC</inputSchema>
                                 </database>
-                                <generate>
-                                    <generatedAnnotation>false</generatedAnnotation>
-                                </generate>
                                 <target>
                                     <packageName>org.jooq.example.db.h2</packageName>
                                     <directory>target/generated-sources/jooq-h2</directory>

diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java
@@ -44,8 +44,8 @@ public class Generate implements Serializable, XMLAppendable
     protected Boolean deprecationOnUnknownTypes = true;
     @XmlElement(defaultValue = "true")
     protected Boolean instanceFields = true;
-    @XmlElement(defaultValue = "true")
-    protected Boolean generatedAnnotation = true;
+    @XmlElement(defaultValue = "false")
+    protected Boolean generatedAnnotation = false;
     @XmlElement(defaultValue = "DETECT_FROM_JDK")
     @XmlSchemaType(name = "string")
     protected GeneratedAnnotationType generatedAnnotationType = GeneratedAnnotationType.DETECT_FROM_JDK;

diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.13.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.13.0.xsd
@@ -1130,7 +1130,7 @@ jOOQ API, without adding custom data type bindings to them.]]></jxb:javadoc></jx
         </annotation>
       </element>
 
-      <element name="generatedAnnotation" type="boolean" default="true" minOccurs="0" maxOccurs="1">
+      <element name="generatedAnnotation" type="boolean" default="false" minOccurs="0" maxOccurs="1">
         <annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Generate the {@link javax.annotation.Generated} or {@link javax.annotation.processing.Generated} annotation to indicate
 jOOQ version used for source code.]]></jxb:javadoc></jxb:property></appinfo></annotation>
       </element>

diff --git a/jOOQ-scala_2.13/pom.xml b/jOOQ-scala_2.13/pom.xml
@@ -133,7 +133,6 @@
 
 
 
-
 
 
             <!-- The Scala compiler plugin -->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -133,7 +133,6 @@






		<!-- The Scala compiler plugin -->
Expand Down