From 70c17020b7025a9ff18192d4d5add6f75ace49aa Mon Sep 17 00:00:00 2001 From: Claudio David Gasparini Date: Mon, 26 Oct 2020 10:12:10 +0100 Subject: [PATCH] Reestructore cps project + Introduce BOM artifacts + decoupling of root from parent new artifacts introduced: cps-bom: contains dependencyManagement declarations of all published components cps-dependencies: contains dependencyManagement declarations of upstream versions cps-parent: parent of cps project / decoupling of root project pom responsabilities JIRA: CCSDK-2946 Signed-off-by: Claudio David Gasparini Change-Id: I752c19dea6c92f939f0a313f6a93f13a489cdef0 Change-Id: Iafb4eee7d1b20aa4e7fcca0c0027f5a0605e035d --- cps/cps-bom/pom.xml | 31 ++++++ cps/cps-dependencies/pom.xml | 72 ++++++++++++++ cps/cps-parent/pom.xml | 231 +++++++++++++++++++++++++++++++++++++++++++ cps/cps-rest/pom.xml | 94 ++---------------- cps/cps-ri/pom.xml | 17 +--- cps/cps-service/pom.xml | 24 ++--- cps/pom.xml | 166 +++---------------------------- 7 files changed, 364 insertions(+), 271 deletions(-) create mode 100644 cps/cps-bom/pom.xml create mode 100644 cps/cps-dependencies/pom.xml create mode 100644 cps/cps-parent/pom.xml diff --git a/cps/cps-bom/pom.xml b/cps/cps-bom/pom.xml new file mode 100644 index 0000000000..ae9e806f3c --- /dev/null +++ b/cps/cps-bom/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + org.onap.cps + cps-bom + 0.0.1-SNAPSHOT + pom + + This artifact contains dependencyManagement declarations of all published CPS components. + + + + org.onap.cps + cps-service + ${project.version} + + + org.onap.cps + cps-rest + ${project.version} + + + org.onap.cps + cps-ri + ${project.version} + + + + \ No newline at end of file diff --git a/cps/cps-dependencies/pom.xml b/cps/cps-dependencies/pom.xml new file mode 100644 index 0000000000..6f50cd0fc1 --- /dev/null +++ b/cps/cps-dependencies/pom.xml @@ -0,0 +1,72 @@ + + + + 4.0.0 + org.onap.cps + cps-dependencies + 0.0.1-SNAPSHOT + pom + + ${project.groupId}:${project.artifactId} + This artifact contains dependencyManagement declarations of upstream versions. + + + 3.0.6 + 2.10.0 + 2.0-M2-groovy-3.0 + 2.3.3.RELEASE + 2.1.4 + 5.0.6 + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + pom + import + + + io.swagger.core.v3 + swagger-annotations + ${swagger.version} + + + io.swagger.core.v3 + swagger-jaxrs2 + ${swagger.version} + + + com.vladmihalcea + hibernate-types-52 + ${hibernate-types.version} + + + org.codehaus.groovy + groovy + ${groovy.version} + + + org.spockframework + spock-core + ${spock-core.version} + + + cglib + cglib-nodep + 3.1 + + + + \ No newline at end of file diff --git a/cps/cps-parent/pom.xml b/cps/cps-parent/pom.xml new file mode 100644 index 0000000000..2ddb2b6683 --- /dev/null +++ b/cps/cps-parent/pom.xml @@ -0,0 +1,231 @@ + + + + org.onap.oparent + oparent + 3.1.0 + + + 4.0.0 + + org.onap.cps + cps-parent + 0.0.1-SNAPSHOT + pom + + + 11 + 3.2.0 + 3.1.2 + 1.5.3 + 3.1.0 + 2.3.3.RELEASE + 3.35.0 + + + + + + org.onap.cps + cps-dependencies + ${project.version} + pom + import + + + org.onap.cps + cps-bom + ${project.version} + pom + import + + + + + + + + src/main/resources + true + + + target/generated-sources/license + + third-party-licenses.txt + + + + target/generated-resources/licenses + + *.* + + third-party-licenses + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot-maven-plugin.version} + + + + repackage + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + prepare-package + + unpack + + + + + org.webjars + swagger-ui + ${swagger-ui.version} + + + + ${project.build.directory}/swagger-ui-${swagger-ui.version} + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + copy-resources + prepare-package + + copy-resources + + + ${project.build.outputDirectory}/static/swagger-ui + + + + + ${project.build.directory}/swagger-ui-${swagger-ui.version}/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/ + + + **/*.gz + + + + + + + + + + com.google.code.maven-replacer-plugin + replacer + ${maven-replacer-plugin.version} + + + prepare-package + + replace + + + + + ${project.build.outputDirectory}/static/swagger-ui/index.html + + + https://petstore.swagger.io/v2/swagger.json + /api/cps/openapi.json + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + onap-java-style + + check + + process-sources + + onap-checkstyle/onap-java-style.xml + ${project.build.sourceDirectory} + true + true + true + false + warning + true + + + + + + org.onap.oparent + checkstyle + ${oparent.version} + + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 1.9.0 + + + + compileTests + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + false + + **/*Spec.java + **/*Test.java + + + + + + \ No newline at end of file diff --git a/cps/cps-rest/pom.xml b/cps/cps-rest/pom.xml index ed896a82f4..f9be75b7e3 100644 --- a/cps/cps-rest/pom.xml +++ b/cps/cps-rest/pom.xml @@ -2,27 +2,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cps-rest org.onap.cps - cps + cps-parent 0.0.1-SNAPSHOT + ../cps-parent/pom.xml - + cps-rest + - org.onap.cps + ${project.groupId} cps-service - ${project.version} - - org.onap.cps + ${project.groupId} cps-ri - ${project.version} - org.springframework.boot spring-boot-starter-web @@ -33,24 +30,18 @@ - org.springframework.boot spring-boot-starter-jetty - io.swagger.core.v3 swagger-annotations - ${swagger.version} - io.swagger.core.v3 swagger-jaxrs2 - ${swagger.version} - org.springframework.boot spring-boot-starter-test @@ -62,7 +53,6 @@ - @@ -70,93 +60,21 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} - - - - repackage - - - - org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.version} - - - prepare-package - - unpack - - - - - org.webjars - swagger-ui - ${swagger-ui.version} - - - - ${project.build.directory}/swagger-ui-${swagger-ui.version} - - - - org.apache.maven.plugins maven-resources-plugin - ${maven-resources-plugin.version} - - - copy-resources - prepare-package - - copy-resources - - - ${project.build.outputDirectory}/static/swagger-ui - - - - - ${project.build.directory}/swagger-ui-${swagger-ui.version}/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/ - - - **/*.gz - - - - - - com.google.code.maven-replacer-plugin replacer - ${maven-replacer-plugin.version} - - - prepare-package - - replace - - - - - ${project.build.outputDirectory}/static/swagger-ui/index.html - - - https://petstore.swagger.io/v2/swagger.json - /api/cps/openapi.json - - - diff --git a/cps/cps-ri/pom.xml b/cps/cps-ri/pom.xml index 77cb5f86ac..2c28212afa 100644 --- a/cps/cps-ri/pom.xml +++ b/cps/cps-ri/pom.xml @@ -4,46 +4,37 @@ 4.0.0 org.onap.cps - cps + cps-parent 0.0.1-SNAPSHOT + ../cps-parent/pom.xml cps-ri - - org.onap.cps + ${project.groupId} cps-service - ${project.version} - org.springframework.boot spring-boot-starter-data-jpa - org.springframework.boot spring-boot-starter-validation - org.postgresql postgresql - - + com.vladmihalcea hibernate-types-52 - ${hibernate-types.version} - org.projectlombok lombok - - diff --git a/cps/cps-service/pom.xml b/cps/cps-service/pom.xml index ea1bdad39b..3e8cc2debd 100644 --- a/cps/cps-service/pom.xml +++ b/cps/cps-service/pom.xml @@ -4,75 +4,65 @@ 4.0.0 org.onap.cps - cps + cps-parent 0.0.1-SNAPSHOT + ../cps-parent/pom.xml + cps-service - org.opendaylight.yangtools yang-parser-api - ${yangtools.version} - org.opendaylight.yangtools yang-parser-impl - ${yangtools.version} - org.opendaylight.yangtools yang-model-util - ${yangtools.version} - + - org.opendaylight.yangtools yang-data-codec-gson - ${yangtools.version} - org.projectlombok lombok - org.slf4j slf4j-api - org.springframework spring-context - com.google.code.gson gson - org.codehaus.groovy groovy + test org.spockframework spock-core + test cglib cglib-nodep + test - - diff --git a/cps/pom.xml b/cps/pom.xml index 892492d2d2..c2d6c7994d 100644 --- a/cps/pom.xml +++ b/cps/pom.xml @@ -1,177 +1,37 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.oparent oparent 3.1.0 + org.onap.cps - cps + cps-aggregator 0.0.1-SNAPSHOT pom + cps ONAP Configuration and Persistency Service + ONAP - CPS http://www.onap.org/ - - 11 - 2.3.3.RELEASE - 3.1.0 - 5.0.6 - 2.1.4 - 3.0.6 - 2.0-M2-groovy-3.0 - 3.0.18 - 3.0.0 - 2.2.9 - 3.1.2 - 3.2.0 - 1.5.3 - 3.35.0 - 2.10.0 - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - org.codehaus.groovy - groovy - ${groovy.version} - test - - - org.spockframework - spock-core - ${spock-core.version} - test - - - cglib - cglib-nodep - 3.1 - test - - - - - - - - - src/main/resources - true - - - - target/generated-sources/license - - third-party-licenses.txt - - - - - target/generated-resources/licenses - - *.* - - third-party-licenses - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - onap-java-style - - check - - process-sources - - onap-checkstyle/onap-java-style.xml - ${project.build.sourceDirectory} - true - true - true - false - warning - true - - - - - - - org.onap.oparent - checkstyle - ${oparent.version} - - - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - 1.9.0 - - - - compileTests - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - false - - **/*Spec.java - **/*Test.java - - - - - - + + true + true + + cps-dependencies + cps-bom + cps-parent cps-service cps-rest cps-ri - -- 2.16.6