diff --git a/src/orders/oci/build.gradle b/src/orders/oci/build.gradle index 078c38b6..9fcf1152 100644 --- a/src/orders/oci/build.gradle +++ b/src/orders/oci/build.gradle @@ -29,38 +29,7 @@ micronaut { } dependencies { - // annotationProcessor("io.micronaut.data:micronaut-data-processor") - - // implementation(project(":app")) { - // exclude group:'com.h2database', module:'h2' - // } - // implementation("io.micronaut.kubernetes:micronaut-kubernetes-discovery-client") - // implementation("io.micronaut.data:micronaut-data-hibernate-jpa") - // implementation("io.micronaut.sql:micronaut-jdbc-hikari") - // runtimeOnly("org.yaml:snakeyaml") - // runtimeOnly("ch.qos.logback:logback-classic") - // implementation("io.micronaut.oraclecloud:micronaut-oraclecloud-httpclient-netty") - - // // Metrics - // implementation("com.oracle.oci.sdk:oci-java-sdk-monitoring") - // implementation("io.micronaut.oraclecloud:micronaut-oraclecloud-micrometer") - - // // SDK - // implementation("io.micronaut.oraclecloud:micronaut-oraclecloud-sdk") - - // // Database - // implementation("io.micronaut.oraclecloud:micronaut-oraclecloud-atp") - // implementation platform("com.oracle.database.jdbc:ojdbc-bom:21.1.0.0") - - // runtimeOnly("com.oracle.database.security:oraclepki") - // runtimeOnly("com.oracle.database.security:osdt_cert") - // runtimeOnly("com.oracle.database.security:osdt_core") - - // testImplementation(project(":tck")) - // testImplementation("io.micronaut.nats:micronaut-nats") - // // testImplementation("org.testcontainers:junit-jupiter") - // testImplementation("org.testcontainers:oracle-xe") - annotationProcessor("io.micronaut.data:micronaut-data-processor") + annotationProcessor("io.micronaut.data:micronaut-data-processor") implementation(project(":app")) { exclude group:'com.h2database', module:'h2' @@ -77,7 +46,7 @@ dependencies { // Database implementation("io.micronaut.data:micronaut-data-hibernate-jpa") implementation("io.micronaut.oraclecloud:micronaut-oraclecloud-atp") - implementation platform("com.oracle.database.jdbc:ojdbc-bom:21.1.0.0") + implementation platform("com.oracle.database.jdbc:ojdbc-bom:23.3.0.23.09") runtimeOnly("com.oracle.database.security:oraclepki") runtimeOnly("com.oracle.database.security:osdt_cert") runtimeOnly("com.oracle.database.security:osdt_core") @@ -85,6 +54,7 @@ dependencies { testImplementation(project(":tck")) testImplementation("io.micronaut.nats:micronaut-nats") testImplementation("org.testcontainers:oracle-xe") + } application { diff --git a/src/orders/oci/src/main/resources/application-oraclecloud.yml b/src/orders/oci/src/main/resources/application-oraclecloud.yml index b8b1f3fd..edb478a8 100644 --- a/src/orders/oci/src/main/resources/application-oraclecloud.yml +++ b/src/orders/oci/src/main/resources/application-oraclecloud.yml @@ -32,3 +32,7 @@ tracing: url: ${ORACLECLOUD_TRACING_ZIPKIN_HTTP_URL} path: ${ORACLECLOUD_TRACING_ZIPKIN_HTTP_PATH} supportsJoin: false +flyway: + datasources: + default: + locations: classpath:db/migration \ No newline at end of file diff --git a/src/orders/oci/src/test/resources/application-test.yml b/src/orders/oci/src/test/resources/application-test.yml index 5a89a051..965c841e 100644 --- a/src/orders/oci/src/test/resources/application-test.yml +++ b/src/orders/oci/src/test/resources/application-test.yml @@ -3,12 +3,8 @@ micronaut: export: oraclecloud: enabled: false + datasources: default: url: jdbc:tc:oracle:thin:@/xe driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver - -flyway: - datasources: - default: - locations: classpath:db/migration