diff --git a/api/pom.xml b/api/pom.xml
index 07956b0..b5633ef 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -32,4 +32,29 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/api</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api</url>
   </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+                <include>OSGI-INF/*</include>
+            </includes>
+        </resource>
+    </resources>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+    </plugins>
+  </build>
 </project>
diff --git a/api/src/org/apache/sling/ide/transport/ResourceProxy.java b/api/src/org/apache/sling/ide/transport/ResourceProxy.java
index 00f8a2c..938aa9c 100644
--- a/api/src/org/apache/sling/ide/transport/ResourceProxy.java
+++ b/api/src/org/apache/sling/ide/transport/ResourceProxy.java
@@ -21,6 +21,24 @@
 import java.util.List;
 import java.util.Map;
 
+/**
+ * The <tt>ResourceProxy</tt> is a representation of a resource as found in the local workspace
+ * 
+ * <p>
+ * The resource usually has properties, as returned from <tt>{@link #getProperties()}</tt>. If no properties are found,
+ * it means that the resource is only a reference and not that it is an empty resource.
+ * </p>
+ * 
+ * <p>
+ * The resource only has information about the first row of children, as returned by {@link #getChildren()}. It does not
+ * necessarily know about second-level children.
+ * </p>
+ * 
+ * <p>
+ * By exception, if the child is <tt>covered</tt>, then all information about that child and its descendants is known.
+ * </p>
+ *
+ */
 public class ResourceProxy {
 
     private final String path;
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index ed10075..c3fe806 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -35,9 +35,29 @@
     </scm>
 
     <build>
+        <!-- ensure that extra files are picked up by the maven-source-plugin -->
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>build.properties</include>
+                    <include>META-INF/*</include>
+                    <include>OSGI-INF/*</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>        
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>2.8</version>
                 <executions>
diff --git a/assembly.xml b/assembly.xml
deleted file mode 100644
index 730a307..0000000
--- a/assembly.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>src</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/*.jar</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/eclipse-core/pom.xml b/eclipse-core/pom.xml
index 74bb31b..7591764 100644
--- a/eclipse-core/pom.xml
+++ b/eclipse-core/pom.xml
@@ -32,4 +32,30 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-core</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core</url>
   </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>.options</include>
+                <include>plugin.xml</include>
+                <include>META-INF/*</include>
+            </includes>
+        </resource>
+    </resources>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+    </plugins>
+  </build>  
 </project>
diff --git a/eclipse-m2e-test/pom.xml b/eclipse-m2e-test/pom.xml
index 53b7be8..34525b9 100644
--- a/eclipse-m2e-test/pom.xml
+++ b/eclipse-m2e-test/pom.xml
@@ -32,4 +32,28 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-m2e-test</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-test</url>
   </scm>
+
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+            </includes>
+        </resource>
+    </resources>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+    </plugins>
+  </build>  
 </project>
diff --git a/eclipse-m2e-ui/pom.xml b/eclipse-m2e-ui/pom.xml
index 91991a6..466842b 100644
--- a/eclipse-m2e-ui/pom.xml
+++ b/eclipse-m2e-ui/pom.xml
@@ -33,14 +33,30 @@
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui</url>
   </scm>
 
-<build>
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
     <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+                <include>.options</include>
+                <include>icons/*</include>
+                <include>lifecycle-mapping-metadata.xml</include>
+            </includes>
+        </resource>
     </resources>
-</build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+    </plugins>
+  </build>
 </project>
diff --git a/eclipse-ui/pom.xml b/eclipse-ui/pom.xml
index 710f035..1426832 100644
--- a/eclipse-ui/pom.xml
+++ b/eclipse-ui/pom.xml
@@ -33,19 +33,32 @@
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui</url>
   </scm>
 
-  <build>
+    <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
     <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+                <include>OSGI-INF/*</include>
+                <include>icons/*</include>
+                <include>.options</include>
+            </includes>
+        </resource>
     </resources>
-
     <plugins>
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
             <configuration>
                 <artifactItems>
diff --git a/feature/pom.xml b/feature/pom.xml
index 9a34d2e..f8579a8 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -32,4 +32,18 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/feature</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/feature</url>
   </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+                <include>feature.xml</include>
+            </includes>
+        </resource>
+    </resources>
+  </build>  
 </project>
diff --git a/impl-resource/pom.xml b/impl-resource/pom.xml
index 24bf426..01dc4f0 100644
--- a/impl-resource/pom.xml
+++ b/impl-resource/pom.xml
@@ -32,4 +32,29 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/impl-resource</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource</url>
   </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+                <include>OSGI-INF/*</include>
+            </includes>
+        </resource>
+    </resources>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+    </plugins>
+  </build>  
 </project>
diff --git a/impl-vlt/pom.xml b/impl-vlt/pom.xml
index 0452c9e..de80183 100644
--- a/impl-vlt/pom.xml
+++ b/impl-vlt/pom.xml
@@ -32,4 +32,30 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/impl-vlt</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt</url>
   </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+                <include>OSGI-INF/*</include>
+                <include>.options</include>
+            </includes>
+        </resource>
+    </resources>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
+    </plugins>
+  </build>  
 </project>
diff --git a/m2e-feature/pom.xml b/m2e-feature/pom.xml
index 87b8bec..b45c45b 100644
--- a/m2e-feature/pom.xml
+++ b/m2e-feature/pom.xml
@@ -32,4 +32,18 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/m2e-feature</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/m2e-feature</url>
   </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+                <include>feature.xml</include>
+            </includes>
+        </resource>
+    </resources>
+  </build>  
 </project>
diff --git a/p2update/pom.xml b/p2update/pom.xml
index c77c80e..699f5ff 100644
--- a/p2update/pom.xml
+++ b/p2update/pom.xml
@@ -34,6 +34,16 @@
   </scm>
 
   <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>category.xml</include>
+                <include>siteTemplate/*</include>
+            </includes>
+        </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.jboss.tools.tycho-plugins</groupId>
diff --git a/pom.xml b/pom.xml
index bcfc86d..c238e05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,6 @@
 		<module>impl-vlt-test</module>
 		<module>eclipse-core</module>
 		<module>eclipse-ui</module>
-		<module>eclipse-test</module>
 		<module>feature</module>
 		<module>eclipse-m2e-ui</module>
 		<module>eclipse-m2e-test</module>
@@ -117,6 +116,9 @@
                         
                         <!-- test data -->
                         <exclude>**/*.binary</exclude>
+                        
+                        <!-- prevent failures when eclipse-test is not activated as a submodule -->
+                        <exclude>eclipse-test/**</exclude>
                     </excludes>
                 </configuration>
                 <executions>
@@ -128,14 +130,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-packaging-plugin</artifactId>
-                <version>${tycho.version}</version>
-                <configuration>
-                    <format>'RELEASE'</format>
-                </configuration>
-            </plugin>
 		</plugins>
         <pluginManagement>
             <plugins>
@@ -222,83 +216,51 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <configuration>
+                            <passphrase>${gpg.passphrase}</passphrase>
+                            <useAgent>${gpg.useagent}</useAgent>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.eclipse.tycho</groupId>
+                        <artifactId>tycho-surefire-plugin</artifactId>
+                        <version>${tycho.version}</version>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
-        <!-- adapted from https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/pom.xml -->
         <profile>
-            <id>source-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <configuration>
-                            <finalName>sling-ide-tooling-${project.version}</finalName>
-                            <descriptors>
-                                <descriptor>assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </plugin>
-                    <!-- JCR-2455: Automatic staging of non-Maven release artifacts -->
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <configuration>
-                            <target>
-                                <checksum file="${basedir}/target/sling-ide-tooling-${project.version}-src.zip" algorithm="MD5" fileext=".md5"/>
-                                <checksum file="${basedir}/target/sling-ide-tooling-${project.version}-src.zip" algorithm="SHA1" fileext=".sha"/>
-                                <checksum file="${basedir}/target/sling-ide-tooling-${project.version}-src.zip" algorithm="SHA1" property="checksum" />
-                                <echo file="${basedir}/target/vote.txt">
-From: ${username}@apache.org
-To: dev@sling.apache.org
-Subject: [VOTE] Release Apache Sling IDE Tooling ${project.version}
-
-Hi,
-
-We solved ${jira.fixedIssues} issues in this release:
-https://issues.apache.org/jira/browse/SLING/fixforversion/${jira.fixVersion}
-
-There are still some outstanding issues:
-https://issues.apache.org/jira/browse/SLING/component/12320908
-
-The release candidate has been uploaded at https://dist.apache.org/repos/dist/dev/sling,
-and can be built using
-
-    mvn clean package
-    
-The resulting binaries can be installed into an Eclipse instance by installing from the update site which
-is found at p2update/target/repository after building the project. 
-
-Please vote to approve this release:
-
-  [ ] +1 Approve the release
-  [ ]  0 Don't care
-  [ ] -1 Don't release, because ...
-
-This majority vote is open for at least 72 hours.
-                                        </echo>
-                                        <echo />
-                                        <echo>
-The release candidate has been prepared in:
-
-${basedir}/target/
-
-A release vote template has been generated for you:
-
-file://${basedir}/target/vote.txt
-                                </echo>
-                                <echo />
-                            </target>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.ant</groupId>
-                                <artifactId>ant-nodeps</artifactId>
-                                <version>1.8.1</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
+            <id>eclipse-test</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>eclipse-test</module>
+            </modules>
         </profile>
     </profiles>
 </project>
diff --git a/target-definition/pom.xml b/target-definition/pom.xml
index d6fa41a..81ad482 100644
--- a/target-definition/pom.xml
+++ b/target-definition/pom.xml
@@ -33,4 +33,16 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/target-definition</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/target-definition</url>
   </scm>
+  
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>*.target</include>
+            </includes>
+        </resource>
+    </resources>
+  </build>  
 </project>
diff --git a/vlt-wrapper/pom.xml b/vlt-wrapper/pom.xml
index 0a1ae2d..075a8ab 100644
--- a/vlt-wrapper/pom.xml
+++ b/vlt-wrapper/pom.xml
@@ -32,9 +32,27 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/vlt-wrapper</developerConnection>
     <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper</url>
   </scm>
-
-    <build>
-        <plugins>
+  <build>
+    <!-- ensure that extra files are picked up by the maven-source-plugin -->
+    <resources>
+        <resource>
+            <directory>.</directory>
+            <includes>
+                <include>build.properties</include>
+                <include>META-INF/*</include>
+            </includes>
+        </resource>
+    </resources>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+                <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive>
+            </configuration>
+        </plugin>        
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>