From 6aad76eff1d28f951c8d5e5422a03106438347c4 Mon Sep 17 00:00:00 2001 From: Ace Date: Fri, 23 Sep 2016 11:24:49 +0530 Subject: [PATCH] Synching with master and updating jscep and bcpkix dependencies --- .../org.wso2.carbon.certificate.mgt.core/pom.xml | 6 +++--- pom.xml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml index c21ead60d2..c1ee115741 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml @@ -57,14 +57,14 @@ org.apache.commons.logging, javax.security.auth.x500, javax.xml.*, - javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional, + javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional, org.apache.commons.codec.binary, org.bouncycastle.asn1, org.bouncycastle.asn1.x500, org.bouncycastle.asn1.x509, org.bouncycastle.asn1.pkcs, - org.bouncycastle.cert, - org.bouncycastle.cert.jcajce, + org.bouncycastle.cert; version="${bcprov.wso2.version.range}", + org.bouncycastle.cert.jcajce; version="${bcprov.wso2.version.range}", org.bouncycastle.cms, org.bouncycastle.jce.provider, org.bouncycastle.operator, diff --git a/pom.xml b/pom.xml index 40a7491b42..ba1fec5a24 100644 --- a/pom.xml +++ b/pom.xml @@ -1711,7 +1711,7 @@ by default) and nothing else. We had troubles with other repositories in the past. Therefore configuring additional repositories here should be considered very carefully. --> - + wso2-nexus WSO2 internal Repository http://maven.wso2.org/nexus/content/groups/wso2-public/ @@ -1816,7 +1816,7 @@ 2.6.0.wso2v1 - 6.0.5-SNAPSHOT + 6.0.5 (5.0.0,7.0.0] @@ -1835,11 +1835,11 @@ 1.52.0.wso2v1 - 1.52.0.wso2v1 + 1.52.0.wso2v2 [1.52.0,1.60.0) - 2.3.0.wso2v1 + 2.3.0.wso2v2 2.26.1.wso2v3