From dfdb5a1d8cff4327a88220dfcc7f8df31814bf65 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Mon, 10 Sep 2018 09:28:05 -0400 Subject: [PATCH] sparate beans and repositories Seperate out Beans and repositories for RequestDB Change-Id: I67d6597d580e9828b6bb8faafaea7e09cc6467c0 Issue-ID: SO-999 Signed-off-by: Benjamin, Max (mb388a) --- .gitignore | 11 ++-- adapters/mso-requests-db-adapter/pom.xml | 5 ++ adapters/mso-vfc-adapter/pom.xml | 5 ++ asdc-controller/pom.xml | 8 +-- bpmn/MSOCommonBPMN/pom.xml | 3 +- mso-api-handlers/mso-api-handler-infra/pom.xml | 5 ++ .../mso-requests-db-repositories/pom.xml | 55 +++++++++++++++++ .../ArchivedInfraRequestsRepository.java | 0 .../repository/InfraActiveRequestsRepository.java | 0 .../InfraActiveRequestsRepositoryCustom.java | 0 .../InfraActiveRequestsRepositoryImpl.java | 0 .../data/repository/OperationStatusRepository.java | 0 ...OperationalEnvDistributionStatusRepository.java | 0 ...OperationalEnvServiceModelStatusRepository.java | 0 .../RequestProcessingDataRepository.java | 0 .../ResourceOperationStatusRepository.java | 0 .../data/repository/SiteStatusRepository.java | 0 ...chdogComponentDistributionStatusRepository.java | 0 .../WatchdogDistributionStatusRepository.java | 0 .../WatchdogServiceModVerIdLookupRepository.java | 0 .../src/test/java/org/onap/so/BaseTest.java | 0 .../src/test/java/org/onap/so/TestApplication.java | 0 .../onap/so/db/request/OperationStatusTest.java | 0 .../OperationalEnvServiceModelStatusTest.java | 0 .../org/onap/so/db/request/RequestDBConfig.java | 0 .../org/onap/so/db/request/SiteStatusTest.java | 0 .../InfraActiveRequestsRepositoryImplTest.java | 0 .../src/test/resources/afterMigrate.sql | 0 .../src/test/resources/application-test.yaml | 45 ++++++++++++++ .../src/test/resources/logback-test.xml | 46 ++++++++++++++ .../src/test/resources/schema.sql | 0 mso-api-handlers/mso-requests-db/pom.xml | 72 +--------------------- .../src/main/java/META-INF/MANIFEST.MF | 3 - .../mso-requests-db/src/main/resources/beans.xml | 12 ---- mso-api-handlers/pom.xml | 1 + 35 files changed, 176 insertions(+), 95 deletions(-) create mode 100644 mso-api-handlers/mso-requests-db-repositories/pom.xml rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/java/org/onap/so/BaseTest.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/java/org/onap/so/TestApplication.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/java/org/onap/so/db/request/OperationStatusTest.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/java/org/onap/so/db/request/RequestDBConfig.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/java/org/onap/so/db/request/SiteStatusTest.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java (100%) rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/resources/afterMigrate.sql (100%) create mode 100644 mso-api-handlers/mso-requests-db-repositories/src/test/resources/application-test.yaml create mode 100644 mso-api-handlers/mso-requests-db-repositories/src/test/resources/logback-test.xml rename mso-api-handlers/{mso-requests-db => mso-requests-db-repositories}/src/test/resources/schema.sql (100%) delete mode 100644 mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF delete mode 100644 mso-api-handlers/mso-requests-db/src/main/resources/beans.xml diff --git a/.gitignore b/.gitignore index 5817c6984f..51723ae248 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ target -.settings -.classpath -.project -.buildpath -.factorypath +**/.settings +**/.classpath +**/.project +**/.buildpath +**/.factorypath +**/.springBeans .idea .checkstyle .DS_Store diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 6669895ef1..9dff66b00d 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -66,6 +66,11 @@ mso-requests-db ${project.version} + + org.onap.so + mso-requests-db-repositories + ${project.version} + org.springframework.boot spring-boot-starter-data-jpa diff --git a/adapters/mso-vfc-adapter/pom.xml b/adapters/mso-vfc-adapter/pom.xml index d416c8e1e2..4d1c612018 100644 --- a/adapters/mso-vfc-adapter/pom.xml +++ b/adapters/mso-vfc-adapter/pom.xml @@ -96,6 +96,11 @@ mso-requests-db ${project.version} + + org.onap.so + mso-requests-db-repositories + ${project.version} + org.mariadb.jdbc mariadb-java-client diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 28fd24c0c8..87b269f3f6 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -221,11 +221,11 @@ org.onap.so mso-requests-db ${project.version} - + - janino - janino - 2.5.15 + org.onap.so + mso-requests-db-repositories + ${project.version} org.antlr diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index 532c062ea7..c993071969 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -254,8 +254,7 @@ org.onap.so - mso-requests-db - client + mso-requests-db ${project.version} diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index f871e120e7..37941b83e0 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -149,6 +149,11 @@ mso-requests-db ${project.version} + + org.onap.so + mso-requests-db-repositories + ${project.version} + org.onap.so mso-catalog-db diff --git a/mso-api-handlers/mso-requests-db-repositories/pom.xml b/mso-api-handlers/mso-requests-db-repositories/pom.xml new file mode 100644 index 0000000000..a46111bf96 --- /dev/null +++ b/mso-api-handlers/mso-requests-db-repositories/pom.xml @@ -0,0 +1,55 @@ + + 4.0.0 + + + org.onap.so + mso-api-handlers + 1.3.0-SNAPSHOT + + + mso-requests-db-repositories + + mso-requests-db-repositories + SO Request Database JPA Respositories + + UTF-8 + UTF-8 + + + + org.onap.so + mso-requests-db + ${project.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + true + + + org.springframework.boot + spring-boot-starter-data-rest + true + + + com.h2database + h2 + test + + + org.mariadb.jdbc + mariadb-java-client + test + + + org.springframework.boot + spring-boot-starter-test + test + + + jar + + ${project.artifactId} + + \ No newline at end of file diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java rename to mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/BaseTest.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/BaseTest.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/BaseTest.java rename to mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/BaseTest.java diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/TestApplication.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/TestApplication.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/TestApplication.java rename to mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/TestApplication.java diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationStatusTest.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationStatusTest.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationStatusTest.java rename to mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationStatusTest.java diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java rename to mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/RequestDBConfig.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/RequestDBConfig.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/RequestDBConfig.java rename to mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/RequestDBConfig.java diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/SiteStatusTest.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/SiteStatusTest.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/SiteStatusTest.java rename to mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/SiteStatusTest.java diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java rename to mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java diff --git a/mso-api-handlers/mso-requests-db/src/test/resources/afterMigrate.sql b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/afterMigrate.sql similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/resources/afterMigrate.sql rename to mso-api-handlers/mso-requests-db-repositories/src/test/resources/afterMigrate.sql diff --git a/mso-api-handlers/mso-requests-db-repositories/src/test/resources/application-test.yaml b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/application-test.yaml new file mode 100644 index 0000000000..c4dd60356b --- /dev/null +++ b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/application-test.yaml @@ -0,0 +1,45 @@ +# will be used as entry in DB to say SITE OFF/ON for healthcheck + +server: + port: 8080 + tomcat: + max-threads: 50 +ssl-enable: false +mso: + adapters: + requestDb: + auth: Basic YnBlbDptc28tZGItMTUwNyE= + endpoint: http://localhost:8081 + site-name: localDevEnv + logPath: logs + +# H2 +spring: + datasource: + url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1; + username: sa + password: sa + driver-class-name: org.h2.Driver + h2: + console: + enabled: true + path: /h2 + + jpa: + show-sql: true + hibernate: + dialect: org.hibernate.dialect.MySQL5Dialect + ddl-auto: none + naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy + enable-lazy-load-no-trans: true + + +#Actuator +management: + security: + enabled: false + basic: + enabled: false + + + diff --git a/mso-api-handlers/mso-requests-db-repositories/src/test/resources/logback-test.xml b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..1951484752 --- /dev/null +++ b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/logback-test.xml @@ -0,0 +1,46 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mso-api-handlers/mso-requests-db/src/test/resources/schema.sql b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/schema.sql similarity index 100% rename from mso-api-handlers/mso-requests-db/src/test/resources/schema.sql rename to mso-api-handlers/mso-requests-db-repositories/src/test/resources/schema.sql diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index a3b0ec1258..5ef683b444 100644 --- a/mso-api-handlers/mso-requests-db/pom.xml +++ b/mso-api-handlers/mso-requests-db/pom.xml @@ -9,7 +9,6 @@ mso-requests-db - mso-requests-db MSO Requests Database definition and Hibernate objects @@ -21,85 +20,20 @@ uk.co.blackpepper.bowman bowman-client 0.3.0 - - - org.hibernate - hibernate-core - true - - - org.hibernate - hibernate-entitymanager - true - - - org.springframework.boot - spring-boot-starter-data-jpa - true - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - 1.0.0.Final - true - - - org.springframework.boot - spring-boot-starter-tomcat - + org.onap.so common ${project.version} - - - javax.annotation - javax.annotation-api - 1.2 - + org.springframework.boot spring-boot-starter-test test - - com.h2database - h2 - test - - - org.mariadb.jdbc - mariadb-java-client - - - org.springframework.boot - spring-boot-starter-data-rest - true - jar - ${project.artifactId} - - - org.apache.maven.plugins - maven-jar-plugin - - - package - - jar - - - client - - **/repository/** - - - - - - + ${project.artifactId} - \ No newline at end of file diff --git a/mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF b/mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 5e9495128c..0000000000 --- a/mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml b/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml deleted file mode 100644 index cd1bc8b7d7..0000000000 --- a/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index aed05209cb..078971ec29 100644 --- a/mso-api-handlers/pom.xml +++ b/mso-api-handlers/pom.xml @@ -14,6 +14,7 @@ mso-requests-db + mso-requests-db-repositories mso-api-handler-common mso-api-handler-infra -- 2.16.6