Index: pom.xml
===================================================================
--- pom.xml	(revision 35789)
+++ pom.xml	(working copy)
@@ -234,6 +234,11 @@
       <id>tmp-gwt-rc</id>
       <url>http://google-web-toolkit.googlecode.com/svn/2.1.0/gwt/maven</url>
     </repository>
+    <repository>
+      <id>helios</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/releases/helios</url>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -415,7 +420,6 @@
         </property>
       </activation>
       <modules>
-        <!--module>drools-assistant</module-->
         <module>drools-eclipse</module>
       </modules>
     </profile>
@@ -429,7 +433,6 @@
       </activation>
       <modules>
         <module>drools-docs</module>
-        <!--module>drools-assistant</module-->
         <module>drools-eclipse</module>
         <module>drools-examples</module>
       </modules>
@@ -444,7 +447,6 @@
       </activation>
       <modules>
         <module>drools-docs</module>
-        <!--module>drools-assistant</module-->
         <module>drools-eclipse</module>
         <module>drools-examples</module>
       </modules>
Index: drools-eclipse/pom.xml
===================================================================
--- drools-eclipse/pom.xml	(revision 35789)
+++ drools-eclipse/pom.xml	(working copy)
@@ -10,7 +10,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>drools-eclipse</artifactId>
   <packaging>pom</packaging>
-
+  
   <name>Drools :: Eclipse-Plugin</name>
   
   <modules>
@@ -30,7 +30,7 @@
       </activation>
       <modules>
         <module>org.drools.eclipse</module>
-        <module>drools-eclipse-build</module>
+        <!--module>drools-eclipse-build</module-->
       </modules>
     </profile>
     <profile>
@@ -40,9 +40,45 @@
       </activation>
       <modules>
         <module>org.drools.eclipse</module>
+        <module>org.drools.eclipse.feature</module>
         <module>org.drools.eclipse.task</module>
-        <module>drools-eclipse-build</module>
+        <module>org.drools.eclipse.task.feature</module>
+        <!--module>drools-eclipse-build</module-->
       </modules>
     </profile>
   </profiles>
+  
+    <build>
+    <plugins>
+      <plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <version>0.10.0</version>
+        <extensions>true</extensions>
+      </plugin>
+      <!--plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>maven-osgi-packaging-plugin</artifactId>
+        <version>0.10.0</version>
+        <configuration>
+          <environments>
+            <environment>
+              <os>macosx</os>
+              <ws>cocoa</ws>
+              <arch>x86</arch>
+            </environment>
+          </environments>
+        </configuration>
+      </plugin-->
+       <plugin>
+            <groupId>org.sonatype.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>0.10.0</version>
+            <configuration>
+              <resolver>p2</resolver>
+            </configuration>
+        </plugin>
+    </plugins>
+  </build>
+  
 </project>
Index: drools-eclipse/org.drools.eclipse/pom.xml
===================================================================
--- drools-eclipse/org.drools.eclipse/pom.xml	(revision 35789)
+++ drools-eclipse/org.drools.eclipse/pom.xml	(working copy)
@@ -9,12 +9,13 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.drools.eclipse</artifactId>
-  <packaging>pom</packaging>
+  <packaging>eclipse-plugin</packaging>
 
   <name>Drools :: Eclipse :: Base</name>
   <build>
     <plugins>    
-    
+
+ 
      <plugin>
        <artifactId>maven-antrun-plugin</artifactId>
        <inherited>false</inherited>
Index: drools-eclipse/org.drools.eclipse/META-INF/MANIFEST.MF
===================================================================
--- drools-eclipse/org.drools.eclipse/META-INF/MANIFEST.MF	(revision 35789)
+++ drools-eclipse/org.drools.eclipse/META-INF/MANIFEST.MF	(working copy)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Drools Eclipse Plug-in
 Bundle-SymbolicName: org.drools.eclipse;singleton:=true
-Bundle-Version: 5.2.0.SNAPSHOT
+Bundle-Version: 5.2.0.qualifier
 Bundle-Activator: org.drools.eclipse.DroolsEclipsePlugin
 Bundle-Vendor: JBoss, a division of Red Hat
 Bundle-Localization: plugin
