diff options
| author |   liamfallon <liam.fallon@est.tech> | 2022-10-14 13:07:36 +0100 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2022-10-14 13:07:41 +0100 |
| commit | f24ba3e1abe43f7f605e18098a87c4624188d806 (patch) | |
| tree | 143069eb4e96bf1516509bb9205ada7c49db5c48 | |
| parent | 0c7714797284924d231895bc7cae7e92473ea0a8 (diff) | |
Clean up dependencies in CLAMP POMs
External dependencies should in general be in the root POMs of repos and
internal dependencies only in child POMs. There are exceptions whare a
child modle is dealing with a specific technology. This commit tidies up
the CLAMP POMs.
Issue-ID: POLICY-4289
Change-Id: I0493daf1d737222bd724333ab8baab9226da6121
Signed-off-by: liamfallon <liam.fallon@est.tech>
| -rw-r--r-- | models/pom.xml | 4 | ||||
| -rw-r--r-- | packages/policy-clamp-docker/pom.xml | 60 | ||||
| -rw-r--r-- | participant/participant-impl/participant-impl-kubernetes/pom.xml | 10 | ||||
| -rw-r--r-- | participant/pom.xml | 20 | ||||
| -rw-r--r-- | pom.xml | 25 | ||||
| -rw-r--r-- | runtime-acm/pom.xml | 62 |
6 files changed, 53 insertions, 128 deletions
diff --git a/models/pom.xml b/models/pom.xml index 79f40c3ad..911ce12ec 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -39,10 +39,6 @@ <artifactId>policy-clamp-examples</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - </dependency> </dependencies> <build> diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml index 8b90f0242..454abf041 100644 --- a/packages/policy-clamp-docker/pom.xml +++ b/packages/policy-clamp-docker/pom.xml @@ -56,6 +56,36 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> </properties> + <dependencies> + <dependency> + <groupId>org.onap.policy.clamp</groupId> + <artifactId>policy-clamp-tarball</artifactId> + <version>${project.version}</version> + <classifier>tarball</classifier> + <type>tar.gz</type> + </dependency> + <dependency> + <groupId>org.onap.policy.clamp.participant</groupId> + <artifactId>policy-clamp-participant-impl-policy</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.clamp.participant</groupId> + <artifactId>policy-clamp-participant-impl-kubernetes</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.clamp.participant</groupId> + <artifactId>policy-clamp-participant-impl-http</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.clamp.participant</groupId> + <artifactId>policy-clamp-acm-element-impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <build> <finalName>${project.artifactId}-${project.version}</finalName> <plugins> @@ -318,34 +348,4 @@ </plugin> </plugins> </build> - - <dependencies> - <dependency> - <groupId>org.onap.policy.clamp</groupId> - <artifactId>policy-clamp-tarball</artifactId> - <version>${project.version}</version> - <classifier>tarball</classifier> - <type>tar.gz</type> - </dependency> - <dependency> - <groupId>org.onap.policy.clamp.participant</groupId> - <artifactId>policy-clamp-participant-impl-policy</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.policy.clamp.participant</groupId> - <artifactId>policy-clamp-participant-impl-kubernetes</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.policy.clamp.participant</groupId> - <artifactId>policy-clamp-participant-impl-http</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.policy.clamp.participant</groupId> - <artifactId>policy-clamp-acm-element-impl</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> </project> diff --git a/participant/participant-impl/participant-impl-kubernetes/pom.xml b/participant/participant-impl/participant-impl-kubernetes/pom.xml index 29c139ffe..fff61c0ff 100644 --- a/participant/participant-impl/participant-impl-kubernetes/pom.xml +++ b/participant/participant-impl/participant-impl-kubernetes/pom.xml @@ -32,16 +32,6 @@ <name>${project.artifactId}</name> <description>Kubernetes participant, that allows k8s pods to partake in automation compositions</description> - <!-- Dependency added here to take precedence over Mockito-core in parent pom--> - <dependencies> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-inline</artifactId> - <version>3.8.0</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> <resources> <!-- Output the version of the automation composition system --> diff --git a/participant/pom.xml b/participant/pom.xml index eef52c804..5c85d7687 100644 --- a/participant/pom.xml +++ b/participant/pom.xml @@ -93,32 +93,12 @@ <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp-models</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp-examples</artifactId> <version>${project.version}</version> </dependency> - <!-- Actuator dependencies for participants added here to avoid http security conflicts in clamp/runtime --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-registry-prometheus</artifactId> - <version>${version.io.micrometer}</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-aop</artifactId> - </dependency> </dependencies> <build> @@ -61,7 +61,6 @@ <module>examples</module> <module>models</module> <module>packages</module> - <module>runtime</module> <module>runtime-acm</module> <module>participant</module> </modules> @@ -140,9 +139,17 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-aop</artifactId> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-validation</artifactId> + <artifactId>spring-boot-starter-data-jpa</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -154,6 +161,15 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-validation</artifactId> + </dependency> + <dependency> + <groupId>io.micrometer</groupId> + <artifactId>micrometer-registry-prometheus</artifactId> + <version>${version.io.micrometer}</version> + </dependency> + <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-models</artifactId> </dependency> @@ -163,6 +179,11 @@ <version>${version.springfox}</version> </dependency> <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger-ui</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.immutables</groupId> <artifactId>gson</artifactId> </dependency> diff --git a/runtime-acm/pom.xml b/runtime-acm/pom.xml index e53f5cbbe..05eaee0ff 100644 --- a/runtime-acm/pom.xml +++ b/runtime-acm/pom.xml @@ -49,68 +49,6 @@ <artifactId>policy-clamp-examples</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-json</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-aop</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-validation</artifactId> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-boot-starter</artifactId> - <version>${version.springfox}</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-registry-prometheus</artifactId> - <version>${version.io.micrometer}</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> </dependencies> <build> |