diff options
| author |   Sri Balaji Marripud <sri.balaji.marripud@att.com> | 2020-09-04 09:20:06 -0400 |
|---|---|---|
| committer | Sri Balaji Marripud <sri.balaji.marripud@att.com> | 2020-09-04 09:20:13 -0400 |
| commit | 0f6b3203e4f35d58949ef55879ba8110d51d70cf (patch) | |
| tree | 8c5197e1d1ec63fbf7e7827692e5932350dc4518 | |
| parent | ea40bb71e4117d76c0a9f82925b3eb109827a9a5 (diff) | |
portal version upgarde
Issue-ID: PORTAL-945
Change-Id: Ia45681d817b5cc4f9a7ba2f7da53ac81d5738cf7
Signed-off-by: Sri Balaji Marripud <sri.balaji.marripud@att.com>
| -rw-r--r-- | ecomp-portal-BE-common/pom.xml | 19 | ||||
| -rw-r--r-- | ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java | 2 | ||||
| -rw-r--r-- | ecomp-portal-BE-os/pom.xml | 16 |
3 files changed, 21 insertions, 16 deletions
diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml index c106df01..9275aa4e 100644 --- a/ecomp-portal-BE-common/pom.xml +++ b/ecomp-portal-BE-common/pom.xml @@ -13,6 +13,7 @@ <properties> <skipTests>false</skipTests> + <jackson.version>2.11.0</jackson.version> </properties> <build> @@ -280,17 +281,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.10.0</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.10.0</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.10.0</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>postgresql</groupId> @@ -351,7 +352,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>3.17</version> + <version>4.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -429,7 +430,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.9</version> + <version>1.14</version> </dependency> <dependency> <groupId>com.att.nsa</groupId> @@ -567,17 +568,17 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.3.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-swagger2</artifactId> - <version>2.9.2</version> + <version>3.0.0</version> </dependency> <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-swagger-ui</artifactId> - <version>2.9.2</version> + <version>3.0.0</version> </dependency> <!-- Schedulers required Libraries --> <dependency> @@ -593,7 +594,7 @@ <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.10.0</version> + <version>${jackson.version}</version> </dependency> <!-- https://mvnrepository.com/artifact/org.glassfish/javax.el --> <dependency> diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java index db6ca2f7..c7def379 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java @@ -333,7 +333,7 @@ public class EPUserUtilsTest { @Test(expected=RoleFunctionException.class) public void decodeFunctionCodeTestWithException() throws DecoderException, RoleFunctionException { PowerMockito.mockStatic(Hex.class); - PowerMockito.when(Hex.decodeHex(Matchers.any())).thenThrow(DecoderException.class); + PowerMockito.when(Hex.decodeHex(Matchers.anyString().toCharArray())).thenThrow(DecoderException.class); EPUserUtils.decodeFunctionCode("n+"); } diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml index 4bc54036..a726d6d8 100644 --- a/ecomp-portal-BE-os/pom.xml +++ b/ecomp-portal-BE-os/pom.xml @@ -210,6 +210,11 @@ </build> <dependencies> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.11.0</version> + </dependency> <!-- Spring --> <dependency> <groupId>org.springframework</groupId> @@ -323,6 +328,10 @@ <groupId>org.apache.lucene</groupId> <artifactId>lucene-queryparser</artifactId> </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -358,7 +367,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>3.15</version> + <version>4.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -429,11 +438,6 @@ </exclusions> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.9</version> - </dependency> - <dependency> <groupId>com.att.nsa</groupId> <artifactId>cambriaClient</artifactId> <version>0.0.1</version> |