diff --git a/adapter-commons/pom.xml b/adapter-commons/pom.xml index 1728618..87d8e80 100644 --- a/adapter-commons/pom.xml +++ b/adapter-commons/pom.xml @@ -33,6 +33,16 @@ spring-boot-starter-test test + + com.h2database + h2 + 1.4.197 + + + org.liquibase + liquibase-core + 3.5.5 + diff --git a/adapter-commons/src/test/resources/application.properties b/adapter-commons/src/test/resources/application.properties index e2ed5d8..7c12965 100644 --- a/adapter-commons/src/test/resources/application.properties +++ b/adapter-commons/src/test/resources/application.properties @@ -1,10 +1,18 @@ spring.main.banner-mode=off spring.jpa.database=default spring.jpa.generate-ddl=false -spring.datasource.url=jdbc:postgresql://localhost:5432/postgres -spring.datasource.username=postgres -spring.datasource.password= -spring.datasource.driver-class-name=org.postgresql.Driver +#spring.datasource.url=jdbc:postgresql://localhost:5432/postgres +#spring.datasource.username=postgres +#spring.datasource.password= +#spring.datasource.driver-class-name=org.postgresql.Driver + +spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_ON_EXIT=FALSE +spring.datasource.username=sa +spring.datasource.password=sa +spring.datasource.driver-class-name=org.h2.Driver + +spring.liquibase.change-log=classpath:/schema/db.changelog.xml + logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n logging.level.org.hibernate.SQL=debug logging.level.=error diff --git a/db-commons/src/main/resources/schema/commons.xml b/adapter-commons/src/test/resources/schema/commons.xml similarity index 100% rename from db-commons/src/main/resources/schema/commons.xml rename to adapter-commons/src/test/resources/schema/commons.xml diff --git a/db-commons/src/main/resources/schema/db.changelog.xml b/adapter-commons/src/test/resources/schema/db.changelog.xml similarity index 100% rename from db-commons/src/main/resources/schema/db.changelog.xml rename to adapter-commons/src/test/resources/schema/db.changelog.xml diff --git a/db-commons/src/main/resources/schema/delivery-planning.xml b/adapter-commons/src/test/resources/schema/delivery-planning.xml similarity index 100% rename from db-commons/src/main/resources/schema/delivery-planning.xml rename to adapter-commons/src/test/resources/schema/delivery-planning.xml diff --git a/db-commons/src/main/resources/schema/demand-forecasting.xml b/adapter-commons/src/test/resources/schema/demand-forecasting.xml similarity index 100% rename from db-commons/src/main/resources/schema/demand-forecasting.xml rename to adapter-commons/src/test/resources/schema/demand-forecasting.xml diff --git a/db-commons/src/main/resources/schema/product-management.xml b/adapter-commons/src/test/resources/schema/product-management.xml similarity index 100% rename from db-commons/src/main/resources/schema/product-management.xml rename to adapter-commons/src/test/resources/schema/product-management.xml diff --git a/db-commons/src/main/resources/schema/production-planning.xml b/adapter-commons/src/test/resources/schema/production-planning.xml similarity index 100% rename from db-commons/src/main/resources/schema/production-planning.xml rename to adapter-commons/src/test/resources/schema/production-planning.xml diff --git a/db-commons/src/main/resources/schema/shortages-prediction.xml b/adapter-commons/src/test/resources/schema/shortages-prediction.xml similarity index 100% rename from db-commons/src/main/resources/schema/shortages-prediction.xml rename to adapter-commons/src/test/resources/schema/shortages-prediction.xml diff --git a/db-commons/pom.xml b/db-commons/pom.xml deleted file mode 100644 index cfd353c..0000000 --- a/db-commons/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - factory - pl.com.dddbyexamples - 1.0-SNAPSHOT - - 4.0.0 - - db-commons - - - - com.h2database - h2 - 1.4.197 - - - org.liquibase - liquibase-core - 3.5.5 - - - - \ No newline at end of file diff --git a/demand-forecasting-adapters/pom.xml b/demand-forecasting-adapters/pom.xml index a7310da..68111f0 100644 --- a/demand-forecasting-adapters/pom.xml +++ b/demand-forecasting-adapters/pom.xml @@ -68,12 +68,6 @@ 1.7.9 test - - pl.com.dddbyexamples - db-commons - 1.0-SNAPSHOT - test - diff --git a/demand-forecasting-adapters/src/test/resources/application.properties b/demand-forecasting-adapters/src/test/resources/application.properties deleted file mode 100644 index df62e6e..0000000 --- a/demand-forecasting-adapters/src/test/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ -spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_ON_EXIT=FALSE -spring.datasource.username=sa -spring.datasource.password=sa -spring.datasource.driver-class-name=org.h2.Driver -spring.liquibase.change-log=classpath:/schema/db.changelog.xml - diff --git a/pom.xml b/pom.xml index f98e913..c9038bf 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ shortages-prediction-adapters product-management-adapters production-planning-adapters - db-commons diff --git a/product-management-adapters/src/test/resources/application.properties b/product-management-adapters/src/test/resources/application.properties deleted file mode 100644 index df62e6e..0000000 --- a/product-management-adapters/src/test/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ -spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_ON_EXIT=FALSE -spring.datasource.username=sa -spring.datasource.password=sa -spring.datasource.driver-class-name=org.h2.Driver -spring.liquibase.change-log=classpath:/schema/db.changelog.xml - diff --git a/shortages-prediction-adapters/src/test/resources/application.properties b/shortages-prediction-adapters/src/test/resources/application.properties deleted file mode 100644 index df62e6e..0000000 --- a/shortages-prediction-adapters/src/test/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ -spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_ON_EXIT=FALSE -spring.datasource.username=sa -spring.datasource.password=sa -spring.datasource.driver-class-name=org.h2.Driver -spring.liquibase.change-log=classpath:/schema/db.changelog.xml -