Index: hibernatetools/plugins/org.hibernate.eclipse.mapper/build.properties
===================================================================
--- hibernatetools/plugins/org.hibernate.eclipse.mapper/build.properties	(révision 38493)
+++ hibernatetools/plugins/org.hibernate.eclipse.mapper/build.properties	(copie de travail)
@@ -4,9 +4,7 @@
                org.hibernate.eclipse.mapper.jar,\
                icons/,\
                META-INF/,\
-               dtds/,\
                about.html,\
                plugin.properties
 src.includes = src/,\
-               icons/,\
-               dtds/
+               icons/
Index: hibernatetools/tests/org.hibernate.eclipse.console.test/build.properties
===================================================================
--- hibernatetools/tests/org.hibernate.eclipse.console.test/build.properties	(révision 38493)
+++ hibernatetools/tests/org.hibernate.eclipse.console.test/build.properties	(copie de travail)
@@ -1,5 +1,4 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
+bin.includes = META-INF/,\
                lib/hibernate-tools-tests.jar,\
                lib/hsqldb.jar,\
                lib/jaxen-1.1-beta-7.jar,\
@@ -21,11 +20,9 @@
 src.includes = about.html,\
                src/,\
                res/,\
-               plugin.xml,\
                lib/,\
                hibernate-build.xml,\
                build.properties,\
-               build/,\
                META-INF/,\
                .settings/,\
                .project,\
Index: vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml
===================================================================
--- vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml	(révision 38493)
+++ vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml	(copie de travail)
@@ -10,4 +10,31 @@
 	<artifactId>org.jboss.tools.vpe.xulrunner</artifactId> 
 	
 	<packaging>eclipse-plugin</packaging>
+
+	<!--
+	ISSUE: our platform-specific optional/greedy deps are not resolved by Tycho/p2
+	WORKAROUND: Ignore optional dependencies => NOT WORKING
+	TODO: Find out why p2 can't resolve that stuff
+	-->
+	<build>
+		<plugins>
+			       <plugin>
+         <groupId>org.eclipse.tycho</groupId>
+         <artifactId>target-platform-configuration</artifactId>
+         <version>${tychoVersion}</version>
+         <configuration>
+           <dependency-resolution>
+             <optionalDependencies>ignore</optionalDependencies>
+           </dependency-resolution>
+         </configuration>
+       </plugin><plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<version>${tychoVersion}</version>
+				<configuration>
+					<optionalDependencies>ignore</optionalDependencies>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
Index: vpe/plugins/org.jboss.tools.xulrunner/build.properties
===================================================================
--- vpe/plugins/org.jboss.tools.xulrunner/build.properties	(révision 38493)
+++ vpe/plugins/org.jboss.tools.xulrunner/build.properties	(copie de travail)
@@ -3,7 +3,6 @@
                about.mappings,\
                about.ini,\
                about.html,\
-               jboss_about.png,\
                plugin.properties
 jars.compile.order = .
 source.. = src/
Index: vpe/plugins/org.jboss.tools.vpe.browsersim/build.properties
===================================================================
--- vpe/plugins/org.jboss.tools.vpe.browsersim/build.properties	(révision 38493)
+++ vpe/plugins/org.jboss.tools.vpe.browsersim/build.properties	(copie de travail)
@@ -1,5 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.xml
+               .
Index: archives/features/org.jboss.ide.eclipse.archives.source.feature/pom.xml
===================================================================
--- archives/features/org.jboss.ide.eclipse.archives.source.feature/pom.xml	(révision 38493)
+++ archives/features/org.jboss.ide.eclipse.archives.source.feature/pom.xml	(copie de travail)
@@ -10,4 +10,6 @@
 	<groupId>org.jboss.ide.eclipse.archives.features</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.source.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	
 </project>
Index: archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml
===================================================================
--- archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml	(révision 38493)
+++ archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml	(copie de travail)
@@ -9,4 +9,37 @@
 	<groupId>org.jboss.tools.archives.features</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.feature</artifactId> 
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
 </project>
