From 31f478ebcbc3e3a5605b616eb1e9f759b92489ca Mon Sep 17 00:00:00 2001
From: Ruwan Yatawara <ruwan.yatawara@Ruwans-MacBook-Pro.local>
Date: Mon, 12 Mar 2018 19:03:29 +0530
Subject: [PATCH] Fixing ouath2 application deployment failure and captcha
 error

---
 modules/distribution/src/assembly/bin.xml   |  6 ++++++
 modules/p2-profile/iot-core-profile/pom.xml | 22 +++++++++++++++++++++
 pom.xml                                     |  6 ++++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c37a322e..6ce4cd3f 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -386,6 +386,12 @@
             <fileMode>644</fileMode>
         </fileSet>
 
+        <!--copy the cxf filters to cxf-runtime-->
+        <fileSet>
+            <directory>../cxf-filters/target/cxfFilters/jar</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/lib/runtimes/cxf</outputDirectory>
+        </fileSet>
+
         <!-- Copying APP Manager Publisher and Store Jaggery apps -->
         <fileSet>
             <directory>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index a6d84421..488bd79e 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -99,6 +99,15 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
 
                             <featureArtifacts>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.governance:org.wso2.carbon.identity.captcha.server.feature:${identity.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.governance:org.wso2.carbon.identity.governance.feature:${identity.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.event.handler.accountlock:org.wso2.carbon.identity.handler.event.account.lock.feature:${identity.event.handler.account.lock.version}
+                                </featureArtifactDef>
                                 <!-- Device Management Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
@@ -878,7 +887,20 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.captcha.server.feature.group</id>
+                                    <version>${identity.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.governance.feature.group</id>
+                                    <version>${identity.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.handler.event.account.lock.feature.group</id>
+                                    <version>${identity.event.handler.account.lock.version}</version>
+                                </feature>
                                 <!-- IoTServer Features -->
+
                                 <feature>
                                     <id>org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group</id>
                                     <version>0.1.1</version>
diff --git a/pom.xml b/pom.xml
index 89e42f82..6f178bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
         <module>modules/features</module>
         <module>modules/scripts</module>
         <module>modules/tools</module>
+        <module>modules/cxf-filters</module>
         <module>modules/p2-profile</module>
         <module>modules/distribution</module>
         <!--<module>modules/integration</module>-->
@@ -492,7 +493,6 @@
                 <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-
             <!--MDM dependencies-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -1525,7 +1525,7 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.0.242-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.244-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1673,6 +1673,8 @@
         <apache.httpclient.version>4.5.2</apache.httpclient.version>
 
         <maven.javadoc.skip>true</maven.javadoc.skip>
+        <identity.governance.version>1.0.38</identity.governance.version>
+        <identity.event.handler.account.lock.version>1.1.12</identity.event.handler.account.lock.version>
     </properties>
 
     <scm>