From 3ab0a499aab8e576a062c75d3c2eadff3c4fa7ca Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Mon, 29 May 2017 14:21:34 +0200
Subject: [PATCH] [#6287] Overwrite the managed version and remove duplicates

---
 jOOQ-examples/jOOQ-spring-boot-example/pom.xml              | 6 ++----
 .../src/test/java/org/jooq/example/spring/QueryTest.java    | 4 ++--
 .../test/java/org/jooq/example/spring/TransactionTest.java  | 4 ++--
 jOOQ/src/main/resources/META-INF/ABOUT.txt                  | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jOOQ-examples/jOOQ-spring-boot-example/pom.xml b/jOOQ-examples/jOOQ-spring-boot-example/pom.xml
index 6a235abf0b..1a891b6154 100644
--- a/jOOQ-examples/jOOQ-spring-boot-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-boot-example/pom.xml
@@ -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>
diff --git a/jOOQ-examples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/QueryTest.java b/jOOQ-examples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/QueryTest.java
index 824c44c078..0dbd73207c 100644
--- a/jOOQ-examples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/QueryTest.java
+++ b/jOOQ-examples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/QueryTest.java
@@ -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 {
 
diff --git a/jOOQ-examples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/TransactionTest.java b/jOOQ-examples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/TransactionTest.java
index b48e9178d6..622e331f93 100644
--- a/jOOQ-examples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/TransactionTest.java
+++ b/jOOQ-examples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/TransactionTest.java
@@ -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 {
 
diff --git a/jOOQ/src/main/resources/META-INF/ABOUT.txt b/jOOQ/src/main/resources/META-INF/ABOUT.txt
index ec1a26a9f5..bea887547e 100644
--- a/jOOQ/src/main/resources/META-INF/ABOUT.txt
+++ b/jOOQ/src/main/resources/META-INF/ABOUT.txt
@@ -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