Index: usage/tests/org.jboss.tools.usage.test/build.properties
===================================================================
--- usage/tests/org.jboss.tools.usage.test/build.properties	(révision 38493)
+++ usage/tests/org.jboss.tools.usage.test/build.properties	(copie de travail)
@@ -3,17 +3,7 @@
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               bin/,\
-               OSGI-INF/l10n/bundle.properties
-src.includes = EclipseEnvironmentTest.launch,\
-               FocusPointTest.launch,\
-               GoogleAnalyticsUrlStrategyTest.launch,\
-               JBossToolsUsageRequestsTest.launch,\
-               about.html,\
+               OSGI-INF
+src.includes = about.html,\
                src/,\
-               GlobalUsageReportingSettingsTest.launch,\
-               JBossToolsUsageIntegrationTest.launch,\
-               UsageTestSuite.launch,\
-               pom.xml,\
-               JBossToolsComponentsTest.launch,\
-               ReportingEclipseEnvironmentTest.launch
+               pom.xml
Index: common/plugins/org.jboss.tools.common.verification.ui/build.properties
===================================================================
--- common/plugins/org.jboss.tools.common.verification.ui/build.properties	(révision 38493)
+++ common/plugins/org.jboss.tools.common.verification.ui/build.properties	(copie de travail)
@@ -2,7 +2,6 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                images/,\
-               extensions.xml,\
                about.html,\
                META-INF/,\
                .
Index: common/plugins/org.jboss.tools.common/build.properties
===================================================================
--- common/plugins/org.jboss.tools.common/build.properties	(révision 38493)
+++ common/plugins/org.jboss.tools.common/build.properties	(copie de travail)
@@ -1,9 +1,5 @@
 source.. = src
 bin.includes = plugin.xml,\
-               schemas/,\
-               xsds/,\
-               lib/,\
-               dtds/,\
                META-INF/,\
                .,\
                plugin.properties,\
Index: common/tests/org.jboss.tools.common.el.core.test/build.properties
===================================================================
--- common/tests/org.jboss.tools.common.el.core.test/build.properties	(révision 38493)
+++ common/tests/org.jboss.tools.common.el.core.test/build.properties	(copie de travail)
@@ -9,7 +9,6 @@
                build.properties,\
                info.xml,\
                plugin.xml,\
-               src/,\
-               test.xml
+               src/
 source.. = src/
 jars.compile.order = 
Index: common/tests/org.jboss.tools.common.model.test/build.properties
===================================================================
--- common/tests/org.jboss.tools.common.model.test/build.properties	(révision 38493)
+++ common/tests/org.jboss.tools.common.model.test/build.properties	(copie de travail)
@@ -1,5 +1,4 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
+bin.includes = META-INF/,\
                .,\
                info.xml,\
                projects/,\
Index: common/tests/org.jboss.tools.common.verification.test/build.properties
===================================================================
--- common/tests/org.jboss.tools.common.verification.test/build.properties	(révision 38493)
+++ common/tests/org.jboss.tools.common.verification.test/build.properties	(copie de travail)
@@ -6,6 +6,5 @@
 src.includes = META-INF/,\
                build.properties,\
                plugin.xml,\
-               src/,\
-               test.xml
+               src/
 source.. = src/
Index: common/site/site.xml
===================================================================
--- common/site/site.xml	(révision 38493)
+++ common/site/site.xml	(copie de travail)
@@ -8,7 +8,7 @@
 	<feature url="features/org.jboss.tools.common.all.feature_0.0.0.jar" id="org.jboss.tools.common.all.feature" version="0.0.0">
 		<category name="JBoss Tools common Nightly Build Update Site"/>
 	</feature>
-	<feature url="features/org.jboss.tools.common.all.source.feature_0.0.0.jar" id="org.jboss.tools.common.all.source.feature" version="0.0.0">
+	<feature url="features/org.jboss.tools.common.all.feature.source_0.0.0.jar" id="org.jboss.tools.common.all.feature.source" version="0.0.0">
 		<category name="JBoss Tools common Nightly Build Update Site"/>
 	</feature>
 
