diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index f4eb995f8..c7c6dda58 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -62,7 +62,7 @@ jobs: - name: Eagerly pull Docker images run: | - docker pull mysql:latest + docker pull postgres:latest - name: Run tests run: | diff --git a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/pom.xml index 3914692d3..00172f5f5 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/pom.xml +++ b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/pom.xml @@ -83,8 +83,8 @@ runtime - mysql - mysql-connector-java + org.postgresql + postgresql runtime @@ -108,11 +108,11 @@ io.micronaut.testresources - micronaut-test-resources-jdbc-mysql + micronaut-test-resources-jdbc-postgresql - mysql - mysql-connector-java + org.postgresql + postgresql diff --git a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/java/io/micronaut/build/examples/BookRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/java/io/micronaut/build/examples/BookRepository.java index 5c2613bce..9b8963dff 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/java/io/micronaut/build/examples/BookRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/java/io/micronaut/build/examples/BookRepository.java @@ -21,7 +21,7 @@ import java.util.List; -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface BookRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/java/io/micronaut/build/examples/UserRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/java/io/micronaut/build/examples/UserRepository.java index 3eeb815fc..90bc664f6 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/java/io/micronaut/build/examples/UserRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/java/io/micronaut/build/examples/UserRepository.java @@ -22,7 +22,7 @@ import java.util.List; //@Repository("users") -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface UserRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/resources/application.yml index a0d496ee7..6f45a20f1 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/resources/application.yml +++ b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/main/resources/application.yml @@ -7,9 +7,6 @@ netty: max-order: 3 datasources: default: - schema-generate: CREATE - dialect: MYSQL -# users: -# driverClassName: org.postgresql.Driver -# schema-generate: CREATE_DROP -# dialect: POSTGRES + driverClassName: org.postgresql.Driver + schema-generate: CREATE_DROP + dialect: POSTGRES diff --git a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/test/java/io/micronaut/build/examples/DemoTest.java b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/test/java/io/micronaut/build/examples/DemoTest.java index 1add3de8d..6bd035ca9 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/test/java/io/micronaut/build/examples/DemoTest.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/src/test/java/io/micronaut/build/examples/DemoTest.java @@ -28,7 +28,7 @@ void testCustomProperty() { } */ @Test - @DisplayName("A MySQL test container is required to run this test") + @DisplayName("A POSTGRES test container is required to run this test") void testItWorks() { Book book = new Book(); book.setTitle("Yet Another Book " + UUID.randomUUID()); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-disabled/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-disabled/pom.xml index 1fa6640f4..c61a80541 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-disabled/pom.xml +++ b/micronaut-maven-integration-tests/src/it/test-resources-disabled/pom.xml @@ -82,8 +82,8 @@ runtime - mysql - mysql-connector-java + org.postgresql + postgresql runtime diff --git a/micronaut-maven-integration-tests/src/it/test-resources-disabled/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources-disabled/src/main/resources/application.yml index dd7077b77..2a984dc42 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-disabled/src/main/resources/application.yml +++ b/micronaut-maven-integration-tests/src/it/test-resources-disabled/src/main/resources/application.yml @@ -7,9 +7,6 @@ netty: max-order: 3 datasources: default: + driverClassName: org.postgresql.Driver schema-generate: CREATE - dialect: MYSQL -# users: -# driverClassName: org.postgresql.Driver -# schema-generate: CREATE_DROP -# dialect: POSTGRES + dialect: POSTGRES diff --git a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/pom.xml index 0e9c493ea..8d514b4c0 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/pom.xml +++ b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/pom.xml @@ -83,8 +83,8 @@ runtime - mysql - mysql-connector-java + org.postgresql + postgresql runtime diff --git a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/java/io/micronaut/build/examples/BookRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/java/io/micronaut/build/examples/BookRepository.java index 5c2613bce..9b8963dff 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/java/io/micronaut/build/examples/BookRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/java/io/micronaut/build/examples/BookRepository.java @@ -21,7 +21,7 @@ import java.util.List; -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface BookRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/java/io/micronaut/build/examples/UserRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/java/io/micronaut/build/examples/UserRepository.java index 3eeb815fc..90bc664f6 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/java/io/micronaut/build/examples/UserRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/java/io/micronaut/build/examples/UserRepository.java @@ -22,7 +22,7 @@ import java.util.List; //@Repository("users") -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface UserRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/resources/application.yml index e938025c4..e8ac37b65 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/resources/application.yml +++ b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/main/resources/application.yml @@ -8,8 +8,5 @@ netty: datasources: default: schema-generate: CREATE - dialect: MYSQL -# users: -# driverClassName: org.postgresql.Driver -# schema-generate: CREATE_DROP -# dialect: POSTGRES + driverClassName: org.postgresql.Driver + dialect: POSTGRES diff --git a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/test/java/io/micronaut/build/examples/DemoTest.java b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/test/java/io/micronaut/build/examples/DemoTest.java index a84712bb8..c791dd9db 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/test/java/io/micronaut/build/examples/DemoTest.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-failing-test/src/test/java/io/micronaut/build/examples/DemoTest.java @@ -18,7 +18,7 @@ class DemoTest { BookRepository bookRepository; @Test - @DisplayName("A MySQL test container is required to run this test") + @DisplayName("A POSTGRES test container is required to run this test") void testItWorks() { Book book = new Book(); book.setTitle("Yet Another Book " + UUID.randomUUID()); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-run/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-run/pom.xml index a0682c883..71fff1c86 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-run/pom.xml +++ b/micronaut-maven-integration-tests/src/it/test-resources-run/pom.xml @@ -83,8 +83,8 @@ runtime - mysql - mysql-connector-java + org.postgresql + postgresql runtime diff --git a/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/BookRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/BookRepository.java index 5c2613bce..9b8963dff 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/BookRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/BookRepository.java @@ -21,7 +21,7 @@ import java.util.List; -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface BookRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/UserRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/UserRepository.java index 3eeb815fc..90bc664f6 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/UserRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/java/io/micronaut/build/examples/UserRepository.java @@ -22,7 +22,7 @@ import java.util.List; //@Repository("users") -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface UserRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/resources/application.yml index 71a1b4902..8b72add90 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/resources/application.yml +++ b/micronaut-maven-integration-tests/src/it/test-resources-run/src/main/resources/application.yml @@ -8,8 +8,5 @@ netty: datasources: default: schema-generate: CREATE - dialect: MYSQL -# users: -# driverClassName: org.postgresql.Driver -# schema-generate: CREATE_DROP -# dialect: POSTGRES + driverClassName: org.postgresql.Driver + dialect: POSTGRES diff --git a/micronaut-maven-integration-tests/src/it/test-resources-run/src/test/java/io/micronaut/build/examples/DemoTest.java b/micronaut-maven-integration-tests/src/it/test-resources-run/src/test/java/io/micronaut/build/examples/DemoTest.java index 1add3de8d..baadb244c 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-run/src/test/java/io/micronaut/build/examples/DemoTest.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-run/src/test/java/io/micronaut/build/examples/DemoTest.java @@ -28,7 +28,7 @@ void testCustomProperty() { } */ @Test - @DisplayName("A MySQL test container is required to run this test") + @DisplayName("A postgres test container is required to run this test") void testItWorks() { Book book = new Book(); book.setTitle("Yet Another Book " + UUID.randomUUID()); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-run/verify.groovy b/micronaut-maven-integration-tests/src/it/test-resources-run/verify.groovy index 6b23f9b82..31488d32b 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-run/verify.groovy +++ b/micronaut-maven-integration-tests/src/it/test-resources-run/verify.groovy @@ -3,7 +3,7 @@ assert log.exists() assert log.text.contains("BUILD SUCCESS") : "Build did not succeed" assert log.text.contains("Starting Micronaut Test Resources service") : "Test Resources service was not started" assert log.text.contains("Shutting down Micronaut Test Resources service") : "Test Resources service was not shutdown" -assert log.text.contains("Container mysql:latest started") : "mysql container was not started" +assert log.text.contains("Container postgres:latest started") : "postgres container was not started" assert log.text.contains("Startup completed in") : "Startup was not completed" String port = new File(basedir, "target/test-resources-port.txt").text diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/pom.xml index 677ddd9a8..c0fcbd95c 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/pom.xml +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/pom.xml @@ -83,8 +83,8 @@ runtime - mysql - mysql-connector-java + org.postgresql + postgresql runtime diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/java/io/micronaut/build/examples/BookRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/java/io/micronaut/build/examples/BookRepository.java index 5c2613bce..9b8963dff 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/java/io/micronaut/build/examples/BookRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/java/io/micronaut/build/examples/BookRepository.java @@ -21,7 +21,7 @@ import java.util.List; -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface BookRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/java/io/micronaut/build/examples/UserRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/java/io/micronaut/build/examples/UserRepository.java index 3eeb815fc..90bc664f6 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/java/io/micronaut/build/examples/UserRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/java/io/micronaut/build/examples/UserRepository.java @@ -22,7 +22,7 @@ import java.util.List; //@Repository("users") -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface UserRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/resources/application.yml index 53e166eb2..bad9fa8ad 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/resources/application.yml +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/main/resources/application.yml @@ -8,8 +8,5 @@ netty: datasources: default: schema-generate: CREATE - dialect: MYSQL -# users: -# driverClassName: org.postgresql.Driver -# schema-generate: CREATE_DROP -# dialect: POSTGRES + driverClassName: org.postgresql.Driver + dialect: POSTGRES diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/test/java/io/micronaut/build/examples/DemoTest.java b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/test/java/io/micronaut/build/examples/DemoTest.java index 1add3de8d..baadb244c 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/test/java/io/micronaut/build/examples/DemoTest.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/src/test/java/io/micronaut/build/examples/DemoTest.java @@ -28,7 +28,7 @@ void testCustomProperty() { } */ @Test - @DisplayName("A MySQL test container is required to run this test") + @DisplayName("A postgres test container is required to run this test") void testItWorks() { Book book = new Book(); book.setTitle("Yet Another Book " + UUID.randomUUID()); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-shared/pom.xml index 371be3987..344e76a34 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared/pom.xml +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared/pom.xml @@ -83,8 +83,8 @@ runtime - mysql - mysql-connector-java + org.postgresql + postgresql runtime diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/java/io/micronaut/build/examples/BookRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/java/io/micronaut/build/examples/BookRepository.java index 5c2613bce..9b8963dff 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/java/io/micronaut/build/examples/BookRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/java/io/micronaut/build/examples/BookRepository.java @@ -21,7 +21,7 @@ import java.util.List; -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface BookRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/java/io/micronaut/build/examples/UserRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/java/io/micronaut/build/examples/UserRepository.java index 3eeb815fc..90bc664f6 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/java/io/micronaut/build/examples/UserRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/java/io/micronaut/build/examples/UserRepository.java @@ -22,7 +22,7 @@ import java.util.List; //@Repository("users") -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface UserRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/resources/application.yml index 49c3a59e9..3824d07b9 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/resources/application.yml +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared/src/main/resources/application.yml @@ -8,8 +8,5 @@ netty: datasources: default: schema-generate: CREATE - dialect: MYSQL -# users: -# driverClassName: org.postgresql.Driver -# schema-generate: CREATE_DROP -# dialect: POSTGRES + driverClassName: org.postgresql.Driver + dialect: POSTGRES diff --git a/micronaut-maven-integration-tests/src/it/test-resources-shared/src/test/java/io/micronaut/build/examples/DemoTest.java b/micronaut-maven-integration-tests/src/it/test-resources-shared/src/test/java/io/micronaut/build/examples/DemoTest.java index 1add3de8d..baadb244c 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-shared/src/test/java/io/micronaut/build/examples/DemoTest.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-shared/src/test/java/io/micronaut/build/examples/DemoTest.java @@ -28,7 +28,7 @@ void testCustomProperty() { } */ @Test - @DisplayName("A MySQL test container is required to run this test") + @DisplayName("A postgres test container is required to run this test") void testItWorks() { Book book = new Book(); book.setTitle("Yet Another Book " + UUID.randomUUID()); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/pom.xml index 20afb286c..f0e47b8fd 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/pom.xml +++ b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/pom.xml @@ -83,8 +83,8 @@ runtime - mysql - mysql-connector-java + org.postgresql + postgresql runtime diff --git a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/java/io/micronaut/build/examples/BookRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/java/io/micronaut/build/examples/BookRepository.java index 5c2613bce..9b8963dff 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/java/io/micronaut/build/examples/BookRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/java/io/micronaut/build/examples/BookRepository.java @@ -21,7 +21,7 @@ import java.util.List; -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface BookRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/java/io/micronaut/build/examples/UserRepository.java b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/java/io/micronaut/build/examples/UserRepository.java index 3eeb815fc..90bc664f6 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/java/io/micronaut/build/examples/UserRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/java/io/micronaut/build/examples/UserRepository.java @@ -22,7 +22,7 @@ import java.util.List; //@Repository("users") -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface UserRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/resources/application.yml index 18ed27625..57a0a368b 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/resources/application.yml +++ b/micronaut-maven-integration-tests/src/it/test-resources-start-stop/src/main/resources/application.yml @@ -8,8 +8,5 @@ netty: datasources: default: schema-generate: CREATE - dialect: MYSQL -# users: -# driverClassName: org.postgresql.Driver -# schema-generate: CREATE_DROP -# dialect: POSTGRES + driverClassName: org.postgresql.Driver + dialect: POSTGRES diff --git a/micronaut-maven-integration-tests/src/it/test-resources/pom.xml b/micronaut-maven-integration-tests/src/it/test-resources/pom.xml index e71ef1e2f..0b54537b8 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources/pom.xml +++ b/micronaut-maven-integration-tests/src/it/test-resources/pom.xml @@ -63,8 +63,8 @@ runtime - mysql - mysql-connector-java + org.postgresql + postgresql runtime diff --git a/micronaut-maven-integration-tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/BookRepository.java b/micronaut-maven-integration-tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/BookRepository.java index 5c2613bce..9b8963dff 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/BookRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/BookRepository.java @@ -21,7 +21,7 @@ import java.util.List; -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface BookRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/UserRepository.java b/micronaut-maven-integration-tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/UserRepository.java index 3eeb815fc..90bc664f6 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/UserRepository.java +++ b/micronaut-maven-integration-tests/src/it/test-resources/src/main/java/io/micronaut/build/examples/UserRepository.java @@ -22,7 +22,7 @@ import java.util.List; //@Repository("users") -@JdbcRepository(dialect = Dialect.MYSQL) +@JdbcRepository(dialect = Dialect.POSTGRES) public interface UserRepository extends CrudRepository { @Override List findAll(); diff --git a/micronaut-maven-integration-tests/src/it/test-resources/src/main/resources/application.yml b/micronaut-maven-integration-tests/src/it/test-resources/src/main/resources/application.yml index cf50dd691..0a31e47ff 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources/src/main/resources/application.yml +++ b/micronaut-maven-integration-tests/src/it/test-resources/src/main/resources/application.yml @@ -3,7 +3,7 @@ micronaut: name: test-resources datasources: default: - driver-class-name: com.mysql.cj.jdbc.Driver - db-type: mysql - schema-generate: CREATE - dialect: MYSQL \ No newline at end of file + driver-class-name: org.postgresql.Driver + db-type: postgres + schema-generate: CREATE_DROP + dialect: POSTGRES \ No newline at end of file diff --git a/micronaut-maven-integration-tests/src/it/test-resources/src/test/java/io/micronaut/build/examples/DemoTest.java b/micronaut-maven-integration-tests/src/it/test-resources/src/test/java/io/micronaut/build/examples/DemoTest.java index 1add3de8d..baadb244c 100644 --- a/micronaut-maven-integration-tests/src/it/test-resources/src/test/java/io/micronaut/build/examples/DemoTest.java +++ b/micronaut-maven-integration-tests/src/it/test-resources/src/test/java/io/micronaut/build/examples/DemoTest.java @@ -28,7 +28,7 @@ void testCustomProperty() { } */ @Test - @DisplayName("A MySQL test container is required to run this test") + @DisplayName("A postgres test container is required to run this test") void testItWorks() { Book book = new Book(); book.setTitle("Yet Another Book " + UUID.randomUUID());