Updating to latest appm/apim/identity dependencies

merge-requests/1/head
Ace 8 years ago
parent 2b3967fd71
commit 2a0b500935

@ -176,6 +176,12 @@
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId> <artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics</groupId> <groupId>org.wso2.carbon.analytics</groupId>
@ -199,6 +205,12 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId> <artifactId>swagger-jaxrs</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>

@ -173,13 +173,13 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ws.commons.axiom</groupId> <groupId>org.apache.ws.commons.axiom.wso2</groupId>
<artifactId>axiom-api</artifactId> <artifactId>axiom</artifactId>
</dependency> </dependency>
<dependency> <!--dependency>
<groupId>org.apache.ws.commons.axiom</groupId> <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId> <artifactId>axiom-impl</artifactId>
</dependency> </dependency-->
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
@ -206,11 +206,11 @@
<artifactId>saaj-impl</artifactId> <artifactId>saaj-impl</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle.wso2</groupId>
<artifactId>bcpkix-jdk15on</artifactId> <artifactId>bcpkix-jdk15on</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.wso2.orbit.org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -269,6 +269,10 @@
<groupId>org.wso2.carbon.identity</groupId> <groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.base</artifactId> <artifactId>org.wso2.carbon.identity.base</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>

@ -912,15 +912,15 @@
<version>${wss4j.security.common.version}</version> <version>${wss4j.security.common.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ws.commons.axiom</groupId> <groupId>org.apache.ws.commons.axiom.wso2</groupId>
<artifactId>axiom-api</artifactId> <artifactId>axiom</artifactId>
<version>${axiom-api.version}</version> <version>${axiom-api.version}</version>
</dependency> </dependency>
<dependency> <!--dependency>
<groupId>org.apache.ws.commons.axiom</groupId> <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId> <artifactId>axiom-impl</artifactId>
<version>${axiom-api.version}</version> <version>${axiom-api.version}</version>
</dependency> </dependency-->
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
@ -952,14 +952,14 @@
<version>${saaj-impl.version}</version> <version>${saaj-impl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle.wso2</groupId>
<artifactId>bcpkix-jdk15on</artifactId> <artifactId>bcpkix-jdk15on</artifactId>
<version>${bcpkix-jdk15on.version}</version> <version>${bcpkix-jdk15on.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.wso2.orbit.org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>${bcpkix-jdk15on.version}</version> <version>1.52.0.wso2v1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@ -1092,7 +1092,7 @@
<wso2.maven.compiler.target>1.7</wso2.maven.compiler.target> <wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
<!--Carbon kernel versions--> <!--Carbon kernel versions-->
<carbon.kernel.version>4.4.7</carbon.kernel.version> <carbon.kernel.version>4.4.9</carbon.kernel.version>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range> <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@ -1186,13 +1186,13 @@
<javaee-web-api.version>6.0</javaee-web-api.version> <javaee-web-api.version>6.0</javaee-web-api.version>
<axiom-api.version>1.2.14</axiom-api.version> <axiom-api.version>1.2.11.wso2v10</axiom-api.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<spring-web.version>3.0.5.RELEASE</spring-web.version> <spring-web.version>3.0.5.RELEASE</spring-web.version>
<spring-ws-security.version>2.1.0.RELEASE</spring-ws-security.version> <spring-ws-security.version>2.1.0.RELEASE</spring-ws-security.version>
<jaxws-rt.version>2.2.8</jaxws-rt.version> <jaxws-rt.version>2.2.8</jaxws-rt.version>
<saaj-impl.version>1.3.18</saaj-impl.version> <saaj-impl.version>1.3.18</saaj-impl.version>
<bcpkix-jdk15on.version>1.49</bcpkix-jdk15on.version> <bcpkix-jdk15on.version>1.52.0.wso2v1</bcpkix-jdk15on.version>
<plexus-utils.version>3.0.21</plexus-utils.version> <plexus-utils.version>3.0.21</plexus-utils.version>
<joda-time.version>2.2</joda-time.version> <joda-time.version>2.2</joda-time.version>
<wss4j.security.version>1.6.17</wss4j.security.version> <wss4j.security.version>1.6.17</wss4j.security.version>

Loading…
Cancel
Save