@@ -31,21 +31,21 @@
 	<feature url="features/org.jboss.tools.common.jdt.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.feature" version="0.0.0">
 		<category name="JBoss Tools common Nightly Build Update Site"/>
 	</feature>
-	<feature url="features/org.jboss.tools.common.jdt.source.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.source.feature" version="0.0.0">
+	<feature url="features/org.jboss.tools.common.jdt.feature.source_0.0.0.jar" id="org.jboss.tools.common.jdt.feature.source" version="0.0.0">
 		<category name="JBoss Tools common Nightly Build Update Site"/>
 	</feature>
 
 	<feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
 		<category name="JBoss Tools common Nightly Build Update Site"/>
 	</feature>
-	<feature url="features/org.jboss.tools.common.mylyn.source.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.source.feature" version="0.0.0">
+	<feature url="features/org.jboss.tools.common.mylyn.feature.source_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature.source" version="0.0.0">
 		<category name="JBoss Tools common Nightly Build Update Site"/>
 	</feature>
 
 	<feature url="features/org.jboss.tools.common.all.test.feature_0.0.0.jar" id="org.jboss.tools.common.all.test.feature" version="0.0.0">
 		<category name="JBoss Tools common Nightly Build Update Site"/>
 	</feature>
-	<feature url="features/org.jboss.tools.common.all.test.source.feature_0.0.0.jar" id="org.jboss.tools.common.all.test.source.feature" version="0.0.0">
+	<feature url="features/org.jboss.tools.common.all.test.feature.source_0.0.0.jar" id="org.jboss.tools.common.all.test.feature.source" version="0.0.0">
 		<category name="JBoss Tools common Nightly Build Update Site"/>
 	</feature>
 
Index: common/features/org.jboss.tools.common.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.feature/pom.xml	(copie de travail)
@@ -10,4 +10,38 @@
 	<artifactId>org.jboss.tools.common.feature</artifactId> 
 	
 	<packaging>eclipse-feature</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: common/features/pom.xml
===================================================================
--- common/features/pom.xml	(révision 38493)
+++ common/features/pom.xml	(copie de travail)
@@ -13,18 +13,15 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.tools.common.all.feature</module>
-		<module>org.jboss.tools.common.all.source.feature</module>
 		<module>org.jboss.tools.common.all.test.feature</module>
-		<module>org.jboss.tools.common.all.test.source.feature</module>
 		<module>org.jboss.tools.common.core.feature</module>
 		<module>org.jboss.tools.common.feature</module>
 		<module>org.jboss.tools.common.text.ext.feature</module>
 		<module>org.jboss.tools.common.ui.feature</module>
 		<module>org.jboss.tools.common.verification.feature</module>
 		<module>org.jboss.tools.common.jdt.feature</module>
-		<module>org.jboss.tools.common.jdt.source.feature</module>
 		<module>org.jboss.tools.common.mylyn.feature</module>
-		<module>org.jboss.tools.common.mylyn.source.feature</module>
 	</modules>
+	
 </project>
 	
