From d7362d40cda8be1f4d2ee02a8ea452190325517a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Heffner?=
 <56156750+gitgoodjhe@users.noreply.github.com>
Date: Wed, 12 Feb 2020 14:20:45 +0100
Subject: [PATCH] TSK-1111 Fix TaskHistoryEventControllerIntTest

- Added overriding beans option to application.json
- Changed junit-vintage-engine version
---
 history/taskana-simplehistory-spring-test/pom.xml               | 2 +-
 .../src/main/resources/application.properties                   | 1 +
 pom.xml                                                         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/history/taskana-simplehistory-spring-test/pom.xml b/history/taskana-simplehistory-spring-test/pom.xml
index 98030f19c..874005513 100644
--- a/history/taskana-simplehistory-spring-test/pom.xml
+++ b/history/taskana-simplehistory-spring-test/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>${version.junit.jupiter}</version>
+            <version>${version.junit.vintage.engine}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/history/taskana-simplehistory-spring-test/src/main/resources/application.properties b/history/taskana-simplehistory-spring-test/src/main/resources/application.properties
index c98e26959..6239a74b6 100644
--- a/history/taskana-simplehistory-spring-test/src/main/resources/application.properties
+++ b/history/taskana-simplehistory-spring-test/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 logging.level.pro.taskana=INFO
 taskana.schemaName=TASKANA
+spring.main.allow-bean-definition-overriding=true
diff --git a/pom.xml b/pom.xml
index 91c8b4d52..550f48274 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
         <!-- test dependencies -->
         <version.assertj>3.15.0</version.assertj>
         <version.junit.jupiter>5.6.0</version.junit.jupiter>
+        <version.junit.vintage.engine>5.5.2</version.junit.vintage.engine>
         <version.log4j>2.13.0</version.log4j>
         <version.archunit>0.13.1</version.archunit>
         <version.mockito>3.2.4</version.mockito>