Fixing conflicts

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Certificate Management Core</name>
     <description>WSO2 Carbon - Certificate Management Core</description>
@@ -51,7 +51,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Device Management Core Bundle</Bundle-Description>
                         <Private-Package>
-                            org.wso2.carbon.certificate.mgt.core.internal
+                            org.wso2.carbon.certificate.mgt.core.internal,
+                            org.wso2.carbon.certificate.mgt.core.util
                         </Private-Package>
                         <Import-Package>
                             org.osgi.framework,
@@ -97,6 +98,7 @@
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.certificate.mgt.core.internal.*,
+                            !org.wso2.carbon.certificate.mgt.core.util,
                             org.wso2.carbon.certificate.mgt.core.*
                         </Export-Package>
                     </instructions>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf

@@ -108,7 +108,7 @@
     "contextParams" : [
       {
         "name" : "Owasp.CsrfGuard.Config",
-        "value" : "/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
+        "value" : "/repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
       }
     ]
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf

@@ -71,7 +71,7 @@
      "contextParams" : [
        {
          "name" : "Owasp.CsrfGuard.Config",
-         "value" : "/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
+         "value" : "/repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
        }
      ]
 }