Index: common/features/org.jboss.tools.common.all.source.feature/.project
===================================================================
--- common/features/org.jboss.tools.common.all.source.feature/.project	(révision 38493)
+++ common/features/org.jboss.tools.common.all.source.feature/.project	(copie de travail)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.jboss.tools.common.all.source.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
Index: common/features/org.jboss.tools.common.all.source.feature/license.html
===================================================================
--- common/features/org.jboss.tools.common.all.source.feature/license.html	(révision 38493)
+++ common/features/org.jboss.tools.common.all.source.feature/license.html	(copie de travail)
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<body>
-<p>Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
-</p>
-</body>
-</html>
\ No newline at end of file
Index: common/features/org.jboss.tools.common.all.source.feature/feature.properties
===================================================================
--- common/features/org.jboss.tools.common.all.source.feature/feature.properties	(révision 38493)
+++ common/features/org.jboss.tools.common.all.source.feature/feature.properties	(copie de travail)
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2010-2012 Red Hat, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     JBoss by Red Hat - Initial implementation.
-##############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JBoss Tools Commons source
-featureProvider=JBoss by Red Hat
-
-# "updateSiteName" property - label for the update site
-updateSiteName=JBossTools Update Site
-
-# "description" property - description of the feature
-description=Common functionality on which other plugins and features depend
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# START NON-TRANSLATABLE
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=Red Hat, Inc. licenses these features and plugins to you under \
-certain open source licenses (or aggregations of such licenses), which \
-in a particular case may include the Eclipse Public License, the GNU \
-Lesser General Public License, and/or certain other open source \
-licenses. For precise licensing details, consult the corresponding \
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
-Raleigh NC 27606 USA.
-copyright=JBoss, Home of Professional Open Source \
-Copyright (c) 2006-2012 Red Hat, Inc., and individual contributors as indicated \
-by the @authors tag. See the copyright.txt in the distribution \
-for a full listing of individual contributors.
-# END NON-TRANSLATABLE
-########### end of license property ##########################################
Index: common/features/org.jboss.tools.common.all.source.feature/build.properties
===================================================================
--- common/features/org.jboss.tools.common.all.source.feature/build.properties	(révision 38493)
+++ common/features/org.jboss.tools.common.all.source.feature/build.properties	(copie de travail)
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html
Index: common/features/org.jboss.tools.common.all.source.feature/feature.xml
===================================================================
--- common/features/org.jboss.tools.common.all.source.feature/feature.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.all.source.feature/feature.xml	(copie de travail)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.common.all.source.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider">
-
-	<description>%description</description>
-	<copyright>%copyright</copyright>
-	<license url="%licenseURL">%license</license>
-
-	<plugin id="org.jboss.tools.common.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.model.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.projecttemplates.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.el.core.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.el.ui.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.validation.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.resref.core.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.resref.ui.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.text.ext.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.text.xml.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.gef.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.ui.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.model.ui.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.model.ui.capabilities.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.verification.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.verification.ui.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.meta.ui.source" download-size="0" install-size="0" version="0.0.0" />
-</feature>
Index: common/features/org.jboss.tools.common.all.source.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.all.source.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.all.source.feature/pom.xml	(copie de travail)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.jboss.tools.common</groupId>
-		<artifactId>features</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools.common.features</groupId>
-	<artifactId>org.jboss.tools.common.all.source.feature</artifactId> 
-	<packaging>eclipse-feature</packaging>
-</project>
Index: common/features/org.jboss.tools.common.mylyn.source.feature/license.html
===================================================================
--- common/features/org.jboss.tools.common.mylyn.source.feature/license.html	(révision 38493)
+++ common/features/org.jboss.tools.common.mylyn.source.feature/license.html	(copie de travail)
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<body>
-<p>Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
-</p>
-</body>
-</html>
\ No newline at end of file
Index: common/features/org.jboss.tools.common.mylyn.source.feature/feature.properties
===================================================================
--- common/features/org.jboss.tools.common.mylyn.source.feature/feature.properties	(révision 38493)
+++ common/features/org.jboss.tools.common.mylyn.source.feature/feature.properties	(copie de travail)
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2011-2012 Red Hat, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     JBoss by Red Hat - Initial implementation.
-##############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JBoss Tools Common - Mylyn source
-featureProvider=JBoss by Red Hat
-
-# "updateSiteName" property - label for the update site
-updateSiteName=JBossTools Update Site
-
-# "description" property - description of the feature
-description=JBoss Tools Common - Mylyn plugins
-
-copyright=JBoss, Home of Professional Open Source\n\
-Copyright (c) Red Hat, Inc., and individual contributors as indicated\n\
-by the @authors tag, 2011-2012. See the copyright.txt in the distribution\n\
-for a full listing of individual contributors.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# START NON-TRANSLATABLE
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=Red Hat, Inc. licenses these features and plugins to you under \
-certain open source licenses (or aggregations of such licenses), which \
-in a particular case may include the Eclipse Public License, the GNU \
-Lesser General Public License, and/or certain other open source \
-licenses. For precise licensing details, consult the corresponding \
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
-Raleigh NC 27606 USA.
-# END NON-TRANSLATABLE
-########### end of license property ##########################################
Index: common/features/org.jboss.tools.common.mylyn.source.feature/build.properties
===================================================================
--- common/features/org.jboss.tools.common.mylyn.source.feature/build.properties	(révision 38493)
+++ common/features/org.jboss.tools.common.mylyn.source.feature/build.properties	(copie de travail)
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html
Index: common/features/org.jboss.tools.common.mylyn.source.feature/feature.xml
===================================================================
--- common/features/org.jboss.tools.common.mylyn.source.feature/feature.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.mylyn.source.feature/feature.xml	(copie de travail)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.common.mylyn.source.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider">
-
-	<description>%description</description>
-	<copyright>%copyright</copyright>
-	<license url="%licenseURL">%license</license>
-
-	<plugin id="org.jboss.tools.common.mylyn.source" download-size="0" install-size="0" version="0.0.0" />
-</feature>
Index: common/features/org.jboss.tools.common.mylyn.source.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.mylyn.source.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.mylyn.source.feature/pom.xml	(copie de travail)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.jboss.tools.common</groupId>
-		<artifactId>features</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools.common.features</groupId>
-	<artifactId>org.jboss.tools.common.mylyn.source.feature</artifactId> 
-	<packaging>eclipse-feature</packaging>
-</project>
Index: common/features/org.jboss.tools.common.all.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.all.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.all.feature/pom.xml	(copie de travail)
@@ -9,4 +9,38 @@
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.all.feature</artifactId> 
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: common/features/org.jboss.tools.common.mylyn.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.mylyn.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.mylyn.feature/pom.xml	(copie de travail)
@@ -10,4 +10,38 @@
 	<artifactId>org.jboss.tools.common.mylyn.feature</artifactId> 
 	
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: common/features/org.jboss.tools.common.ui.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.ui.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.ui.feature/pom.xml	(copie de travail)
@@ -10,4 +10,38 @@
 	<artifactId>org.jboss.tools.common.ui.feature</artifactId> 
 	
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: common/features/org.jboss.tools.common.jdt.source.feature/.project
===================================================================
--- common/features/org.jboss.tools.common.jdt.source.feature/.project	(révision 38493)
+++ common/features/org.jboss.tools.common.jdt.source.feature/.project	(copie de travail)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.jboss.tools.common.jdt.source.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
Index: common/features/org.jboss.tools.common.jdt.source.feature/license.html
===================================================================
--- common/features/org.jboss.tools.common.jdt.source.feature/license.html	(révision 38493)
+++ common/features/org.jboss.tools.common.jdt.source.feature/license.html	(copie de travail)
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<body>
-<p>Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
-</p>
-</body>
-</html>
\ No newline at end of file
Index: common/features/org.jboss.tools.common.jdt.source.feature/feature.properties
===================================================================
--- common/features/org.jboss.tools.common.jdt.source.feature/feature.properties	(révision 38493)
+++ common/features/org.jboss.tools.common.jdt.source.feature/feature.properties	(copie de travail)
@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2011-2012 Red Hat, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     JBoss by Red Hat - Initial implementation.
-##############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JBoss Tools JDT Extensions source 
-featureProvider=JBoss by Red Hat
-
-# "updateSiteName" property - label for the update site
-updateSiteName=JBossTools Update Site
-
-# "description" property - description of the feature
-description=Extensions for Eclipse JDT tooling, provides features such as easily connecting the debugger to remote Java application.
-gets incrementally updated allowing for fluent deployment for any type of Eclipse project.
-
-copyright=JBoss, Home of Professional Open Source\n\
-Copyright (c) Red Hat, Inc., and individual contributors as indicated\n\
-by the @authors tag, 2011-2012. See the copyright.txt in the distribution\n\
-for a full listing of individual contributors.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# START NON-TRANSLATABLE
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=Red Hat, Inc. licenses these features and plugins to you under \
-certain open source licenses (or aggregations of such licenses), which \
-in a particular case may include the Eclipse Public License, the GNU \
-Lesser General Public License, and/or certain other open source \
-licenses. For precise licensing details, consult the corresponding \
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
-Raleigh NC 27606 USA.
-# END NON-TRANSLATABLE
-########### end of license property ##########################################
Index: common/features/org.jboss.tools.common.jdt.source.feature/build.properties
===================================================================
--- common/features/org.jboss.tools.common.jdt.source.feature/build.properties	(révision 38493)
+++ common/features/org.jboss.tools.common.jdt.source.feature/build.properties	(copie de travail)
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html
Index: common/features/org.jboss.tools.common.jdt.source.feature/feature.xml
===================================================================
--- common/features/org.jboss.tools.common.jdt.source.feature/feature.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.jdt.source.feature/feature.xml	(copie de travail)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.common.jdt.source.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider">
-
-	<description>%description</description>
-	<copyright>%copyright</copyright>
-	<license url="%licenseURL">%license</license>
-
-	<plugin id="org.jboss.tools.common.jdt.debug.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
-	<plugin id="org.jboss.tools.common.jdt.debug.ui.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
-	<plugin id="org.jboss.tools.common.jdt.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
-	<plugin id="org.jboss.tools.common.jdt.ui.source" download-size="0" install-size="0" version="0.0.0" unpack="false" />
-</feature>
Index: common/features/org.jboss.tools.common.jdt.source.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.jdt.source.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.jdt.source.feature/pom.xml	(copie de travail)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.jboss.tools.common</groupId>
-		<artifactId>features</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools.common.features</groupId>
-	<artifactId>org.jboss.tools.common.jdt.source.feature</artifactId> 
-	<packaging>eclipse-feature</packaging>
-</project>
Index: common/features/org.jboss.tools.common.jdt.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.jdt.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.jdt.feature/pom.xml	(copie de travail)
@@ -10,4 +10,38 @@
 	<artifactId>org.jboss.tools.common.jdt.feature</artifactId> 
 	
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: common/features/org.jboss.tools.common.verification.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.verification.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.verification.feature/pom.xml	(copie de travail)
@@ -10,4 +10,38 @@
 	<artifactId>org.jboss.tools.common.verification.feature</artifactId> 
 	
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: common/features/org.jboss.tools.common.text.ext.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.text.ext.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.text.ext.feature/pom.xml	(copie de travail)
@@ -10,4 +10,38 @@
 	<artifactId>org.jboss.tools.common.text.ext.feature</artifactId> 
 	
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: common/features/org.jboss.tools.common.all.test.source.feature/.project
===================================================================
--- common/features/org.jboss.tools.common.all.test.source.feature/.project	(révision 38493)
+++ common/features/org.jboss.tools.common.all.test.source.feature/.project	(copie de travail)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.jboss.tools.common.all.test.source.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
Index: common/features/org.jboss.tools.common.all.test.source.feature/license.html
===================================================================
--- common/features/org.jboss.tools.common.all.test.source.feature/license.html	(révision 38493)
+++ common/features/org.jboss.tools.common.all.test.source.feature/license.html	(copie de travail)
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<body>
-<p>Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
-</p>
-</body>
-</html>
\ No newline at end of file
Index: common/features/org.jboss.tools.common.all.test.source.feature/feature.properties
===================================================================
--- common/features/org.jboss.tools.common.all.test.source.feature/feature.properties	(révision 38493)
+++ common/features/org.jboss.tools.common.all.test.source.feature/feature.properties	(copie de travail)
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2010-2012 Red Hat, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     JBoss by Red Hat - Initial implementation.
-##############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JBoss Tools - Tests - Commons source
-featureProvider=JBoss by Red Hat
-
-# "updateSiteName" property - label for the update site
-updateSiteName=JBossTools Update Site
-
-# "description" property - description of the feature
-description=Tests for Common functionality on which other plugins and features depend
-
-copyright=JBoss, Home of Professional Open Source\n\
-Copyright (c) Red Hat, Inc., and individual contributors as indicated\n\
-by the @authors tag, 2006-2012. See the copyright.txt in the distribution\n\
-for a full listing of individual contributors.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# START NON-TRANSLATABLE
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=Red Hat, Inc. licenses these features and plugins to you under \
-certain open source licenses (or aggregations of such licenses), which \
-in a particular case may include the Eclipse Public License, the GNU \
-Lesser General Public License, and/or certain other open source \
-licenses. For precise licensing details, consult the corresponding \
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
-Raleigh NC 27606 USA.
-# END NON-TRANSLATABLE
-########### end of license property ##########################################
Index: common/features/org.jboss.tools.common.all.test.source.feature/build.properties
===================================================================
--- common/features/org.jboss.tools.common.all.test.source.feature/build.properties	(révision 38493)
+++ common/features/org.jboss.tools.common.all.test.source.feature/build.properties	(copie de travail)
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html
Index: common/features/org.jboss.tools.common.all.test.source.feature/feature.xml
===================================================================
--- common/features/org.jboss.tools.common.all.test.source.feature/feature.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.all.test.source.feature/feature.xml	(copie de travail)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.common.all.test.source.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider">
-
-	<description>%description</description>
-	<copyright>%copyright</copyright>
-	<license url="%licenseURL">%license</license>
-
-	<plugin id="org.jboss.tools.tests.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.el.core.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.model.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.model.ui.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.base.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.validation.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.verification.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.verification.ui.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.ui.test.source" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.common.mylyn.test.source" download-size="0" install-size="0" version="0.0.0" />
-</feature>
Index: common/features/org.jboss.tools.common.all.test.source.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.all.test.source.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.all.test.source.feature/pom.xml	(copie de travail)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.jboss.tools.common</groupId>
-		<artifactId>features</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools.common.features</groupId>
-	<artifactId>org.jboss.tools.common.all.test.source.feature</artifactId> 
-	<packaging>eclipse-feature</packaging>
-</project>
Index: common/features/org.jboss.tools.common.all.test.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.all.test.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.all.test.feature/pom.xml	(copie de travail)
@@ -10,4 +10,38 @@
 	<artifactId>org.jboss.tools.common.all.test.feature</artifactId> 
 	
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: common/features/org.jboss.tools.common.core.feature/pom.xml
===================================================================
--- common/features/org.jboss.tools.common.core.feature/pom.xml	(révision 38493)
+++ common/features/org.jboss.tools.common.core.feature/pom.xml	(copie de travail)
@@ -10,4 +10,38 @@
 	<artifactId>org.jboss.tools.common.core.feature</artifactId> 
 	
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho.extras</groupId>
+		        <artifactId>tycho-source-feature-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>source-feature</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>source-feature</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		      <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-p2-plugin</artifactId>
+		        <version>${tychoVersion}</version>
+		        <executions>
+		          <execution>
+		            <id>attached-p2-metadata</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>p2-metadata</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+		      </plugin>
+		  </plugins>
+	</build>
+	
 </project>
