Fix osgi import version issue

wso2 · Apr 29, 2015 · 08c6576 · 08c6576
1 parent ee1fc2a
commit 08c6576
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/features/registry-task/org.wso2.carbon.registry.task.server.feature/pom.xml b/features/registry-task/org.wso2.carbon.registry.task.server.feature/pom.xml
@@ -63,7 +63,7 @@
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.registry.core.server:${carbon.registry.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.ntask</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.ntask:${carbon.commons.version}</importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>

diff --git a/features/reporting/org.wso2.carbon.registry.reporting.server.feature/pom.xml b/features/reporting/org.wso2.carbon.registry.reporting.server.feature/pom.xml
@@ -64,7 +64,7 @@
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.registry.core.server:${carbon.registry.version}
                                 </importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.reporting.server</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.reporting.server:${carbon.commons.version}</importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>

diff --git a/features/reporting/org.wso2.carbon.registry.reporting.ui.feature/pom.xml b/features/reporting/org.wso2.carbon.registry.reporting.ui.feature/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.wso2.carbon.registry</groupId>
             <artifactId>org.wso2.carbon.registry.reporting.ui</artifactId>
-            <version>4.4.2-SNAPSHOT</version>
+            <version>${carbon.registry.version}</version>
         </dependency>
     </dependencies>
     <build>
@@ -69,7 +69,7 @@
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.registry.core.ui:${carbon.registry.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.reporting.ui</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.reporting.ui:${carbon.commons.version}</importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>

diff --git a/pom.xml b/pom.xml
@@ -810,6 +810,18 @@
                 <artifactId>org.wso2.carbon.deployment.synchronizer</artifactId>
                 <version>${carbon.commons.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.commons</groupId>
+                <artifactId>org.wso2.carbon.reporting.server.feature</artifactId>
+                <version>${carbon.commons.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.commons</groupId>
+                <artifactId>org.wso2.carbon.reporting.ui.feature</artifactId>
+                <version>${carbon.commons.version}</version>
+                <type>zip</type>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ui.menu.registry</artifactId>