From 2401501864dcaa99b75ae51e1256eaed7aedebdf Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Thu, 27 Nov 2014 08:38:41 +0100
Subject: [PATCH] Upgraded H2 in example projects

---
 jOOQ-examples/jOOQ-flyway-example/pom.xml      |  3 ++-
 jOOQ-examples/jOOQ-nashorn-example/pom.xml     | 17 -----------------
 jOOQ-examples/jOOQ-spring-example/pom.xml      | 18 +++---------------
 .../jOOQ-spring-guice-example/pom.xml          | 17 +++--------------
 jOOQ-examples/jOOQ-vertabelo-example/pom.xml   |  5 +++--
 jOOQ-scala/pom.xml                             | 17 +++--------------
 6 files changed, 14 insertions(+), 63 deletions(-)

diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml
index e358850902..5b21ac76fa 100644
--- a/jOOQ-examples/jOOQ-flyway-example/pom.xml
+++ b/jOOQ-examples/jOOQ-flyway-example/pom.xml
@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
         <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
+        <org.h2.version>1.4.181</org.h2.version>
 
         <db.url>jdbc:h2:~/flyway-test</db.url>
         <db.username>sa</db.username>
@@ -36,7 +37,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.177</version>
+            <version>${org.h2.version}</version>
         </dependency>
 
         <!-- Logging -->
diff --git a/jOOQ-examples/jOOQ-nashorn-example/pom.xml b/jOOQ-examples/jOOQ-nashorn-example/pom.xml
index f63f19745a..3689cc3cfd 100644
--- a/jOOQ-examples/jOOQ-nashorn-example/pom.xml
+++ b/jOOQ-examples/jOOQ-nashorn-example/pom.xml
@@ -181,19 +181,9 @@
                                 <password>${db.password}</password>
                             </jdbc>
                             <generator>
-                                <name>org.jooq.util.DefaultGenerator</name>
                                 <database>
-                                    <name>org.jooq.util.h2.H2Database</name>
-                                    <includes>.*</includes>
-                                    <excludes></excludes>
-                                    <dateAsTimestamp>true</dateAsTimestamp>
                                     <inputSchema>PUBLIC</inputSchema>
                                 </database>
-                                <generate>
-                                    <deprecated>false</deprecated>
-                                    <instanceFields>true</instanceFields>
-                                    <pojos>false</pojos>
-                                </generate>
                                 <target>
                                     <packageName>org.jooq.example.db.h2</packageName>
                                     <directory>target/generated-sources/jooq-h2</directory>
@@ -202,13 +192,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.h2database</groupId>
-                        <artifactId>h2</artifactId>
-                        <version>${org.h2.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/jOOQ-examples/jOOQ-spring-example/pom.xml b/jOOQ-examples/jOOQ-spring-example/pom.xml
index 05a465185a..667fea66e1 100644
--- a/jOOQ-examples/jOOQ-spring-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-example/pom.xml
@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>4.1.2.RELEASE</org.springframework.version>
         <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
+        <org.h2.version>1.4.181</org.h2.version>
 		<java.version>1.8</java.version>
     </properties>
     
@@ -39,7 +40,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.168</version>
+            <version>${org.h2.version}</version>
         </dependency>
 
         <!-- Logging -->
@@ -177,7 +178,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>1.3.168</version>
+                        <version>${org.h2.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -203,16 +204,10 @@
                                 <password>${db.password}</password>
                             </jdbc>
                             <generator>
-                                <name>org.jooq.util.DefaultGenerator</name>
                                 <database>
-                                    <name>org.jooq.util.h2.H2Database</name>
-                                    <includes>.*</includes>
-                                    <excludes></excludes>
-                                    <dateAsTimestamp>true</dateAsTimestamp>
                                     <inputSchema>PUBLIC</inputSchema>
                                 </database>
                                 <generate>
-                                    <deprecated>false</deprecated>
                                     <instanceFields>true</instanceFields>
                                     <pojos>true</pojos>
                                 </generate>
@@ -224,13 +219,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.h2database</groupId>
-                        <artifactId>h2</artifactId>
-                        <version>1.3.168</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
index 721b97a32b..faa8764e5d 100644
--- a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>4.1.2.RELEASE</org.springframework.version>
         <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
+        <org.h2.version>1.4.181</org.h2.version>
     </properties>
 
     <dependencies>
@@ -38,7 +39,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.168</version>
+            <version>${org.h2.version}</version>
         </dependency>
         
         <!-- Logging -->
@@ -143,7 +144,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>1.3.168</version>
+                        <version>${org.h2.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -169,12 +170,7 @@
                                 <password>${db.password}</password>
                             </jdbc>
                             <generator>
-                                <name>org.jooq.util.DefaultGenerator</name>
                                 <database>
-                                    <name>org.jooq.util.h2.H2Database</name>
-                                    <includes>.*</includes>
-                                    <excludes></excludes>
-                                    <dateAsTimestamp>true</dateAsTimestamp>
                                     <inputSchema>PUBLIC</inputSchema>
                                 </database>
                                 <generate>
@@ -191,13 +187,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.h2database</groupId>
-                        <artifactId>h2</artifactId>
-                        <version>1.3.168</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/jOOQ-examples/jOOQ-vertabelo-example/pom.xml b/jOOQ-examples/jOOQ-vertabelo-example/pom.xml
index 89bc93ab7d..cfc62dc875 100644
--- a/jOOQ-examples/jOOQ-vertabelo-example/pom.xml
+++ b/jOOQ-examples/jOOQ-vertabelo-example/pom.xml
@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
         <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
+        <org.h2.version>1.4.181</org.h2.version>
     </properties>
     
     <dependencies>
@@ -33,7 +34,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.168</version>
+            <version>${org.h2.version}</version>
         </dependency>
 
         <!-- Logging -->
@@ -154,7 +155,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>1.3.168</version>
+                        <version>${org.h2.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/jOOQ-scala/pom.xml b/jOOQ-scala/pom.xml
index d2333ddeb7..649f7f38fe 100644
--- a/jOOQ-scala/pom.xml
+++ b/jOOQ-scala/pom.xml
@@ -16,6 +16,7 @@
 
     <properties>
         <scala.version>2.10.4</scala.version>
+        <org.h2.version>1.4.181</org.h2.version>
     </properties>
 
     <build>
@@ -33,7 +34,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>1.3.168</version>
+                        <version>${org.h2.version}</version>
                     </dependency>
                 </dependencies>
 
@@ -84,12 +85,7 @@
                                 <password></password>
                             </jdbc>
                             <generator>
-                                <name>org.jooq.util.DefaultGenerator</name>
                                 <database>
-                                    <name>org.jooq.util.h2.H2Database</name>
-                                    <includes>.*</includes>
-                                    <excludes></excludes>
-                                    <dateAsTimestamp>true</dateAsTimestamp>
                                     <inputSchema>PUBLIC</inputSchema>
                                 </database>
                                 <generate>
@@ -119,13 +115,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.h2database</groupId>
-                        <artifactId>h2</artifactId>
-                        <version>1.3.174</version>
-                    </dependency>
-                </dependencies>
             </plugin>
 
             <!-- The Scala compiler plugin -->
@@ -203,7 +192,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.174</version>
+            <version>${org.h2.version}</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>