Index: build/parent/pom.xml
===================================================================
--- build/parent/pom.xml	(révision 38493)
+++ build/parent/pom.xml	(copie de travail)
@@ -14,7 +14,7 @@
 	<properties>
 		<!-- to build w/ latest 0.14.0-SNAPSHOT, run `mvn install -DtychoVersion=0.14.0-SNAPSHOT`, 
 			or uncomment this property: <tychoVersion>0.14.0-SNAPSHOT</tychoVersion> -->
-		<tychoVersion>0.13.0</tychoVersion>
+		<tychoVersion>0.14.0-SNAPSHOT</tychoVersion>
 		<scmBranch>trunk</scmBranch>
 		<JBT_VERSION>3.3.0</JBT_VERSION>
 		<JBDS_VERSION>5.0.0</JBDS_VERSION>
@@ -219,13 +219,9 @@
 					<!-- <target>1.6</target> -->
 				</configuration>
 			</plugin>
+			<!-- SOURCES -->
+			<!-- bundles -->
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-source-plugin</artifactId>
-				<version>${tychoVersion}</version>
-			</plugin>
-			<!-- enable source bundle generation -->
-			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tychoVersion}</version>
Index: jst/plugins/org.jboss.tools.jst.firstrun/build.properties
===================================================================
--- jst/plugins/org.jboss.tools.jst.firstrun/build.properties	(révision 38493)
+++ jst/plugins/org.jboss.tools.jst.firstrun/build.properties	(copie de travail)
@@ -1,10 +1,8 @@
 bin.includes = META-INF/,\
