community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes for Release 2.0.x
This commit is contained in:
Rasika Perera 2017-01-10 10:26:27 +05:30 committed by GitHub
commit 8edde9a0f1
6 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/DeviceDetails.java → components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/DeviceDetails.java
View File

0
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/SearchDevice.java → components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/SearchDevice.java
View File

0
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/util/Utils.java → components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java
View File

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

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

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

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

8
pom.xml
View File

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