[e4] Integrate e4 artifacts into Tycho build Ajdust the existing pom.xml files of the new e4 artifacts (bundles and features) and add them as modules to the main RAP Runtime build. Prepend version qualifier of forked bundles with 'rap-' Change-Id: I067ba092af6f91e753d6867d026e365121cd3f8f Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
diff --git a/bundles/org.eclipse.e4.core.commands/pom.xml b/bundles/org.eclipse.e4.core.commands/pom.xml index f0ba8f8..1570bde 100644 --- a/bundles/org.eclipse.e4.core.commands/pom.xml +++ b/bundles/org.eclipse.e4.core.commands/pom.xml
@@ -4,16 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.e4.core.commands</artifactId> <version>0.11.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.target-releng</artifactId> - <relativePath>../../releng/releng-target/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <build> @@ -32,6 +31,20 @@ <artifactId>tycho-source-plugin</artifactId> </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <archiveSite>true</archiveSite> + <format>'rap-'yyyyMMdd-HHmm</format> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project>
diff --git a/bundles/org.eclipse.e4.ui.bindings/pom.xml b/bundles/org.eclipse.e4.ui.bindings/pom.xml index ecbdc08..2ce7cf0 100644 --- a/bundles/org.eclipse.e4.ui.bindings/pom.xml +++ b/bundles/org.eclipse.e4.ui.bindings/pom.xml
@@ -4,16 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.e4.ui.bindings</artifactId> <version>0.11.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.target-releng</artifactId> - <relativePath>../../releng/releng-target/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <build> @@ -32,6 +31,20 @@ <artifactId>tycho-source-plugin</artifactId> </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <archiveSite>true</archiveSite> + <format>'rap-'yyyyMMdd-HHmm</format> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project>
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml index ed2d0a3..289a284 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml
@@ -4,16 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.e4.ui.workbench.addons.swt</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.target-releng</artifactId> - <relativePath>../../releng/releng-target/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <build> @@ -32,6 +31,20 @@ <artifactId>tycho-source-plugin</artifactId> </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <archiveSite>true</archiveSite> + <format>'rap-'yyyyMMdd-HHmm</format> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project>
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml index 7d83788..645e97d 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml
@@ -4,16 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId> <version>0.13.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.target-releng</artifactId> - <relativePath>../../releng/releng-target/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <build> @@ -32,6 +31,20 @@ <artifactId>tycho-source-plugin</artifactId> </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <archiveSite>true</archiveSite> + <format>'rap-'yyyyMMdd-HHmm</format> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project>
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml index 1c1afd6..bfd8632 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml +++ b/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml
@@ -4,16 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.e4.ui.workbench.swt</artifactId> <version>0.13.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.target-releng</artifactId> - <relativePath>../../releng/releng-target/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <build> @@ -32,6 +31,20 @@ <artifactId>tycho-source-plugin</artifactId> </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <archiveSite>true</archiveSite> + <format>'rap-'yyyyMMdd-HHmm</format> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project>
diff --git a/bundles/org.eclipse.e4.ui.workbench/pom.xml b/bundles/org.eclipse.e4.ui.workbench/pom.xml index f06bb8c..5d7a66d 100644 --- a/bundles/org.eclipse.e4.ui.workbench/pom.xml +++ b/bundles/org.eclipse.e4.ui.workbench/pom.xml
@@ -4,16 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.e4.ui.workbench</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.target-releng</artifactId> - <relativePath>../../releng/releng-target/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <build> @@ -32,6 +31,20 @@ <artifactId>tycho-source-plugin</artifactId> </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <archiveSite>true</archiveSite> + <format>'rap-'yyyyMMdd-HHmm</format> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project>
diff --git a/bundles/org.eclipse.rap.e4/pom.xml b/bundles/org.eclipse.rap.e4/pom.xml index 61f5ff8..4510084 100644 --- a/bundles/org.eclipse.rap.e4/pom.xml +++ b/bundles/org.eclipse.rap.e4/pom.xml
@@ -4,16 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.rap.e4</artifactId> <version>0.9.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.target-releng</artifactId> - <relativePath>../../releng/releng-target/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <build>
diff --git a/features/org.eclipse.rap.e4.base.feature/pom.xml b/features/org.eclipse.rap.e4.base.feature/pom.xml index a574e06..086867d 100644 --- a/features/org.eclipse.rap.e4.base.feature/pom.xml +++ b/features/org.eclipse.rap.e4.base.feature/pom.xml
@@ -4,16 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.rap.e4.base.feature</artifactId> <version>0.9.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.base-releng</artifactId> - <relativePath>../../releng/releng-base/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <repositories>
diff --git a/features/org.eclipse.rap.e4.target.feature/pom.xml b/features/org.eclipse.rap.e4.target.feature/pom.xml index 3f8a50a..abdf182 100644 --- a/features/org.eclipse.rap.e4.target.feature/pom.xml +++ b/features/org.eclipse.rap.e4.target.feature/pom.xml
@@ -4,15 +4,15 @@ 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> - <groupId>org.eclipse.rap.e4</groupId> <artifactId>org.eclipse.rap.e4.target.feature</artifactId> + <version>0.9.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <parent> - <groupId>org.eclipse.rap.e4</groupId> - <artifactId>org.eclipse.rap.e4.target-releng</artifactId> - <relativePath>../../releng/releng-target/pom.xml</relativePath> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.eclipse.rap</groupId> + <artifactId>org.eclipse.rap.runtime-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath> </parent> <repositories>
diff --git a/pom.xml b/pom.xml index 4342748..707228e 100644 --- a/pom.xml +++ b/pom.xml
@@ -37,6 +37,14 @@ <module>bundles/org.eclipse.rap.ui</module> <module>bundles/org.eclipse.rap.ui.views</module> <module>bundles/org.eclipse.rap.ui.workbench</module> + <!-- e4 Runtime projects --> + <module>bundles/org.eclipse.e4.core.commands</module> + <module>bundles/org.eclipse.e4.ui.bindings</module> + <module>bundles/org.eclipse.e4.ui.workbench.addons.swt</module> + <module>bundles/org.eclipse.e4.ui.workbench.renderers.swt</module> + <module>bundles/org.eclipse.e4.ui.workbench.swt</module> + <module>bundles/org.eclipse.e4.ui.workbench</module> + <module>bundles/org.eclipse.rap.e4</module> <!-- Examples projects --> <module>examples/org.eclipse.rap.demo.controls</module> <module>examples/org.eclipse.rap.demo.databinding</module> @@ -65,6 +73,8 @@ <module>features/org.eclipse.rap.examples.feature</module> <module>features/org.eclipse.rap.feature</module> <module>features/org.eclipse.rap.sdk.feature</module> + <module>features/org.eclipse.rap.e4.base.feature</module> + <module>features/org.eclipse.rap.e4.target.feature</module> <!-- Repository projects --> <module>releng/org.eclipse.rap.build/repository</module> <!-- Builder projects -->