-               plugin.xml,\
                .,\
                plugin.properties,\
                about.html
 src.includes = src/,\
-               plugin.xml,\
                build.properties,\
                META-INF/,\
                about.html,\
Index: jst/plugins/org.jboss.tools.jst.web/build.properties
===================================================================
--- jst/plugins/org.jboss.tools.jst.web/build.properties	(révision 38493)
+++ jst/plugins/org.jboss.tools.jst.web/build.properties	(copie de travail)
@@ -2,7 +2,6 @@
            resources/
 bin.includes = plugin.xml,\
                plugin.properties,\
-               meta/,\
                about.html,\
                META-INF/,\
                .,\
Index: jst/plugins/org.jboss.tools.jst.web.verification/build.properties
===================================================================
--- jst/plugins/org.jboss.tools.jst.web.verification/build.properties	(révision 38493)
+++ jst/plugins/org.jboss.tools.jst.web.verification/build.properties	(copie de travail)
@@ -1,5 +1,4 @@
 bin.includes = plugin.xml,\
-               *.jar,\
                plugin.properties,\
                about.html,\
                META-INF/,\
Index: jst/tests/org.jboss.tools.jst.web.ui.test/build.properties
===================================================================
--- jst/tests/org.jboss.tools.jst.web.ui.test/build.properties	(révision 38493)
+++ jst/tests/org.jboss.tools.jst.web.ui.test/build.properties	(copie de travail)
@@ -1,6 +1,5 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties,\
-               projects/
+               plugin.properties
 source.. = src/