Index: drools-eclipse/org.drools.eclipse.feature/feature.xml
===================================================================
--- drools-eclipse/org.drools.eclipse.feature/feature.xml	(revision 35789)
+++ drools-eclipse/org.drools.eclipse.feature/feature.xml	(working copy)
@@ -2,7 +2,7 @@
 <feature
       id="org.drools.eclipse.feature"
       label="JBoss Drools Core"
-      version="5.2.0.SNAPSHOT"
+      version="5.2.0.qualifier"
       provider-name="JBoss, a division of Red Hat">
 
    <description url="http://www.jboss.org/drools/">
@@ -53,7 +53,7 @@
          id="org.drools.eclipse"
          download-size="0"
          install-size="0"
-         version="5.2.0.SNAPSHOT"
+         version="5.2.0.qualifier"
          unpack="false"/>
 
 </feature>
Index: drools-eclipse/org.drools.eclipse.feature/pom.xml
===================================================================
--- drools-eclipse/org.drools.eclipse.feature/pom.xml	(revision 35789)
+++ drools-eclipse/org.drools.eclipse.feature/pom.xml	(working copy)
@@ -8,6 +8,6 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.drools.eclipse.feature</artifactId>
-  <packaging>pom</packaging>
+  <packaging>eclipse-feature</packaging>
 
 </project>
Index: drools-eclipse/org.drools.eclipse.task/pom.xml
===================================================================
--- drools-eclipse/org.drools.eclipse.task/pom.xml	(revision 35789)
+++ drools-eclipse/org.drools.eclipse.task/pom.xml	(working copy)
@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.drools.eclipse.task</artifactId>
-  <packaging>pom</packaging>
+  <packaging>eclipse-plugin</packaging>
 
   <name>Drools :: Eclipse :: Task</name>
   <build>
@@ -94,7 +94,10 @@
     </dependency>
       
     <!-- this should include core and compiler -->
+
     <dependency>
+    
+    
       <groupId>org.drools</groupId>
       <artifactId>drools-process-task</artifactId>
       <exclusions>
Index: drools-eclipse/org.drools.eclipse.task/META-INF/MANIFEST.MF
===================================================================
--- drools-eclipse/org.drools.eclipse.task/META-INF/MANIFEST.MF	(revision 35789)
+++ drools-eclipse/org.drools.eclipse.task/META-INF/MANIFEST.MF	(working copy)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Drools Eclipse Task Plug-in
 Bundle-SymbolicName: org.drools.eclipse.task; singleton:=true
-Bundle-Version: 5.2.0.SNAPSHOT
+Bundle-Version: 5.2.0.qualifier
 Bundle-Activator: org.drools.eclipse.task.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
Index: drools-eclipse/org.drools.eclipse.task.feature/feature.xml
===================================================================
--- drools-eclipse/org.drools.eclipse.task.feature/feature.xml	(revision 35789)
+++ drools-eclipse/org.drools.eclipse.task.feature/feature.xml	(working copy)
@@ -2,7 +2,7 @@
 <feature
       id="org.drools.eclipse.task.feature"
       label="JBoss Drools Task"
-      version="5.2.0.SNAPSHOT"
+      version="5.2.0.qualifier"
       provider-name="JBoss, a division of Red Hat">
 
    <description url="http://www.jboss.org/drools/">
@@ -36,7 +36,7 @@
          id="org.drools.eclipse.task"
          download-size="0"
          install-size="0"
-         version="5.2.0.SNAPSHOT"
+         version="5.2.0.qualifier"
          unpack="false"/>
 
 </feature>
Index: drools-eclipse/org.drools.eclipse.test/META-INF/MANIFEST.MF
===================================================================
--- drools-eclipse/org.drools.eclipse.test/META-INF/MANIFEST.MF	(revision 35789)
+++ drools-eclipse/org.drools.eclipse.test/META-INF/MANIFEST.MF	(working copy)
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Drools Eclipse Test Plugin
 Bundle-SymbolicName: org.drools.eclipse.test
-Bundle-Version: 5.2.0.SNAPSHOT
+Bundle-Version: 5.2.0.qualifier
 Bundle-Vendor: JBoss, a division of Red Hat
-Fragment-Host: org.drools.eclipse;bundle-version="5.2.0.SNAPSHOT"
+Fragment-Host: org.drools.eclipse
 Bundle-Localization: plugin
 Require-Bundle: org.junit;bundle-version="[3.8.2,4.0.0)
 Bundle-ClassPath: .