fix merge

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2020-05-27 18:26:08 +10:00
parent b8c7a9509a
commit 65dbcc7c86
1 changed files with 3 additions and 2 deletions

View File

@ -65,6 +65,7 @@
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<settingsPath>src/it/settings.xml</settingsPath>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<testcontainers.version>1.4.2</testcontainers.version>
</properties>
<licenses>
@ -1065,12 +1066,12 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.14.1</version>
<version>${testcontainers.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.14.1</version>
<version>${testcontainers.version}</version>
</dependency>
<!-- Old Deps -->
<dependency>