Index: birt/plugins/org.jboss.tools.birt.oda.ui/build.properties
===================================================================
--- birt/plugins/org.jboss.tools.birt.oda.ui/build.properties	(révision 38493)
+++ birt/plugins/org.jboss.tools.birt.oda.ui/build.properties	(copie de travail)
@@ -9,5 +9,4 @@
                about.mappings,\
                about.ini,\
                about.html,\
-               rhds_wiz.png,\
                jboss_about.png
Index: birt/features/org.jboss.tools.birt.feature/build.properties
===================================================================
--- birt/features/org.jboss.tools.birt.feature/build.properties	(révision 38493)
+++ birt/features/org.jboss.tools.birt.feature/build.properties	(copie de travail)
@@ -1,4 +1,2 @@
 bin.includes = feature*.*,\
-               license.html,\
-               p2.inf
-               
\ No newline at end of file
+               license.html
Index: birt/features/org.jboss.tools.birt.feature/feature.xml
===================================================================
--- birt/features/org.jboss.tools.birt.feature/feature.xml	(révision 38493)
+++ birt/features/org.jboss.tools.birt.feature/feature.xml	(copie de travail)
@@ -14,7 +14,7 @@
    </license>
 
 	<requires>
-		<import feature="org.eclipse.birt" version="2.5.0" match="greaterOrEqual" />
+		<!--import feature="org.eclipse.birt" version="2.5.0" match="greaterOrEqual" /-->
 		<import feature="org.eclipse.birt.integration.wtp" version="2.5.0" match="greaterOrEqual" />
 		<import feature="org.eclipse.birt.chart" version="2.5.0" match="greaterOrEqual" />
 		<import feature="org.eclipse.birt.chart.integration.wtp" version="2.5.0" match="greaterOrEqual" />
