Merge "Updates of function test for f-release"
diff --git a/a1-policy-management-service/pom.xml b/a1-policy-management-service/pom.xml
index f5957bc..8a6d584 100644
--- a/a1-policy-management-service/pom.xml
+++ b/a1-policy-management-service/pom.xml
@@ -52,7 +52,6 @@
<sdk.version>1.1.6</sdk.version>
<swagger.version>2.1.6</swagger.version>
<json.version>20190722</json.version>
- <commons-net.version>3.6</commons-net.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<formatter-maven-plugin.version>2.12.2</formatter-maven-plugin.version>
<spotless-maven-plugin.version>1.18.0</spotless-maven-plugin.version>
@@ -130,11 +129,6 @@
<version>${json.version}</version>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons-net.version}</version>
- </dependency>
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
diff --git a/dmaap-adaptor-java/pom.xml b/dmaap-adaptor-java/pom.xml
index 70ea32e..9c1dd44 100644
--- a/dmaap-adaptor-java/pom.xml
+++ b/dmaap-adaptor-java/pom.xml
@@ -49,16 +49,13 @@
<java.version>11</java.version>
<springfox.version>3.0.0</springfox.version>
<immutable.version>2.8.2</immutable.version>
- <sdk.version>1.1.6</sdk.version>
<swagger.version>2.1.6</swagger.version>
<json.version>20190722</json.version>
- <commons-net.version>3.6</commons-net.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<formatter-maven-plugin.version>2.12.2</formatter-maven-plugin.version>
<spotless-maven-plugin.version>1.24.3</spotless-maven-plugin.version>
<swagger-codegen-maven-plugin.version>3.0.11</swagger-codegen-maven-plugin.version>
<docker-maven-plugin>0.30.0</docker-maven-plugin>
- <version.dmaap>1.1.11</version.dmaap>
<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
@@ -96,10 +93,7 @@
<artifactId>swagger-jaxrs2-servlet-initializer</artifactId>
<version>${swagger.version}</version>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
+
<dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
@@ -117,31 +111,10 @@
<version>${json.version}</version>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons-net.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
- <artifactId>cbs-client</artifactId>
- <version>${sdk.version}</version>
- </dependency>
- <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>${javax.ws.rs-api.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/com.github.erosb/everit-json-schema -->
- <dependency>
- <groupId>com.github.erosb</groupId>
- <artifactId>everit-json-schema</artifactId>
- <version>1.12.1</version>
- </dependency>
<!-- Actuator dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/information-coordinator-service/pom.xml b/information-coordinator-service/pom.xml
index e22e73a..d66992d 100644
--- a/information-coordinator-service/pom.xml
+++ b/information-coordinator-service/pom.xml
@@ -49,10 +49,8 @@
<java.version>11</java.version>
<springfox.version>3.0.0</springfox.version>
<immutable.version>2.8.2</immutable.version>
- <sdk.version>1.1.6</sdk.version>
<swagger.version>2.1.6</swagger.version>
<json.version>20190722</json.version>
- <commons-net.version>3.6</commons-net.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<formatter-maven-plugin.version>2.12.2</formatter-maven-plugin.version>
<spotless-maven-plugin.version>1.24.3</spotless-maven-plugin.version>
@@ -97,10 +95,6 @@
<version>${swagger.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
<version>${immutable.version}</version>
@@ -117,25 +111,10 @@
<version>${json.version}</version>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons-net.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
- <artifactId>cbs-client</artifactId>
- <version>${sdk.version}</version>
- </dependency>
- <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>${javax.ws.rs-api.version}</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/com.github.erosb/everit-json-schema -->
<dependency>
<groupId>com.github.erosb</groupId>