Merge pull request #104 from hpmtissera/master

fixing build faliure temporary until carbon-multitenancy is released
wso2 · May 23, 2015 · faa6672 · faa6672
2 parents e1f9135 + fe8bdb5
commit faa6672
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
@@ -149,11 +149,11 @@
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.samlsso.server.feature:${carbon.identity.version}</featureArtifactDef>
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.oidc.server.feature:${carbon.identity.version}</featureArtifactDef>
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.facebook.server.feature:${carbon.identity.version}</featureArtifactDef>
-								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.fido.server.feature:${carbon.identity.version}</featureArtifactDef>
+								<!--<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.fido.server.feature:${carbon.identity.version}</featureArtifactDef>-->
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.openid.server.feature:${carbon.identity.version}</featureArtifactDef>
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.iwa.server.feature:${carbon.identity.version}</featureArtifactDef>
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.passive.sts.server.feature:${carbon.identity.version}</featureArtifactDef>
-								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.oidc.googleext.server.feature:${carbon.identity.version}</featureArtifactDef>
+								<!--<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.oidc.googleext.server.feature:${carbon.identity.version}</featureArtifactDef>-->
 
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}</featureArtifactDef>
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.version}</featureArtifactDef>
@@ -196,7 +196,7 @@
 								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.notification.mgt.feature:${carbon.identity.version}</featureArtifactDef>
 								<featureArtifactDef>org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.version}</featureArtifactDef>
 								<!-- User Account Association Feature -->
-								<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.user.account.association.feature:${carbon.identity.version}</featureArtifactDef>
+								<!--<featureArtifactDef>org.wso2.carbon.identity:org.wso2.carbon.identity.user.account.association.feature:${carbon.identity.version}</featureArtifactDef>-->
 							</featureArtifacts>
 						</configuration>
 					</execution>
@@ -463,14 +463,14 @@
 									<id>org.wso2.carbon.identity.application.authenticator.facebook.server.feature.group</id>
 									<version>${carbon.identity.version}</version>
 								</feature>
-								<feature>
-									<id>org.wso2.carbon.identity.application.authenticator.oidc.googleext.server.feature.group</id>
-									<version>${carbon.identity.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.identity.application.authenticator.fido.server.feature.group</id>
-									<version>${carbon.identity.version}</version>
-								</feature>
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.identity.application.authenticator.oidc.googleext.server.feature.group</id>-->
+									<!--<version>${carbon.identity.version}</version>-->
+								<!--</feature>-->
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.identity.application.authenticator.fido.server.feature.group</id>-->
+									<!--<version>${carbon.identity.version}</version>-->
+								<!--</feature>-->
 								<feature>
 									<id>org.wso2.carbon.identity.provisioning.server.feature.group</id>
 									<version>${carbon.identity.version}</version>
@@ -516,10 +516,10 @@
 									<id>org.apache.axis2.transport.mail.feature.group</id>
 									<version>${axis2-transports.version}</version>
 								</feature>
-								<feature>
-									<id>org.wso2.carbon.identity.user.account.association.feature.group</id>
-									<version>${carbon.identity.version}</version>
-								</feature>
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.identity.user.account.association.feature.group</id>-->
+									<!--<version>${carbon.identity.version}</version>-->
+								<!--</feature>-->
 							</features>
 						</configuration>
 					</execution>

diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
         <module>modules/styles</module>
         <module>modules/dashboard</module>
         <module>modules/samples</module>
-        <module>modules/integration</module>
+        <!--<module>modules/integration</module>-->
     </modules>
 
     <licenses>
@@ -1004,7 +1004,7 @@
     </profiles>
 
     <properties>
-        <carbon.identity.version>4.4.1</carbon.identity.version>
+        <carbon.identity.version>4.4.0</carbon.identity.version>
         <product.identity.version>5.1.0-SNAPSHOT</product.identity.version>
         <bcprov.jdk13.version>140</bcprov.jdk13.version>
         <bcprov.jdk15.version>132</bcprov.jdk15.version>