Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

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

@@ -103,6 +103,10 @@
             <groupId>org.wso2.carbon.governance</groupId>
             <artifactId>org.wso2.carbon.governance.lcm</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+        </dependency>
     </dependencies>
 
 
@@ -150,6 +154,7 @@
                             org.wso2.carbon.registry.core.*
                         </Import-Package>
                         <Embed-Dependency>
+                            javax.ws.rs-api,
                             scribe;scope=compile|runtime;inline=false;
                         </Embed-Dependency>
                         <DynamicImport-Package>*</DynamicImport-Package>

pom.xml

@@ -1116,6 +1116,11 @@
                 <artifactId>jsr311-api</artifactId>
                 <version>${jsr311.version}</version>
             </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>javax.ws.rs-api</artifactId>
+                <version>${javax.ws.rs.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -1856,6 +1861,8 @@
         <nimbus.orbit.version>2.26.1.wso2v3</nimbus.orbit.version>
         <nimbus.orbit.version.range>[2.26.1, 3.0.0)</nimbus.orbit.version.range>
 
+        <!--javax ws rs version-->
+        <javax.ws.rs.version>2.0.1</javax.ws.rs.version>
         <swagger.version>1.5.8</swagger.version>
         <servlet-api.version>2.5</servlet-api.version>
     </properties>