Skip to content

Commit

Permalink
Merge pull request #179 from zalando-nakadi/use-zomky-embedded-postgres
Browse files Browse the repository at this point in the history
use Zonky embedded postgres instead of opentable one for tests.
  • Loading branch information
ePaul authored Aug 22, 2023
2 parents 3b606e8 + 8e9d7a2 commit 1507b9b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 17 deletions.
18 changes: 3 additions & 15 deletions nakadi-producer-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
Expand Down Expand Up @@ -73,16 +72,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.opentable.components</groupId>
<artifactId>otj-pg-embedded</artifactId>
<version>0.7.1</version>
<groupId>io.zonky.test</groupId>
<artifactId>embedded-postgres</artifactId>
<version>2.0.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>postgresql</artifactId>
<groupId>postgresql</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand All @@ -109,11 +102,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>5.3.12</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;

import com.opentable.db.postgres.embedded.EmbeddedPostgres;
import io.zonky.test.db.postgres.embedded.EmbeddedPostgres;

@ContextConfiguration(classes=FlywayDataSourceIT.Config.class)
public class FlywayDataSourceIT extends BaseMockedExternalCommunicationIT {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.zalando.nakadiproducer.config;

import com.opentable.db.postgres.embedded.EmbeddedPostgres;

import io.zonky.test.db.postgres.embedded.EmbeddedPostgres;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
Expand Down

0 comments on commit 1507b9b

Please sign in to comment.