Merge pull request #532 from charithag/release-2.0.x

Fixes for Release 2.0.x

features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml

@@ -48,6 +48,10 @@
             <groupId>org.wso2.orbit.org.scannotation</groupId>
             <artifactId>scannotation</artifactId>
         </dependency>
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-annotations</artifactId>
+		</dependency>
     </dependencies>
 
     <build>
@@ -137,6 +141,9 @@
                                 <bundleDef>
                                     org.wso2.orbit.org.scannotation:scannotation:${scannotation.version}
                                 </bundleDef>
+								<bundleDef>
+									io.swagger:swagger-annotations:${swagger.version}
+								</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>

features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml

@@ -48,6 +48,10 @@
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.store</groupId>
+			<artifactId>org.wso2.store.sso.common</artifactId>
+		</dependency>
     </dependencies>
 
     <build>
@@ -76,6 +80,7 @@
                             </includedFeatures>
                             <bundles>
                                 <bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>
+								<bundleDef>org.wso2.carbon.store:org.wso2.store.sso.common:${carbon.store.sso.common.version}</bundleDef>
                             </bundles>
                         </configuration>
                     </execution>

pom.xml

@@ -1664,6 +1664,11 @@
                 <artifactId>wss4j</artifactId>
                 <version>${org.apache.ws.security.wso2.version}</version>
             </dependency>
+			<dependency>
+				<groupId>org.wso2.carbon.store</groupId>
+				<artifactId>org.wso2.store.sso.common</artifactId>
+				<version>${carbon.store.sso.common.version}</version>
+			</dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -2059,6 +2064,9 @@
         <!-- api-mgt handler version properties -->
         <org.apache.synapse.version>2.1.7-wso2v7</org.apache.synapse.version>
         <org.apache.ws.security.wso2.version>1.5.11.wso2v15</org.apache.ws.security.wso2.version>
+
+		<!--carbon store version-->
+		<carbon.store.sso.common.version>1.4.4</carbon.store.sso.common.version>
     </properties>
 
 </project>