summaryrefslogtreecommitdiffstats
path: root/participant
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2021-06-22 11:07:50 +0000
committerGerrit Code Review <gerrit@onap.org>2021-06-22 11:07:50 +0000
commitdf2d3298e9881410dff5547e0ba9850135d63d5c (patch)
treee0ee9a0c00908b05d3aebc15da2463787d61c524 /participant
parenta21466150f0d6087d2f09752192ac79b6ea86fde (diff)
parentd28aa873fb503794583ec61a851a5232431d17b2 (diff)
Merge "Re clean up clamp project properties and dependencies"
Diffstat (limited to 'participant')
-rw-r--r--participant/participant-impl/participant-impl-kubernetes/pom.xml25
-rw-r--r--participant/participant-impl/participant-impl-policy/pom.xml18
-rw-r--r--participant/participant-impl/participant-impl-simulator/pom.xml22
-rw-r--r--participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantErrorController.java1
-rw-r--r--participant/participant-impl/pom.xml31
5 files changed, 32 insertions, 65 deletions
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 @@
<name>${project.artifactId}</name>
<description>Kubernetes participant, that allows k8s pods to partake in control loops</description>
- <properties>
- <springboot.version>2.5.0</springboot.version>
- <immutable.version>2.8.8</immutable.version>
- <springfox.version>3.0.0</springfox.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- Spring Boot BOM -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${springboot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -67,13 +48,11 @@
<dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
- <version>${immutable.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.immutables</groupId>
<artifactId>gson</artifactId>
- <version>${immutable.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -87,18 +66,15 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
- <version>${springfox.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
- <version>${springfox.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.onap.policy.clamp.participant</groupId>
@@ -130,7 +106,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${springboot.version}</version>
<executions>
<execution>
<goals>
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 @@
<name>${project.artifactId}</name>
<description>Policy participant, that allows Policy to partake in control loops</description>
- <properties>
- <springboot.version>2.4.4</springboot.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- Spring Boot BOM -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${springboot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -70,7 +53,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${springboot.version}</version>
<executions>
<execution>
<goals>
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 @@
<name>${project.artifactId}</name>
<description>Participant simulator, used to test control loops</description>
- <properties>
- <springboot.version>2.4.4</springboot.version>
- <springfox.version>3.0.0</springfox.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- Spring Boot BOM -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${springboot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -66,12 +48,11 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
- <version>${springfox.version}</version>
+ <version>${version.springfox}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
- <version>${springfox.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -86,7 +67,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${springboot.version}</version>
<executions>
<execution>
<goals>
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 @@
<module>participant-impl-kubernetes</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${version.springboot}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-webflux</artifactId>
+ <version>${version.springboot}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ <version>${version.springboot}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <version>${version.springboot}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-security</artifactId>
+ <version>${version.springboot}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.onap.policy.clamp.participant</groupId>