aboutsummaryrefslogtreecommitdiffstats
path: root/testsuites/integration
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2023-02-17 19:16:34 +0000
committerLiam Fallon <liam.fallon@est.tech>2023-02-17 20:31:42 +0000
commit367daa90dc7f54d7f37e2de482a22f5e2ee664f6 (patch)
treedbe498f1f345c5d47f403e1c4719896e57c3903b /testsuites/integration
parent19666e9596fc1df2c27496138e6688529d77cc60 (diff)
Clean up dependencies for London Release
Issue-ID: POLICY-4482 Change-Id: Ifc4039feaac82a1fa4bf1f2eb602f79c7a268b9f Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'testsuites/integration')
-rw-r--r--testsuites/integration/integration-common/pom.xml5
-rw-r--r--testsuites/integration/integration-uservice-test/pom.xml17
2 files changed, 8 insertions, 14 deletions
diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml
index d1d4e7f28..b904b7b97 100644
--- a/testsuites/integration/integration-common/pom.xml
+++ b/testsuites/integration/integration-common/pom.xml
@@ -1,7 +1,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. All rights reserved.
- Modifications Copyright (C) 2020,2022 Nordix Foundation.
+ Modifications Copyright (C) 2020,2022-2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.10.0</version>
<configuration>
<excludes>
<exclude>**/test/common/**/*.java</exclude>
@@ -55,7 +55,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
- <goalPrefix>jacoco</goalPrefix>
<excludes>
<exclude>**/test/common/**/*..class</exclude>
</excludes>
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 7e48a96e6..6efbc7068 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -1,7 +1,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. All rights reserved.
- Modifications Copyright (C) 2019-2020,2022 Nordix Foundation.
+ Modifications Copyright (C) 2019-2020,2022-2023 Nordix Foundation.
Modifications Copyright (C) 2020 Bell Canada.
Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
================================================================================
@@ -34,10 +34,6 @@
<name>${project.artifactId}</name>
<description>Integration tests for Apex microservices</description>
- <properties>
- <activemq-version>5.15.4</activemq-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.onap.policy.common</groupId>
@@ -129,7 +125,7 @@
<dependency>
<groupId>com.salesforce.kafka.test</groupId>
<artifactId>kafka-junit4</artifactId>
- <version>3.2.3</version>
+ <version>${version.kafka-junit4}</version>
<scope>test</scope>
<exclusions>
<!-- The default netty version in kafka-junit4 has vulnerabilities -->
@@ -146,7 +142,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.7.0</version>
+ <version>${version.zookeeper}</version>
<scope>test</scope>
<exclusions>
<!-- The default netty version in kafka-junit4 has vulnerabilities -->
@@ -168,19 +164,19 @@
<dependency>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-junit</artifactId>
- <version>${activemq-version}</version>
+ <version>${version.activemq}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
- <version>${activemq-version}</version>
+ <version>${version.activemq}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
- <version>${activemq-version}</version>
+ <version>${version.activemq}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -245,7 +241,6 @@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>