[Carbon-commits] [Carbon] svn commit r113414 - in branches/carbon/3.2.0/features/security-mgt: org.wso2.carbon.security.mgt.feature/3.2.3 org.wso2.carbon.security.mgt.ui.feature/3.2.1

[thilinab at wso2.com]

Author: thilinab
Date: Mon Oct  3 03:12:13 2011
New Revision: 113414
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=113414

Log:
Fixing the bundle duplication issue in security mgt aggregate feature.

Modified:
   branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.feature/3.2.3/pom.xml
   branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/3.2.1/pom.xml

Modified: branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.feature/3.2.3/pom.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.feature/3.2.3/pom.xml?rev=113414&r1=113413&r2=113414&view=diff
==============================================================================
--- branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.feature/3.2.3/pom.xml	(original)
+++ branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.feature/3.2.3/pom.xml	Mon Oct  3 03:12:13 2011
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.security.mgt.ui.feature</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <type>zip</type>
         </dependency>
     </dependencies>
@@ -70,7 +70,7 @@
                             </importFeatures>
                             <includedFeatures>
                                 <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.security.mgt.server.feature:3.2.3</includedFeatureDef>
-                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.security.mgt.ui.feature:3.2.0</includedFeatureDef>                                
+                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.security.mgt.ui.feature:3.2.1</includedFeatureDef>                                
                             </includedFeatures>
                         </configuration>
                     </execution>

Modified: branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/3.2.1/pom.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/3.2.1/pom.xml?rev=113414&r1=113413&r2=113414&view=diff
==============================================================================
--- branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/3.2.1/pom.xml	(original)
+++ branches/carbon/3.2.0/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/3.2.1/pom.xml	Mon Oct  3 03:12:13 2011
@@ -23,11 +23,13 @@
         <groupId>org.wso2.carbon</groupId>
         <artifactId>security-mgt-feature</artifactId>
         <version>3.2.0</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.security.mgt.ui.feature</artifactId>
     <packaging>pom</packaging>
+    <version>3.2.1</version>
     <name>WSO2 Carbon - Security Management UI Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the bundles required for Front-end Security Management functionality</description>
@@ -44,18 +46,22 @@
         <dependency>
             <groupId>org.apache.rampart.wso2</groupId>
             <artifactId>rampart-policy</artifactId>
+	    <version>1.6.1.wso2v2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rampart.wso2</groupId>
             <artifactId>rampart-core</artifactId>
+	    <version>1.6.1.wso2v2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rampart.wso2</groupId>
             <artifactId>rampart-trust</artifactId>
+	    <version>1.6.1.wso2v2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.security.wso2</groupId>
             <artifactId>wss4j</artifactId>
+	    <version>1.5.11.wso2v2</version>
         </dependency>
     </dependencies>
 
@@ -91,7 +97,7 @@
                                 <importBundleDef>org.apache.rampart.wso2:rampart-trust</importBundleDef>
                             </importBundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.core.ui:3.2.2</importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>