ruwin
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/product-iots

Browse Source
application-manager-new
Rasika Perera 8 years ago
parent 2e220d21ec a4a5a42206
commit ba46ff6dd0
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
modules/core/distribution/src/repository/conf/identity/identity.xml
Unescape View File

@ -132,7 +132,7 @@
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>password</GrantTypeName> <GrantTypeName>password</GrantTypeName>
<GrantTypeHandlerImplClass>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedPasswordGrantHandler</GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedPasswordGrantHandler</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>refresh_token</GrantTypeName> <GrantTypeName>refresh_token</GrantTypeName>

4
modules/core/p2-profile-gen/carbon.product
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.10" useFeatures="true" includeLaunchers="true"> <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.11" useFeatures="true" includeLaunchers="true">
<configIni use="default"> <configIni use="default">
</configIni> </configIni>
@ -13,7 +13,7 @@
</plugins> </plugins>
<features> <features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.10"/> <feature id="org.wso2.carbon.core.runtime" version="4.4.11"/>
</features> </features>
<configurations> <configurations>

4
modules/core/p2-profile-gen/pom.xml
Unescape View File

@ -351,7 +351,7 @@
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.inbound.metadata.saml2.server.feature:0.1.1 org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.inbound.metadata.saml2.server.feature:0.1.1
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:0.1.3 org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>--> <!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity.framework:org.wso2.carbon.identity.base:${carbon.identity.framework.version.iotcore}--> <!--org.wso2.carbon.identity.framework:org.wso2.carbon.identity.base:${carbon.identity.framework.version.iotcore}-->
@ -805,7 +805,7 @@
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.sp.metadata.saml2.server.feature.group</id> <id>org.wso2.carbon.identity.sp.metadata.saml2.server.feature.group</id>
<version>0.1.3</version> <version>${identity.metadata.saml2.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.iot.core.styles.feature.group</id> <id>org.wso2.iot.core.styles.feature.group</id>

17
pom.xml
Unescape View File

@ -1453,8 +1453,8 @@
<properties> <properties>
<!--Carbon kernel versions--> <!--Carbon kernel versions-->
<carbon.kernel.version>4.4.10</carbon.kernel.version> <carbon.kernel.version>4.4.11</carbon.kernel.version>
<carbon.kernel.version.iotcore>4.4.10</carbon.kernel.version.iotcore> <carbon.kernel.version.iotcore>4.4.11</carbon.kernel.version.iotcore>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range> <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@ -1497,23 +1497,24 @@
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.framework.version>5.2.0</carbon.identity.framework.version> <carbon.identity.framework.version>5.2.0</carbon.identity.framework.version>
<carbon.identity.framework.version.iotcore>5.6.89</carbon.identity.framework.version.iotcore> <carbon.identity.framework.version.iotcore>5.7.5</carbon.identity.framework.version.iotcore>
<carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range> <carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range>
<identity.local.auth.basicauth.version>5.1.1</identity.local.auth.basicauth.version> <identity.local.auth.basicauth.version>5.1.1</identity.local.auth.basicauth.version>
<identity.local.auth.basicauth.version.iotcore>5.2.4</identity.local.auth.basicauth.version.iotcore> <identity.local.auth.basicauth.version.iotcore>5.2.4</identity.local.auth.basicauth.version.iotcore>
<identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version> <identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version>
<identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version> <identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
<identity.inbound.auth.saml.version.iotcore>5.2.14</identity.inbound.auth.saml.version.iotcore> <identity.inbound.auth.saml.version.iotcore>5.3.0</identity.inbound.auth.saml.version.iotcore>
<identity.carbon.auth.saml2.version>5.1.3</identity.carbon.auth.saml2.version> <identity.carbon.auth.saml2.version>5.1.3</identity.carbon.auth.saml2.version>
<identity.carbon.auth.saml2.version.iotcore>5.1.6</identity.carbon.auth.saml2.version.iotcore> <identity.carbon.auth.saml2.version.iotcore>5.1.6</identity.carbon.auth.saml2.version.iotcore>
<identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version> <identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
<identity.inbound.auth.oauth.version.iotcore>5.2.33</identity.inbound.auth.oauth.version.iotcore> <identity.inbound.auth.oauth.version.iotcore>5.3.1</identity.inbound.auth.oauth.version.iotcore>
<identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version> <identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version>
<identity.user.ws.version>5.1.3</identity.user.ws.version> <identity.user.ws.version>5.1.3</identity.user.ws.version>
<identity.outbound.auth.requestpath.basicauth.version>5.1.1</identity.outbound.auth.requestpath.basicauth.version> <identity.outbound.auth.requestpath.basicauth.version>5.1.1</identity.outbound.auth.requestpath.basicauth.version>
<identity.outbound.auth.requestpath.oauth.version>5.1.1</identity.outbound.auth.requestpath.oauth.version> <identity.outbound.auth.requestpath.oauth.version>5.1.1</identity.outbound.auth.requestpath.oauth.version>
<identity.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version> <identity.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version>
<identity.metadata.saml2>0.1.3</identity.metadata.saml2> <identity.metadata.saml2.version>1.0.0</identity.metadata.saml2.version>
<identity.inbound.metadata.saml2.version>0.1.1</identity.inbound.metadata.saml2.version>
<!--JWT grant type extension feature--> <!--JWT grant type extension feature-->
<identity.jwt.extension.version>1.0.2</identity.jwt.extension.version> <identity.jwt.extension.version>1.0.2</identity.jwt.extension.version>
@ -1538,8 +1539,8 @@
<carbon.device.mgt.plugin.version>3.0.5-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.5-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.2</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.35</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(5.0.0,7.0.0]</carbon.api.mgt.version.range> <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation --> <!-- Carbon Mediation -->
<carbon.mediation.version>4.6.9</carbon.mediation.version> <carbon.mediation.version>4.6.9</carbon.mediation.version>

Write Preview
Loading…
Cancel
Save