Upgrading tomcat version usd in carbon-devicemgt

This commit is contained in:
prabathabey 2015-07-23 10:01:56 +05:30
parent 9e5e3cf73d
commit fac53e4814
3 changed files with 11 additions and 8 deletions

View File

@ -83,8 +83,7 @@
org.wso2.carbon.identity.oauth.stub,
org.wso2.carbon.identity.oauth.stub.dto,
org.wso2.carbon.ndatasource.core,
org.wso2.carbon.base,
org.wso2.carbon.base.api
org.apache.catalina
</Import-Package>
<Export-Package>
!org.wso2.carbon.device.mgt.core.internal,
@ -209,6 +208,10 @@
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.tomcat</groupId>
<artifactId>tomcat</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -64,11 +64,11 @@
<dependencies>
<dependency>
<groupId>org.apache.tomcat.wso2</groupId>
<groupId>org.wso2.tomcat</groupId>
<artifactId>tomcat</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.wso2</groupId>
<groupId>org.wso2.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</dependency>
<dependency>

View File

@ -748,7 +748,7 @@
<!-- Tomcat dependencies -->
<dependency>
<groupId>org.apache.tomcat.wso2</groupId>
<groupId>org.wso2.tomcat</groupId>
<artifactId>tomcat</artifactId>
<version>${orbit.version.tomcat}</version>
<exclusions>
@ -815,7 +815,7 @@
<version>${tomcat.jdbc.pooling.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.wso2</groupId>
<groupId>org.wso2.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>${orbit.version.tomcat.servlet.api}</version>
</dependency>
@ -1137,8 +1137,8 @@
<orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
<!-- Tomcat -->
<orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
<orbit.version.tomcat.servlet.api>7.0.52.wso2v1</orbit.version.tomcat.servlet.api>
<orbit.version.tomcat>7.0.59.wso2v1</orbit.version.tomcat>
<orbit.version.tomcat.servlet.api>7.0.59.wso2v1</orbit.version.tomcat.servlet.api>
<tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>
<!-- Carbon Deployment -->