[#6287] Overwrite the managed version and remove duplicates

This commit is contained in:
lukaseder 2017-05-29 14:21:34 +02:00
parent cbc77cfa2f
commit 3ab0a499aa
4 changed files with 7 additions and 8 deletions

View File

@ -11,7 +11,7 @@
<groupId>org.jooq</groupId>
<artifactId>jooq-spring-boot-example</artifactId>
<version>${org.jooq.version}</version>
<version>${jooq.version}</version>
<packaging>jar</packaging>
<name>jOOQ Spring Boot Example</name>
@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>org.jooq.example.spring.Application</start-class>
<org.jooq.version>3.10.0-SNAPSHOT</org.jooq.version>
<jooq.version>3.10.0-SNAPSHOT</jooq.version>
<java.version>1.8</java.version>
</properties>
@ -39,7 +39,6 @@
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
<version>${org.jooq.version}</version>
</dependency>
<dependency>
@ -127,7 +126,6 @@
<plugin>
<groupId>org.jooq</groupId>
<artifactId>jooq-codegen-maven</artifactId>
<version>${org.jooq.version}</version>
<executions>
<execution>

View File

@ -20,13 +20,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit4.SpringRunner;
/**
* @author Lukas Eder
* @author Thomas Darimont
*/
@RunWith(SpringJUnit4ClassRunner.class)
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class)
public class QueryTest {

View File

@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
@ -27,7 +27,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
* @see <a
* href="http://www.petrikainulainen.net/programming/jooq/using-jooq-with-spring-configuration/">http://www.petrikainulainen.net/programming/jooq/using-jooq-with-spring-configuration/</a>
*/
@RunWith(SpringJUnit4ClassRunner.class)
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class)
public class TransactionTest {

View File

@ -27,6 +27,7 @@ Authors and contributors of jOOQ or parts of jOOQ in alphabetical order:
- Lukas Eder
- Matti Tahvonen
- Michael Doberenz
- Michael Simons
- Michał Kołodziejski
- Miguel Gonzalez Sanchez
- Nathaniel Fischer