diff options
Diffstat (limited to 'ecomp-sdk/epsdk-fw')
-rw-r--r-- | ecomp-sdk/epsdk-fw/pom.xml | 40 | ||||
-rw-r--r-- | ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java | 4 |
2 files changed, 38 insertions, 6 deletions
diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml index 2eb62648..9f2929b5 100644 --- a/ecomp-sdk/epsdk-fw/pom.xml +++ b/ecomp-sdk/epsdk-fw/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <!-- GroupId is inherited from parent --> @@ -75,12 +75,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.3</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.3</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>org.owasp.esapi</groupId> @@ -91,6 +91,22 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -115,7 +131,7 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.1.1</version> + <version>1.2.3</version> <scope>test</scope> </dependency> <dependency> @@ -123,6 +139,12 @@ <artifactId>resteasy-spring</artifactId> <version>${resteasy.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> @@ -161,6 +183,16 @@ <scope>test</scope> <version>${jacoco.version}</version> </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.3.3</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.3</version> + </dependency> </dependencies> </project> diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java index ba95d870..eef88b4b 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java @@ -263,7 +263,7 @@ public class CipherUtil { return CipherUtil.decryptPKC(encryptedText, keyString); } - public static void main(String[] args) throws CipherUtilException { +/* public static void main(String[] args) throws CipherUtilException { String testValue = "Welcome123"; String encrypted; @@ -290,6 +290,6 @@ public class CipherUtil { System.out.println("Encrypted Text" + encrypted); } } - } + }*/ } |