|
|
|
@ -54,11 +54,6 @@
|
|
|
|
|
<module>features/jwt-client</module>
|
|
|
|
|
<module>features/device-mgt-extensions</module>
|
|
|
|
|
<module>features/transport-mgt</module>
|
|
|
|
|
|
|
|
|
|
<!--<module>components/webapp-authenticator-framework</module>-->
|
|
|
|
|
<!--<module>features/webapp-authenticator-framework</module>-->
|
|
|
|
|
<!--<module>features/oauth-extensions</module>-->
|
|
|
|
|
|
|
|
|
|
</modules>
|
|
|
|
|
|
|
|
|
|
<dependencyManagement>
|
|
|
|
@ -241,16 +236,6 @@
|
|
|
|
|
<artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
|
|
|
|
|
<version>${carbon.device.mgt.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
<!--<dependency>-->
|
|
|
|
|
<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
|
|
|
|
|
<!--<artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>-->
|
|
|
|
|
<!--<version>${carbon.device.mgt.version}</version>-->
|
|
|
|
|
<!--</dependency>-->
|
|
|
|
|
<!--<dependency>-->
|
|
|
|
|
<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
|
|
|
|
|
<!--<artifactId>org.wso2.carbon.apimgt.integration.generated.client</artifactId>-->
|
|
|
|
|
<!--<version>${carbon.device.mgt.version}</version>-->
|
|
|
|
|
<!--</dependency>-->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.wso2.carbon.devicemgt</groupId>
|
|
|
|
|
<artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
|
|
|
|
@ -282,11 +267,6 @@
|
|
|
|
|
<artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId>
|
|
|
|
|
<version>${carbon.device.mgt.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
<!--<dependency>-->
|
|
|
|
|
<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
|
|
|
|
|
<!--<artifactId>org.wso2.carbon.device.mgt.analytics.wsproxy</artifactId>-->
|
|
|
|
|
<!--<version>${carbon.device.mgt.version}</version>-->
|
|
|
|
|
<!--</dependency>-->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.wso2.carbon.devicemgt</groupId>
|
|
|
|
|
<artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
|
|
|
|
@ -305,12 +285,6 @@
|
|
|
|
|
<type>zip</type>
|
|
|
|
|
<version>${carbon.device.mgt.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
<!--<dependency>-->
|
|
|
|
|
<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
|
|
|
|
|
<!--<artifactId>org.wso2.carbon.device.mgt.ui.feature</artifactId>-->
|
|
|
|
|
<!--<type>zip</type>-->
|
|
|
|
|
<!--<version>${carbon.device.mgt.version}</version>-->
|
|
|
|
|
<!--</dependency>-->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.wso2.carbon.devicemgt</groupId>
|
|
|
|
|
<artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
|
|
|
|
@ -326,12 +300,6 @@
|
|
|
|
|
<artifactId>org.wso2.carbon.apimgt.application.extension.api</artifactId>
|
|
|
|
|
<version>${carbon.device.mgt.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
|
|
|
|
|
<!--<dependency>-->
|
|
|
|
|
<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
|
|
|
|
|
<!--<artifactId>org.wso2.carbon.apimgt.handlers</artifactId>-->
|
|
|
|
|
<!--<version>${carbon.device.mgt.version}</version>-->
|
|
|
|
|
<!--</dependency>-->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.wso2.carbon.devicemgt</groupId>
|
|
|
|
|
<artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
|
|
|
|
@ -479,7 +447,8 @@
|
|
|
|
|
</exclusion>
|
|
|
|
|
<exclusion>
|
|
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
|
|
<artifactId>javax.servlet-api</artifactId> </exclusion>
|
|
|
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
|
|
|
</exclusion>
|
|
|
|
|
</exclusions>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
@ -828,7 +797,7 @@
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.wso2.carbon</groupId>
|
|
|
|
|
<artifactId>org.wso2.carbon.logging</artifactId>
|
|
|
|
|
<version>4.4.9</version>
|
|
|
|
|
<version>${org.wso2.carbon.logging.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.wso2.carbon</groupId>
|
|
|
|
@ -1159,17 +1128,6 @@
|
|
|
|
|
</exclusion>
|
|
|
|
|
</exclusions>
|
|
|
|
|
</dependency>
|
|
|
|
|
<!--<dependency>-->
|
|
|
|
|
<!--<groupId>org.apache.cxf</groupId>-->
|
|
|
|
|
<!--<artifactId>cxf-rt-bindings-http</artifactId>-->
|
|
|
|
|
<!--<version>${cxf.bindings.version}</version>-->
|
|
|
|
|
<!--<exclusions>-->
|
|
|
|
|
<!--<exclusion>-->
|
|
|
|
|
<!--<groupId>org.codehaus.jra</groupId>-->
|
|
|
|
|
<!--<artifactId>jra</artifactId>-->
|
|
|
|
|
<!--</exclusion>-->
|
|
|
|
|
<!--</exclusions>-->
|
|
|
|
|
<!--</dependency>-->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.apache.cxf</groupId>
|
|
|
|
|
<artifactId>cxf-rt-rs-extension-providers</artifactId>
|
|
|
|
@ -1353,21 +1311,11 @@
|
|
|
|
|
<artifactId>gson</artifactId>
|
|
|
|
|
<version>${google.gson.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.wso2.orbit.com.squareup.okhttp</groupId>
|
|
|
|
|
<artifactId>okhttp</artifactId>
|
|
|
|
|
<version>${okhttp.wso2.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
|
|
|
<artifactId>okhttp</artifactId>
|
|
|
|
|
<version>${squareup.okhttp3.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.wso2.orbit.com.squareup.okio</groupId>
|
|
|
|
|
<artifactId>okio</artifactId>
|
|
|
|
|
<version>${okio.wso2.version}</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>com.squareup.okio</groupId>
|
|
|
|
|
<artifactId>okio</artifactId>
|
|
|
|
@ -2085,6 +2033,7 @@
|
|
|
|
|
<carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
|
|
|
|
|
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
|
|
|
|
|
<carbon.feature.plugin.version>3.1.3</carbon.feature.plugin.version>
|
|
|
|
|
<org.wso2.carbon.logging.version>4.4.9</org.wso2.carbon.logging.version>
|
|
|
|
|
|
|
|
|
|
<!-- Axis2 -->
|
|
|
|
|
<axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
|
|
|
|
@ -2193,8 +2142,6 @@
|
|
|
|
|
<json.smart.version>1.3</json.smart.version>
|
|
|
|
|
<google.gson.version>2.3.1</google.gson.version>
|
|
|
|
|
<squareup.okhttp3.version>4.6.0</squareup.okhttp3.version>
|
|
|
|
|
<okhttp.wso2.version>4.2.0.wso2v1</okhttp.wso2.version>
|
|
|
|
|
<okio.wso2.version>2.4.0.wso2v1</okio.wso2.version>
|
|
|
|
|
<okio.version>1.13.0</okio.version>
|
|
|
|
|
<github.openfeign.version>9.3.1</github.openfeign.version>
|
|
|
|
|
<jsr311.version>1.1.1</jsr311.version>
|
|
|
|
|