summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asdctool/pom.xml4
-rw-r--r--catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml9
-rw-r--r--catalog-be/pom.xml4
-rw-r--r--catalog-dao/pom.xml4
-rw-r--r--catalog-fe/pom.xml6
-rw-r--r--catalog-model/pom.xml4
-rw-r--r--common-be-tests-utils/pom.xml10
-rw-r--r--common-be/pom.xml4
-rw-r--r--integration-tests/pom.xml6
-rw-r--r--openecomp-be/backend/openecomp-sdc-security-util/pom.xml6
-rw-r--r--openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml4
-rw-r--r--openecomp-be/tools/swagger-ui/pom.xml4
12 files changed, 52 insertions, 13 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index da8571f193..34f958f334 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -43,6 +43,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml
index ff9600dac4..ae36fff3d6 100644
--- a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml
+++ b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml
@@ -78,6 +78,10 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -85,6 +89,11 @@
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ <version>${functionaljava.version}</version>
+ </dependency>
<!--test dependencies-->
<dependency>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 58c2f240eb..4676179b56 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -113,6 +113,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index c71222569a..fbf8b6b839 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -50,6 +50,10 @@ Modifications copyright (c) 2018 Nokia
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 71f3034814..06bcd88db9 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.functionaljava</groupId>
<artifactId>functionaljava</artifactId>
<version>${functionaljava.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.onap.sdc.common</groupId>
@@ -40,6 +40,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 7f9bb3fab4..3c7dfc78ac 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -49,6 +49,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml
index b2b04be736..77ab2c1fb1 100644
--- a/common-be-tests-utils/pom.xml
+++ b/common-be-tests-utils/pom.xml
@@ -54,6 +54,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -77,12 +81,6 @@
<version>${guava.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.functionaljava</groupId>
- <artifactId>functionaljava</artifactId>
- <version>${functionaljava.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/common-be/pom.xml b/common-be/pom.xml
index 02a3a3ad44..0f443bc0b4 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -54,6 +54,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 4555a8dc19..d7313caa49 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -342,6 +342,12 @@ limitations under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ <version>${functionaljava.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
index 092ad3fe38..59abf61af3 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml
@@ -38,12 +38,6 @@
</dependency>
<dependency>
- <groupId>org.functionaljava</groupId>
- <artifactId>functionaljava</artifactId>
- <version>${functionaljava.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml
index 739f3520d7..73e9fdf04c 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml
@@ -114,6 +114,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml
index cb9e7c7bbf..08c4eec3c1 100644
--- a/openecomp-be/tools/swagger-ui/pom.xml
+++ b/openecomp-be/tools/swagger-ui/pom.xml
@@ -34,6 +34,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>