From d28aa873fb503794583ec61a851a5232431d17b2 Mon Sep 17 00:00:00 2001 From: ryanSheehan Date: Fri, 18 Jun 2021 16:47:38 +0100 Subject: Re clean up clamp project properties and dependencies Remove version duplication from clamp projects runtime, dcae kubernetes, policy participant and simulator Issue-ID: POLICY-3308 Change-Id: I316b3b0313608c5d17c9692f44d653afabc2d596 Signed-off-by: ryanSheehan --- .../participant-impl/participant-impl-dcae/pom.xml | 16 ------- .../participant-impl-kubernetes/pom.xml | 25 ----------- .../participant-impl-policy/pom.xml | 18 -------- .../participant-impl-simulator/pom.xml | 22 +-------- .../main/rest/ParticipantErrorController.java | 1 - participant/participant-impl/pom.xml | 31 +++++++++++++ runtime/pom.xml | 52 +++++++--------------- 7 files changed, 47 insertions(+), 118 deletions(-) diff --git a/participant/participant-impl/participant-impl-dcae/pom.xml b/participant/participant-impl/participant-impl-dcae/pom.xml index 714f1551c..947862626 100644 --- a/participant/participant-impl/participant-impl-dcae/pom.xml +++ b/participant/participant-impl/participant-impl-dcae/pom.xml @@ -31,19 +31,6 @@ policy-clamp-participant-impl-dcae ${project.artifactId} DCAE participant, that allows DCAE to partake in control loops - - - - - - org.springframework.boot - spring-boot-dependencies - ${version.springboot} - pom - import - - - @@ -62,13 +49,11 @@ org.mock-server mockserver-netty - ${version.mockserver} test org.mock-server mockserver-client-java - ${version.mockserver} test @@ -78,7 +63,6 @@ org.springframework.boot spring-boot-maven-plugin - ${version.springboot} diff --git a/participant/participant-impl/participant-impl-kubernetes/pom.xml b/participant/participant-impl/participant-impl-kubernetes/pom.xml index 504d91d78..48b56a0ee 100644 --- a/participant/participant-impl/participant-impl-kubernetes/pom.xml +++ b/participant/participant-impl/participant-impl-kubernetes/pom.xml @@ -32,25 +32,6 @@ ${project.artifactId} Kubernetes participant, that allows k8s pods to partake in control loops - - 2.5.0 - 2.8.8 - 3.0.0 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - org.springframework.boot @@ -67,13 +48,11 @@ org.immutables value - ${immutable.version} provided org.immutables gson - ${immutable.version} org.json @@ -87,18 +66,15 @@ io.springfox springfox-swagger2 - ${springfox.version} io.springfox springfox-swagger-ui - ${springfox.version} runtime commons-fileupload commons-fileupload - 1.4 org.onap.policy.clamp.participant @@ -130,7 +106,6 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} diff --git a/participant/participant-impl/participant-impl-policy/pom.xml b/participant/participant-impl/participant-impl-policy/pom.xml index a0176588b..9cc70b426 100644 --- a/participant/participant-impl/participant-impl-policy/pom.xml +++ b/participant/participant-impl/participant-impl-policy/pom.xml @@ -32,23 +32,6 @@ ${project.artifactId} Policy participant, that allows Policy to partake in control loops - - 2.4.4 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - org.springframework.boot @@ -70,7 +53,6 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} diff --git a/participant/participant-impl/participant-impl-simulator/pom.xml b/participant/participant-impl/participant-impl-simulator/pom.xml index bb8317380..92ee94db9 100644 --- a/participant/participant-impl/participant-impl-simulator/pom.xml +++ b/participant/participant-impl/participant-impl-simulator/pom.xml @@ -32,24 +32,6 @@ ${project.artifactId} Participant simulator, used to test control loops - - 2.4.4 - 3.0.0 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - org.springframework.boot @@ -66,12 +48,11 @@ io.springfox springfox-boot-starter - ${springfox.version} + ${version.springfox} io.springfox springfox-swagger-ui - ${springfox.version} runtime @@ -86,7 +67,6 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} diff --git a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java index 6607377bb..82c1ac602 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java +++ b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java @@ -95,7 +95,6 @@ public class ParticipantErrorController implements ErrorController { } - @Override public String getErrorPath() { return path; } diff --git a/participant/participant-impl/pom.xml b/participant/participant-impl/pom.xml index 8afd81045..ecc16e633 100644 --- a/participant/participant-impl/pom.xml +++ b/participant/participant-impl/pom.xml @@ -41,6 +41,37 @@ participant-impl-kubernetes + + + + org.springframework.boot + spring-boot-starter-web + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-webflux + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-validation + ${version.springboot} + + + org.springframework.boot + spring-boot-starter-test + ${version.springboot} + test + + + org.springframework.boot + spring-boot-starter-security + ${version.springboot} + + + + org.onap.policy.clamp.participant diff --git a/runtime/pom.xml b/runtime/pom.xml index 7dda5c6b8..4a3ca11a7 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -153,10 +153,8 @@ - - org.springframework.boot spring-boot-dependencies @@ -164,17 +162,8 @@ pom import - - - org.apache.camel.springboot - camel-spring-boot-bom - ${version.camel} - pom - import - - com.att.eelf @@ -194,7 +183,6 @@ org.codehaus.janino janino - 3.0.8 org.apache.tomcat.embed @@ -220,26 +208,32 @@ org.apache.camel.springboot camel-http-starter + ${version.camel} org.apache.camel.springboot camel-spring-boot-starter + ${version.camel} org.apache.camel.springboot camel-jaxb-starter + ${version.camel} org.apache.camel.springboot camel-servlet-starter + ${version.camel} org.apache.camel.springboot camel-gson-starter + ${version.camel} org.apache.camel.springboot camel-swagger-java-starter + ${version.camel} javax.ws.rs @@ -255,6 +249,7 @@ org.springframework.boot spring-boot-starter-web + ${version.springboot} org.springframework.boot @@ -265,6 +260,7 @@ org.springframework.boot spring-boot-starter-tomcat + ${version.springboot} org.glassfish @@ -279,14 +275,17 @@ org.springframework.boot spring-boot-starter-security + ${version.springboot} org.springframework.boot spring-boot-autoconfigure + ${version.springboot} org.springframework.boot spring-boot-starter-test + ${version.springboot} test @@ -298,6 +297,7 @@ org.springframework.boot spring-boot-starter-data-jpa + ${version.springboot} @@ -333,12 +333,10 @@ javax.xml.ws jaxws-api - 2.3.1 org.onap.aaf.authz aaf-cadi-aaf - 2.1.15 javax.servlet @@ -357,12 +355,10 @@ com.googlecode.json-simple json-simple - 1.1.1 org.apache.commons commons-vfs2 - 2.8.0 com.squareup.okhttp @@ -377,7 +373,6 @@ javax.transaction jta - 1.1 javax.persistence @@ -396,7 +391,6 @@ org.jboss.spec.javax.ws.rs jboss-jaxrs-api_2.0_spec - 1.0.1.Final @@ -404,13 +398,11 @@ org.mariadb.jdbc mariadb-java-client - 2.7.2 org.onap.sdc.sdc-distribution-client sdc-distribution-client - 1.4.1 org.onap.sdc.sdc-tosca @@ -430,26 +422,17 @@ org.dom4j dom4j - 2.1.3 org.junit.vintage junit-vintage-engine - 5.7.1 - test - - - org.assertj - assertj-core - 3.10.0 test com.github.docker-java docker-java-core - 3.2.7 test @@ -461,7 +444,6 @@ com.github.docker-java docker-java - 3.2.7 test @@ -719,7 +701,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 jar-with-only-classes @@ -779,7 +760,6 @@ org.springframework.boot spring-boot-maven-plugin - ${version.springboot} @@ -792,7 +772,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 1C true @@ -804,7 +783,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.22.2 integration-tests @@ -992,7 +970,7 @@ org.jacoco jacoco-maven-plugin - 0.8.5 + ${jacoco.version} true true @@ -1146,16 +1124,16 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 org.sonarsource.scanner.maven sonar-maven-plugin - 3.7.0.1746 + ${sonar.scanner.version} org.codehaus.mojo exec-maven-plugin + 1.3.2 libIndexCheck -- cgit 1.2.3-korg