mirror of
https://repository.entgra.net/community/product-iots.git
synced 2025-09-16 23:32:19 +00:00
Fixed version conflics
This commit is contained in:
commit
11b0db7bed
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-analytics-parent</artifactId>
|
<artifactId>wso2iot-analytics-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -75,10 +75,8 @@
|
|||||||
Ex : <Role>.*</Role> means this server can act any role
|
Ex : <Role>.*</Role> means this server can act any role
|
||||||
-->
|
-->
|
||||||
<ServerRoles>
|
<ServerRoles>
|
||||||
<Role>${default.server.role}</Role>
|
|
||||||
<Role>${cep.server.role}</Role>
|
<Role>${cep.server.role}</Role>
|
||||||
<Role>${das.server.role}</Role>
|
<Role>${das.server.role}</Role>
|
||||||
<Role>${cdmf.platform.role}</Role>
|
|
||||||
<Role>${geodashboard.role}</Role>
|
<Role>${geodashboard.role}</Role>
|
||||||
</ServerRoles>
|
</ServerRoles>
|
||||||
|
|
||||||
|
|||||||
@ -7,16 +7,21 @@
|
|||||||
"ignoreProviders": ["rt"]
|
"ignoreProviders": ["rt"]
|
||||||
},
|
},
|
||||||
"authentication": {
|
"authentication": {
|
||||||
"activeMethod": "basic",
|
"activeMethod": "sso",
|
||||||
"methods": {
|
"methods": {
|
||||||
"sso": {
|
"sso": {
|
||||||
"attributes": {
|
"attributes": {
|
||||||
"issuer": "portal",
|
"issuer": "analyticsportal",
|
||||||
"identityProviderURL": "https://localhost:9443/samlsso",
|
"identityProviderURL": "https://localhost:9443/samlsso",
|
||||||
"responseSigningEnabled": "false",
|
"responseSigningEnabled": true,
|
||||||
"acs": "https://localhost:9444/portal/acs",
|
"validateAssertionValidityPeriod": true,
|
||||||
|
"validateAudienceRestriction": true,
|
||||||
|
"assertionSigningEnabled": true,
|
||||||
|
"acs": "https://localhost:9445/portal/acs",
|
||||||
"identityAlias": "wso2carbon",
|
"identityAlias": "wso2carbon",
|
||||||
"useTenantKey": false
|
"defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
|
||||||
|
"useTenantKey": false,
|
||||||
|
"isPassive": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"basic": {
|
"basic": {
|
||||||
@ -33,14 +38,14 @@
|
|||||||
"oauthProvider": {
|
"oauthProvider": {
|
||||||
"appRegistration": {
|
"appRegistration": {
|
||||||
"appType": "webapp",
|
"appType": "webapp",
|
||||||
"clientName": "portal",
|
"clientName": "analyticsportal",
|
||||||
"owner": "admin",
|
"owner": "admin",
|
||||||
"password":"admin",
|
"password":"admin",
|
||||||
"dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
|
"dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
|
||||||
"apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
|
"apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants",
|
||||||
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
|
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
|
||||||
"tokenScope": "admin",
|
"tokenScope": "admin",
|
||||||
"callbackUrl": "%https.host%/portal",
|
"callbackUrl": "https://localhost:9445/portal",
|
||||||
"saasApp":true
|
"saasApp":true
|
||||||
},
|
},
|
||||||
"tokenServiceURL": "https://localhost:9443/oauth2/token"
|
"tokenServiceURL": "https://localhost:9443/oauth2/token"
|
||||||
@ -65,6 +70,15 @@
|
|||||||
"cacheSizeBytes": "1073741824",
|
"cacheSizeBytes": "1073741824",
|
||||||
"defaultDashboardRedirect": false,
|
"defaultDashboardRedirect": false,
|
||||||
"isCreateGadgetEnable": true,
|
"isCreateGadgetEnable": true,
|
||||||
|
"isSecureVaultEnabled" : false,
|
||||||
|
"assets": {
|
||||||
|
"gadget": {
|
||||||
|
"fileSizeLimit": 5
|
||||||
|
},
|
||||||
|
"layout": {
|
||||||
|
"fileSizeLimit": 1
|
||||||
|
}
|
||||||
|
},
|
||||||
"oauth": {
|
"oauth": {
|
||||||
"username": "admin",
|
"username": "admin",
|
||||||
"password": "admin"
|
"password": "admin"
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-analytics-parent</artifactId>
|
<artifactId>wso2iot-analytics-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-parent</artifactId>
|
<artifactId>wso2iot-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-broker-parent</artifactId>
|
<artifactId>wso2iot-broker-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-broker-parent</artifactId>
|
<artifactId>wso2iot-broker-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-parent</artifactId>
|
<artifactId>wso2iot-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-core-parent</artifactId>
|
<artifactId>wso2iot-core-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -288,7 +288,7 @@
|
|||||||
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
|
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
|
||||||
<patternset>
|
<patternset>
|
||||||
<exclude name="**/shindig.properties" />
|
<exclude name="**/shindig.properties" />
|
||||||
d <exclude name="**/shindig.properties" />
|
<exclude name="**/shindig.properties" />
|
||||||
</patternset>
|
</patternset>
|
||||||
</unzip>
|
</unzip>
|
||||||
<copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />
|
<copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />
|
||||||
@ -299,10 +299,6 @@ d <exclude name="**/shindig.properties" /
|
|||||||
</delete>
|
</delete>
|
||||||
<copy file="src/repository/resources/shindig/index.jsp" todir="target/shindig" />-->
|
<copy file="src/repository/resources/shindig/index.jsp" todir="target/shindig" />-->
|
||||||
|
|
||||||
<concat destfile="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/log4j.properties">
|
|
||||||
log4j.logger.net.sf.ehcache=ERROR
|
|
||||||
</concat>
|
|
||||||
|
|
||||||
<delete file="target/${project.artifactId}-${project.version}.zip" />
|
<delete file="target/${project.artifactId}-${project.version}.zip" />
|
||||||
<delete dir="${tempdir}" />
|
<delete dir="${tempdir}" />
|
||||||
</tasks>
|
</tasks>
|
||||||
|
|||||||
@ -77,12 +77,8 @@
|
|||||||
-->
|
-->
|
||||||
<ServerRoles>
|
<ServerRoles>
|
||||||
<Role>${default.server.role}</Role>
|
<Role>${default.server.role}</Role>
|
||||||
<Role>${das.server.role}</Role>
|
|
||||||
<Role>${cep.server.role}</Role>
|
|
||||||
<Role>${cdmf.analytics.role}</Role>
|
<Role>${cdmf.analytics.role}</Role>
|
||||||
<Role>IoTServer</Role>
|
|
||||||
<Role>CDMFPlatform</Role>
|
<Role>CDMFPlatform</Role>
|
||||||
<Role>GeoDashboard</Role>
|
|
||||||
</ServerRoles>
|
</ServerRoles>
|
||||||
|
|
||||||
<!-- uncommnet this line to subscribe to a bam instance automatically -->
|
<!-- uncommnet this line to subscribe to a bam instance automatically -->
|
||||||
|
|||||||
@ -44,7 +44,7 @@
|
|||||||
</AuthenticationStep>
|
</AuthenticationStep>
|
||||||
</AuthenticationSteps>
|
</AuthenticationSteps>
|
||||||
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
||||||
<UseTenantDomainInUsername>true</UseTenantDomainInUsername>
|
<UseTenantDomainInUsername>false</UseTenantDomainInUsername>
|
||||||
</LocalAndOutBoundAuthenticationConfig>
|
</LocalAndOutBoundAuthenticationConfig>
|
||||||
<RequestPathAuthenticatorConfigs>
|
<RequestPathAuthenticatorConfigs>
|
||||||
</RequestPathAuthenticatorConfigs>
|
</RequestPathAuthenticatorConfigs>
|
||||||
|
|||||||
@ -44,7 +44,7 @@
|
|||||||
</AuthenticationStep>
|
</AuthenticationStep>
|
||||||
</AuthenticationSteps>
|
</AuthenticationSteps>
|
||||||
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
||||||
<UseTenantDomainInUsername>true</UseTenantDomainInUsername>
|
<UseTenantDomainInUsername>false</UseTenantDomainInUsername>
|
||||||
</LocalAndOutBoundAuthenticationConfig>
|
</LocalAndOutBoundAuthenticationConfig>
|
||||||
<RequestPathAuthenticatorConfigs>
|
<RequestPathAuthenticatorConfigs>
|
||||||
</RequestPathAuthenticatorConfigs>
|
</RequestPathAuthenticatorConfigs>
|
||||||
|
|||||||
@ -44,7 +44,7 @@
|
|||||||
</AuthenticationStep>
|
</AuthenticationStep>
|
||||||
</AuthenticationSteps>
|
</AuthenticationSteps>
|
||||||
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
||||||
<UseTenantDomainInUsername>true</UseTenantDomainInUsername>
|
<UseTenantDomainInUsername>false</UseTenantDomainInUsername>
|
||||||
</LocalAndOutBoundAuthenticationConfig>
|
</LocalAndOutBoundAuthenticationConfig>
|
||||||
<RequestPathAuthenticatorConfigs>
|
<RequestPathAuthenticatorConfigs>
|
||||||
</RequestPathAuthenticatorConfigs>
|
</RequestPathAuthenticatorConfigs>
|
||||||
|
|||||||
@ -44,7 +44,7 @@
|
|||||||
</AuthenticationStep>
|
</AuthenticationStep>
|
||||||
</AuthenticationSteps>
|
</AuthenticationSteps>
|
||||||
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
||||||
<UseTenantDomainInUsername>true</UseTenantDomainInUsername>
|
<UseTenantDomainInUsername>false</UseTenantDomainInUsername>
|
||||||
</LocalAndOutBoundAuthenticationConfig>
|
</LocalAndOutBoundAuthenticationConfig>
|
||||||
<RequestPathAuthenticatorConfigs>
|
<RequestPathAuthenticatorConfigs>
|
||||||
</RequestPathAuthenticatorConfigs>
|
</RequestPathAuthenticatorConfigs>
|
||||||
|
|||||||
@ -44,7 +44,7 @@
|
|||||||
</AuthenticationStep>
|
</AuthenticationStep>
|
||||||
</AuthenticationSteps>
|
</AuthenticationSteps>
|
||||||
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
|
||||||
<UseTenantDomainInUsername>true</UseTenantDomainInUsername>
|
<UseTenantDomainInUsername>false</UseTenantDomainInUsername>
|
||||||
</LocalAndOutBoundAuthenticationConfig>
|
</LocalAndOutBoundAuthenticationConfig>
|
||||||
<RequestPathAuthenticatorConfigs>
|
<RequestPathAuthenticatorConfigs>
|
||||||
</RequestPathAuthenticatorConfigs>
|
</RequestPathAuthenticatorConfigs>
|
||||||
|
|||||||
@ -100,5 +100,21 @@
|
|||||||
<Recipient>https://localhost:9443/oauth2/token</Recipient>
|
<Recipient>https://localhost:9443/oauth2/token</Recipient>
|
||||||
</RecipientList>
|
</RecipientList>
|
||||||
</ServiceProvider>
|
</ServiceProvider>
|
||||||
|
<ServiceProvider>
|
||||||
|
<Issuer>analyticsportal</Issuer>
|
||||||
|
<AssertionConsumerServiceURLs>
|
||||||
|
<AssertionConsumerServiceURL>https://localhost:9445/portal/acs</AssertionConsumerServiceURL>
|
||||||
|
</AssertionConsumerServiceURLs>
|
||||||
|
<DefaultAssertionConsumerServiceURL>https://localhost:9445/portal/acs</DefaultAssertionConsumerServiceURL>
|
||||||
|
<SignResponse>true</SignResponse>
|
||||||
|
<EnableAudienceRestriction>true</EnableAudienceRestriction>
|
||||||
|
<EnableRecipients>true</EnableRecipients>
|
||||||
|
<AudiencesList>
|
||||||
|
<Audience>https://localhost:9443/oauth2/token</Audience>
|
||||||
|
</AudiencesList>
|
||||||
|
<RecipientList>
|
||||||
|
<Recipient>https://localhost:9443/oauth2/token</Recipient>
|
||||||
|
</RecipientList>
|
||||||
|
</ServiceProvider>
|
||||||
</ServiceProviders>
|
</ServiceProviders>
|
||||||
</SSOIdentityProviderConfig>
|
</SSOIdentityProviderConfig>
|
||||||
@ -241,3 +241,4 @@ log4j.logger.org.wso2.carbon.analytics.spark.core.SparkScriptCAppDeployer=WARN
|
|||||||
log4j.logger.org.wso2.carbon.analytics.eventsink.AnalyticsEventStoreDeployer=WARN
|
log4j.logger.org.wso2.carbon.analytics.eventsink.AnalyticsEventStoreDeployer=WARN
|
||||||
log4j.logger.org.wso2.carbon.event.processor.core.EventProcessorDeployer=WARN
|
log4j.logger.org.wso2.carbon.event.processor.core.EventProcessorDeployer=WARN
|
||||||
log4j.logger.org.wso2.carbon.core.services.util.CarbonAuthenticationUtil=WARN
|
log4j.logger.org.wso2.carbon.core.services.util.CarbonAuthenticationUtil=WARN
|
||||||
|
log4j.logger.net.sf.ehcache=ERROR
|
||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-core-features</artifactId>
|
<artifactId>wso2iot-core-features</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-core-parent</artifactId>
|
<artifactId>wso2iot-core-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-core-parent</artifactId>
|
<artifactId>wso2iot-core-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-core-parent</artifactId>
|
<artifactId>wso2iot-core-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -344,6 +344,9 @@
|
|||||||
<featureArtifactDef>
|
<featureArtifactDef>
|
||||||
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
|
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
|
||||||
</featureArtifactDef>
|
</featureArtifactDef>
|
||||||
|
<featureArtifactDef>
|
||||||
|
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.inbound.metadata.saml2.server.feature:0.1.1
|
||||||
|
</featureArtifactDef>
|
||||||
<featureArtifactDef>
|
<featureArtifactDef>
|
||||||
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
|
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
|
||||||
</featureArtifactDef>
|
</featureArtifactDef>
|
||||||
@ -784,6 +787,10 @@
|
|||||||
<deleteOldProfileFiles>true</deleteOldProfileFiles>
|
<deleteOldProfileFiles>true</deleteOldProfileFiles>
|
||||||
<features>
|
<features>
|
||||||
<!-- IoTServer Features -->
|
<!-- IoTServer Features -->
|
||||||
|
<feature>
|
||||||
|
<id>org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group</id>
|
||||||
|
<version>0.1.1</version>
|
||||||
|
</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>${identity.metadata.saml2.version}</version>
|
<version>${identity.metadata.saml2.version}</version>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-parent</artifactId>
|
<artifactId>wso2iot-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,13 +20,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-core-tools</artifactId>
|
<artifactId>wso2iot-core-tools</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>iot-devicetype-archetype</artifactId>
|
<artifactId>iot-devicetype-archetype</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<name>WSO2 IoT - Device Type Archetype</name>
|
<name>WSO2 IoT - Device Type Archetype</name>
|
||||||
<description>WSO2 IoT Device Type Archetype</description>
|
<description>WSO2 IoT Device Type Archetype</description>
|
||||||
<packaging>maven-archetype</packaging>
|
<packaging>maven-archetype</packaging>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-core-parent</artifactId>
|
<artifactId>wso2iot-core-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-parent</artifactId>
|
<artifactId>wso2iot-parent</artifactId>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.wso2.iot.devicemgt-plugins</groupId>
|
<groupId>org.wso2.iot.devicemgt-plugins</groupId>
|
||||||
<artifactId>iot-devicetype-feature-installation</artifactId>
|
<artifactId>iot-devicetype-feature-installation</artifactId>
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>Creating custom distribution</name>
|
<name>Creating custom distribution</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
|
|||||||
7
pom.xml
7
pom.xml
@ -23,7 +23,7 @@
|
|||||||
<groupId>org.wso2.iot</groupId>
|
<groupId>org.wso2.iot</groupId>
|
||||||
<artifactId>wso2iot-parent</artifactId>
|
<artifactId>wso2iot-parent</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>3.0.1-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<name>WSO2 IoT - Parent</name>
|
<name>WSO2 IoT - Parent</name>
|
||||||
<url>http://wso2.org</url>
|
<url>http://wso2.org</url>
|
||||||
<description>WSO2 IoT Server</description>
|
<description>WSO2 IoT Server</description>
|
||||||
@ -1453,8 +1453,8 @@
|
|||||||
<properties>
|
<properties>
|
||||||
|
|
||||||
<!--Carbon kernel versions-->
|
<!--Carbon kernel versions-->
|
||||||
<carbon.kernel.version.iotcore>4.4.11</carbon.kernel.version.iotcore>
|
|
||||||
<carbon.kernel.version>4.4.10</carbon.kernel.version>
|
<carbon.kernel.version>4.4.10</carbon.kernel.version>
|
||||||
|
<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>
|
||||||
@ -1514,6 +1514,7 @@
|
|||||||
<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.version>1.0.0</identity.metadata.saml2.version>
|
<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>
|
||||||
@ -1532,7 +1533,7 @@
|
|||||||
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
|
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
|
||||||
|
|
||||||
<!-- IOT Device Management -->
|
<!-- IOT Device Management -->
|
||||||
<product.iot.version>3.0.1-SNAPSHOT</product.iot.version>
|
<product.iot.version>3.0.0-SNAPSHOT</product.iot.version>
|
||||||
|
|
||||||
<!-- Carbon Device Management Plugins-->
|
<!-- Carbon Device Management Plugins-->
|
||||||
<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>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user