Fixed version conflics

8 years ago · 11b0db7bed
parent 4576a700e8 c5d00adc43
commit 11b0db7bed
27 changed files with 75 additions and 46 deletions
--- a/modules/analytics/distribution/pom.xml
+++ b/modules/analytics/distribution/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/analytics/distribution/src/repository/conf/carbon.xml
+++ b/modules/analytics/distribution/src/repository/conf/carbon.xml
@ -75,10 +75,8 @@
    Ex : <Role>.*</Role> means this server can act any role
    -->
    <ServerRoles>
-        <Role>${default.server.role}</Role>
        <Role>${cep.server.role}</Role>
        <Role>${das.server.role}</Role>
-        <Role>${cdmf.platform.role}</Role>
        <Role>${geodashboard.role}</Role>
    </ServerRoles>

--- a/modules/analytics/distribution/src/ues/designer.json
+++ b/modules/analytics/distribution/src/ues/designer.json
@ -7,16 +7,21 @@
        "ignoreProviders": ["rt"]
    },
    "authentication": {
-        "activeMethod": "basic",
+        "activeMethod": "sso",
        "methods": {
            "sso": {
                "attributes": {
-                    "issuer": "portal",
+                    "issuer": "analyticsportal",
                    "identityProviderURL": "https://localhost:9443/samlsso",
-                    "responseSigningEnabled": "false",
-                    "acs": "https://localhost:9444/portal/acs",
+                    "responseSigningEnabled": true,
+                    "validateAssertionValidityPeriod": true,
+                    "validateAudienceRestriction": true,
+                    "assertionSigningEnabled": true,
+                    "acs": "https://localhost:9445/portal/acs",
                    "identityAlias": "wso2carbon",
-                    "useTenantKey": false
+                    "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+                    "useTenantKey": false,
+                    "isPassive": false
                }
            },
            "basic": {
@ -33,14 +38,14 @@
                    "oauthProvider": {
                        "appRegistration": {
                            "appType": "webapp",
-                            "clientName": "portal",
+                            "clientName": "analyticsportal",
                            "owner": "admin",
                            "password":"admin",
                            "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",
                            "tokenScope": "admin",
-                            "callbackUrl": "%https.host%/portal",
+                            "callbackUrl": "https://localhost:9445/portal",
                            "saasApp":true
                        },
                        "tokenServiceURL": "https://localhost:9443/oauth2/token"
@ -65,6 +70,15 @@
    "cacheSizeBytes": "1073741824",
    "defaultDashboardRedirect": false,
    "isCreateGadgetEnable": true,
+    "isSecureVaultEnabled" : false,
+    "assets": {
+        "gadget": {
+            "fileSizeLimit": 5
+        },
+        "layout": {
+            "fileSizeLimit": 1
+        }
+    },
    "oauth": {
        "username": "admin",
        "password": "admin"
@ -77,4 +91,4 @@
    "queryParameters" : {
        "passBetweenPages" : ["shared"]
    }
-}
+}
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/analytics/pom.xml
+++ b/modules/analytics/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/broker/distribution/pom.xml
+++ b/modules/broker/distribution/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-broker-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/broker/p2-profile/pom.xml
+++ b/modules/broker/p2-profile/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-broker-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/broker/pom.xml
+++ b/modules/broker/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/core/distribution/pom.xml
+++ b/modules/core/distribution/pom.xml
@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-core-parent</artifactId>
-		<version>3.0.1-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

@ -288,7 +288,7 @@
 								<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
 									<patternset>
 										<exclude name="**/shindig.properties" />
-d                                        <exclude name="**/shindig.properties" />
+                                        <exclude name="**/shindig.properties" />
 									</patternset>
 								</unzip>
 								<copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />
@ -299,10 +299,6 @@ d                                        <exclude name="**/shindig.properties" /
 								</delete>
 								<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 dir="${tempdir}" />
 							</tasks>
--- a/modules/core/distribution/src/repository/conf/carbon.xml
+++ b/modules/core/distribution/src/repository/conf/carbon.xml
@ -77,12 +77,8 @@
 	-->
 	<ServerRoles>
 		<Role>${default.server.role}</Role>
-		<Role>${das.server.role}</Role>
-		<Role>${cep.server.role}</Role>
 		<Role>${cdmf.analytics.role}</Role>
-		<Role>IoTServer</Role>
 		<Role>CDMFPlatform</Role>
-		<Role>GeoDashboard</Role>
 	</ServerRoles>

 	<!-- uncommnet this line to subscribe to a bam instance automatically -->
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
@ -44,7 +44,7 @@
      </AuthenticationStep>
    </AuthenticationSteps>
    <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+    <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
  </LocalAndOutBoundAuthenticationConfig>
  <RequestPathAuthenticatorConfigs>
  </RequestPathAuthenticatorConfigs>
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
@ -44,7 +44,7 @@
            </AuthenticationStep>
        </AuthenticationSteps>
        <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-        <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+        <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
    </LocalAndOutBoundAuthenticationConfig>
    <RequestPathAuthenticatorConfigs>
    </RequestPathAuthenticatorConfigs>
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml
@ -44,7 +44,7 @@
            </AuthenticationStep>
        </AuthenticationSteps>
        <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-        <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+        <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
    </LocalAndOutBoundAuthenticationConfig>
    <RequestPathAuthenticatorConfigs>
    </RequestPathAuthenticatorConfigs>
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
@ -44,7 +44,7 @@
      </AuthenticationStep>
    </AuthenticationSteps>
    <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+    <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
  </LocalAndOutBoundAuthenticationConfig>
  <RequestPathAuthenticatorConfigs>
  </RequestPathAuthenticatorConfigs>
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml
@ -44,7 +44,7 @@
      </AuthenticationStep>
    </AuthenticationSteps>
    <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+    <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
  </LocalAndOutBoundAuthenticationConfig>
  <RequestPathAuthenticatorConfigs>
  </RequestPathAuthenticatorConfigs>
--- a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
+++ b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
@ -100,5 +100,21 @@
                <Recipient>https://localhost:9443/oauth2/token</Recipient>
            </RecipientList>
        </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>
 </SSOIdentityProviderConfig>
--- a/modules/core/distribution/src/repository/conf/log4j.properties
+++ b/modules/core/distribution/src/repository/conf/log4j.properties
@ -240,4 +240,5 @@ log4j.logger.org.wso2.carbon.event.receiver.core.EventReceiverDeployer=WARN
 log4j.logger.org.wso2.carbon.analytics.spark.core.SparkScriptCAppDeployer=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.core.services.util.CarbonAuthenticationUtil=WARN
+log4j.logger.org.wso2.carbon.core.services.util.CarbonAuthenticationUtil=WARN
+log4j.logger.net.sf.ehcache=ERROR
--- a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
+++ b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-features</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/core/features/pom.xml
+++ b/modules/core/features/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/core/iotserver-ui/pom.xml
+++ b/modules/core/iotserver-ui/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@ -344,6 +344,9 @@
                                <featureArtifactDef>
                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.inbound.metadata.saml2.server.feature:0.1.1
+                                </featureArtifactDef>
                                <featureArtifactDef>
                                    org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
                                </featureArtifactDef>
@ -784,6 +787,10 @@
                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
                            <features>
                                <!-- IoTServer Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group</id>
+                                    <version>0.1.1</version>
+                                </feature>
                                <feature>
                                    <id>org.wso2.carbon.identity.sp.metadata.saml2.server.feature.group</id>
                                    <version>${identity.metadata.saml2.version}</version>
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/core/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/core/tools/cdmf-devicetype-archetype/pom.xml
@ -20,13 +20,13 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-tools</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>iot-devicetype-archetype</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <name>WSO2 IoT - Device Type Archetype</name>
    <description>WSO2 IoT Device Type Archetype</description>
    <packaging>maven-archetype</packaging>
--- a/modules/core/tools/pom.xml
+++ b/modules/core/tools/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/distribution/src/resources/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml
@ -27,7 +27,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.wso2.iot.devicemgt-plugins</groupId>
    <artifactId>iot-devicetype-feature-installation</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Creating custom distribution</name>
    <url>http://wso2.org</url>
--- a/pom.xml
+++ b/pom.xml
@ -23,7 +23,7 @@
    <groupId>org.wso2.iot</groupId>
    <artifactId>wso2iot-parent</artifactId>
    <packaging>pom</packaging>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <name>WSO2 IoT - Parent</name>
    <url>http://wso2.org</url>
    <description>WSO2 IoT Server</description>
@ -1453,8 +1453,8 @@
    <properties>

        <!--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.iotcore>4.4.11</carbon.kernel.version.iotcore>
        <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>
@ -1514,6 +1514,7 @@
        <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.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-->
        <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>

        <!-- 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.mgt.plugin.version>3.0.5-SNAPSHOT</carbon.device.mgt.plugin.version>