* building of other dltk components using maven/tycho
* running dltk core tests and publish report on builded site
diff --git a/itcl/update.site/assembly.xml b/itcl/update.site/assembly.xml
new file mode 100644
index 0000000..f86238f
--- /dev/null
+++ b/itcl/update.site/assembly.xml
@@ -0,0 +1,13 @@
+<assembly>
+  <id>itcl</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/itcl/update.site/pom.xml b/itcl/update.site/pom.xml
index c2e3d99..de96cfb 100644
--- a/itcl/update.site/pom.xml
+++ b/itcl/update.site/pom.xml
@@ -12,4 +12,28 @@
 	<artifactId>org.eclipse.dltk.itcl-updatesite</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-update-site</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+					<finalName>dltk</finalName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core.indexer/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.core.indexer/META-INF/MANIFEST.MF
index af603ca..28cffc3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core.indexer/META-INF/MANIFEST.MF
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core.indexer/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@
 Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.tcl.core.indexer.Activator
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.dltk.core;bundle-version="2.0.0",
- org.eclipse.dltk.tcl.core;bundle-version="2.0.0",
- org.eclipse.dltk.tcl.parser;bundle-version="1.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.tcl.core;bundle-version="4.0.0",
+ org.eclipse.dltk.tcl.parser;bundle-version="4.0.0",
  org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.dltk.itcl.core;bundle-version="4.0.0",
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/pom.xml b/tcl/tests/org.eclipse.dltk.tcl.core.tests/pom.xml
new file mode 100644
index 0000000..3a5f12f
--- /dev/null
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>core</artifactId>
+    <groupId>org.eclipse.dltk.tcl</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.tcl</groupId>
+  <artifactId>org.eclipse.dltk.tcl.core.tests</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+  <build>
+	  <plugins>
+		  <plugin>
+			  <groupId>org.eclipse.tycho</groupId>
+			  <artifactId>tycho-surefire-plugin</artifactId>
+			  <version>${tycho-version}</version>
+			  <configuration>
+				  <testSuite>org.eclipse.dltk.tcl.core.tests</testSuite>
+				  <testClass>org.eclipse.dltk.tcl.core.tests.AllTests</testClass>
+				  <dependencies>
+					  <dependency>
+						  <type>p2-installable-unit</type>
+						  <artifactId>org.eclipse.platform.feature.group</artifactId>
+					  </dependency>
+				  </dependencies>
+			  </configuration>
+		  </plugin>
+	  </plugins>
+  </build>
+</project>
diff --git a/tcl/tests/pom.xml b/tcl/tests/pom.xml
new file mode 100644
index 0000000..a67b1b3
--- /dev/null
+++ b/tcl/tests/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>tcl</artifactId>
+		<groupId>org.eclipse.dltk.tcl</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../</relativePath>
+	</parent>
+	<groupId>org.eclipse.dltk.tcl</groupId>
+	<artifactId>tcl.tests</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.eclipse.dltk.tcl.core.tests</module>
+		<module>org.eclipse.dltk.tcl.formatter.tests</module>
+	</modules>
+</project>
diff --git a/tcl/update.site/assembly.xml b/tcl/update.site/assembly.xml
new file mode 100644
index 0000000..0c39b76
--- /dev/null
+++ b/tcl/update.site/assembly.xml
@@ -0,0 +1,13 @@
+<assembly>
+  <id>tcl</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/tcl/update.site/pom.xml b/tcl/update.site/pom.xml
index 8e1d336..beca471 100644
--- a/tcl/update.site/pom.xml
+++ b/tcl/update.site/pom.xml
@@ -12,4 +12,28 @@
 	<artifactId>org.eclipse.dltk.tcl-updatesite</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-update-site</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+					<finalName>dltk</finalName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/xotcl/update.site/assembly.xml b/xotcl/update.site/assembly.xml
new file mode 100644
index 0000000..6d04113
--- /dev/null
+++ b/xotcl/update.site/assembly.xml
@@ -0,0 +1,13 @@
+<assembly>
+  <id>xotcl</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/xotcl/update.site/pom.xml b/xotcl/update.site/pom.xml
index 1747a87..7ab9eb1 100644
--- a/xotcl/update.site/pom.xml
+++ b/xotcl/update.site/pom.xml
@@ -12,4 +12,28 @@
 	<artifactId>org.eclipse.dltk.xotcl-updatesite</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-update-site</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+					<finalName>dltk</finalName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>