[jbosstools-commits] JBoss Tools SVN: r39526 - in trunk: birt/features/org.jboss.tools.birt.feature and 3 other directories.

[jbosstools-commits at lists.jboss.org]

Author: mickael_istria
Date: 2012-03-15 07:12:05 -0400 (Thu, 15 Mar 2012)
New Revision: 39526

Removed:
   trunk/birt/features/org.jboss.tools.birt.source.feature/
   trunk/birt/features/org.jboss.tools.birt.test.source.feature/
Modified:
   trunk/birt/features/org.jboss.tools.birt.feature/pom.xml
   trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml
   trunk/birt/features/pom.xml
   trunk/birt/site/category.xml
   trunk/build/parent/pom.xml
Log:
JBIDE-8838
* Change parent to add a tychoExtrasVersion
* Tentative on birt
-> Remove previous source features
-> Generate feature with tycho-source-feature-plugin
-> reference generated features in category.xml and removed previous manual source features (s/source.feature/feature.source)

Modified: trunk/birt/features/org.jboss.tools.birt.feature/pom.xml
===================================================================
--- trunk/birt/features/org.jboss.tools.birt.feature/pom.xml	2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/birt/features/org.jboss.tools.birt.feature/pom.xml	2012-03-15 11:12:05 UTC (rev 39526)
@@ -9,4 +9,37 @@
 	<groupId>org.jboss.tools.birt.features</groupId>
 	<artifactId>org.jboss.tools.birt.feature</artifactId> 
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tychoExtrasVersion}</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>

Modified: trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml
===================================================================
--- trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml	2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml	2012-03-15 11:12:05 UTC (rev 39526)
@@ -9,4 +9,37 @@
 	<groupId>org.jboss.tools.birt.features</groupId>
 	<artifactId>org.jboss.tools.birt.test.feature</artifactId> 
 	<packaging>eclipse-feature</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tychoExtrasVersion}</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>

Modified: trunk/birt/features/pom.xml
===================================================================
--- trunk/birt/features/pom.xml	2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/birt/features/pom.xml	2012-03-15 11:12:05 UTC (rev 39526)
@@ -13,9 +13,7 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.tools.birt.feature</module>
-		<module>org.jboss.tools.birt.source.feature</module>
 		<module>org.jboss.tools.birt.test.feature</module>
-		<module>org.jboss.tools.birt.test.source.feature</module>
 	</modules>
 </project>
 	

Modified: trunk/birt/site/category.xml
===================================================================
--- trunk/birt/site/category.xml	2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/birt/site/category.xml	2012-03-15 11:12:05 UTC (rev 39526)
@@ -8,13 +8,13 @@
 	<feature url="features/org.jboss.tools.birt.feature_0.0.0.jar" id="org.jboss.tools.birt.feature" version="0.0.0">
 		<category name="JBoss Tools birt Nightly Build Update Site"/>
 	</feature>
-	<feature url="features/org.jboss.tools.birt.source.feature_0.0.0.jar" id="org.jboss.tools.birt.source.feature" version="0.0.0">
+	<feature url="features/org.jboss.tools.birt.feature.source_0.0.0.jar" id="org.jboss.tools.birt.feature.source" version="0.0.0">
 		<category name="JBoss Tools birt Nightly Build Update Site"/>
 	</feature>
 	<feature url="features/org.jboss.tools.birt.test.feature_0.0.0.jar" id="org.jboss.tools.birt.test.feature" version="0.0.0">
 		<category name="JBoss Tools birt Nightly Build Update Site"/>
 	</feature>
-	<feature url="features/org.jboss.tools.birt.test.source.feature_0.0.0.jar" id="org.jboss.tools.birt.test.source.feature" version="0.0.0">
+	<feature url="features/org.jboss.tools.birt.test.feature.source_0.0.0.jar" id="org.jboss.tools.birt.test.feature.source" version="0.0.0">
 		<category name="JBoss Tools birt Nightly Build Update Site"/>
 	</feature>
 

Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml	2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/build/parent/pom.xml	2012-03-15 11:12:05 UTC (rev 39526)
@@ -14,6 +14,7 @@
 	<properties>
 		<!-- to build w/ latest 0.15.0-SNAPSHOT, run `mvn install -DtychoVersion=0.15.0-SNAPSHOT` -->
 		<tychoVersion>0.14.1</tychoVersion>
+		<tychoExtrasVersion>0.14.0</tychoExtrasVersion>
 		<scmBranch>trunk</scmBranch>
 		<JBT_VERSION>3.3.0</JBT_VERSION>
 		<JBDS_VERSION>5.0.0</JBDS_VERSION>