Upgraded H2 in example projects

This commit is contained in:
lukaseder 2014-11-27 08:38:41 +01:00
parent ba9557e700
commit 2401501864
6 changed files with 14 additions and 63 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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