Revert "Bug 476726 - Create eclipse.platform.ui/bundles/pom.xml for Eclipse bundles to allow building them individually"

This reverts commit a179c98c01b149d6225137408f7dc66300ec9949.

Change-Id: I7b206db56f9c13d72443383b02cd65b5f4cc5dd8

2 files changed, 43 insertions, 129 deletions

diff --git a/bundles/pom.xml b/bundles/pom.xml
deleted file mode 100644
index f413f3de594..00000000000
--- a/bundles/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2015 vogella GmbH and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
-  Contributors:
-     Lars Vogel <Lars.Vogel@vogella.com> - initial implementation
--->
-<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>eclipse.platform.ui</groupId>
-    <artifactId>eclipse.platform.ui</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>eclipse.platform.ui</groupId>
-  <artifactId>eclipse.platform.ui.bundles</artifactId>
-  <version>4.6.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-   <properties>
-     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.ui.git</tycho.scmUrl>
-  </properties>
-
-  <modules>
-    <module>org.eclipse.core.commands</module>
-    <module>org.eclipse.core.databinding</module>
-    <module>org.eclipse.core.databinding.beans</module>
-    <module>org.eclipse.core.databinding.observable</module>
-    <module>org.eclipse.core.databinding.property</module>
-    <module>org.eclipse.e4.core.commands</module>
-    <module>org.eclipse.e4.emf.xpath</module>
-    <module>org.eclipse.e4.ui.bindings</module>
-    <module>org.eclipse.e4.ui.css.core</module>
-    <module>org.eclipse.e4.ui.css.swt</module>
-    <module>org.eclipse.e4.ui.css.swt.theme</module>
-    <module>org.eclipse.e4.ui.di</module>
-    <module>org.eclipse.e4.ui.dialogs</module>
-    <module>org.eclipse.e4.ui.model.workbench</module>
-    <module>org.eclipse.e4.ui.progress</module>
-    <module>org.eclipse.e4.ui.services</module>
-    <module>org.eclipse.e4.ui.widgets</module>
-    <module>org.eclipse.e4.ui.workbench</module>
-    <module>org.eclipse.e4.ui.workbench.addons.swt</module>
-    <module>org.eclipse.e4.ui.workbench.renderers.swt</module>
-    <module>org.eclipse.e4.ui.workbench.renderers.swt.cocoa</module>
-    <module>org.eclipse.e4.ui.workbench.swt</module>
-    <module>org.eclipse.e4.ui.workbench3</module>
-    <module>org.eclipse.jface</module>
-    <module>org.eclipse.jface.databinding</module>
-    <module>org.eclipse.ui</module>
-    <module>org.eclipse.ui.browser</module>
-    <module>org.eclipse.ui.forms</module>
-    <module>org.eclipse.ui.views</module>
-    <module>org.eclipse.ui.views.properties.tabbed</module>
-    <module>org.eclipse.ui.workbench</module>
-    <module>org.eclipse.ui.monitoring</module>
-    <module>org.eclipse.ui.navigator</module>
-    <module>org.eclipse.ui.themes</module>
-    <module>org.eclipse.ui.ide</module>
-    <module>org.eclipse.ui.ide.application</module>
-    <module>org.eclipse.ui.win32</module>
-    <module>org.eclipse.ui.cocoa</module>
-    <module>org.eclipse.e4.ui.swt.gtk</module>
-    <module>org.eclipse.ui.navigator.resources</module>
-  </modules>
-
-</project>
-
-  <groupId>eclipse.platform.ui</groupId>
-  <artifactId>eclipse.platform.ui.bundles</artifactId>
-  <version>4.6.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-   <properties>
-     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.ui.git</tycho.scmUrl>
-  </properties>
-
-  <modules>
-    <module>org.eclipse.core.commands</module>
-    <module>org.eclipse.core.databinding</module>
-    <module>org.eclipse.core.databinding.beans</module>
-    <module>org.eclipse.core.databinding.observable</module>
-    <module>org.eclipse.core.databinding.property</module>
-    <module>org.eclipse.e4.core.commands</module>
-    <module>org.eclipse.e4.emf.xpath</module>
-    <module>org.eclipse.e4.ui.bindings</module>
-    <module>org.eclipse.e4.ui.css.core</module>
-    <module>org.eclipse.e4.ui.css.swt</module>
-    <module>org.eclipse.e4.ui.css.swt.theme</module>
-    <module>org.eclipse.e4.ui.di</module>
-    <module>org.eclipse.e4.ui.dialogs</module>
-    <module>org.eclipse.e4.ui.model.workbench</module>
-    <module>org.eclipse.e4.ui.progress</module>
-    <module>org.eclipse.e4.ui.services</module>
-    <module>org.eclipse.e4.ui.widgets</module>
-    <module>org.eclipse.e4.ui.workbench</module>
-    <module>org.eclipse.e4.ui.workbench.addons.swt</module>
-    <module>org.eclipse.e4.ui.workbench.renderers.swt</module>
-    <module>org.eclipse.e4.ui.workbench.renderers.swt.cocoa</module>
-    <module>org.eclipse.e4.ui.workbench.swt</module>
-    <module>org.eclipse.e4.ui.workbench3</module>
-    <module>org.eclipse.jface</module>
-    <module>org.eclipse.jface.databinding</module>
-    <module>org.eclipse.ui</module>
-    <module>org.eclipse.ui.browser</module>
-    <module>org.eclipse.ui.forms</module>
-    <module>org.eclipse.ui.views</module>
-    <module>org.eclipse.ui.views.properties.tabbed</module>
-    <module>org.eclipse.ui.workbench</module>
-    <module>org.eclipse.ui.monitoring</module>
-    <module>org.eclipse.ui.navigator</module>
-    <module>org.eclipse.ui.themes</module>
-    <module>org.eclipse.ui.ide</module>
-    <module>org.eclipse.ui.ide.application</module>
-    <module>org.eclipse.ui.win32</module>
-    <module>org.eclipse.ui.cocoa</module>
-    <module>org.eclipse.e4.ui.swt.gtk</module>
-    <module>org.eclipse.ui.navigator.resources</module>
-  </modules>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 33b99eca931..ded7f5a82ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,8 +76,49 @@
     <module>examples/org.eclipse.ui.forms.examples</module>
     <module>examples/org.eclipse.ui.examples.rcp.mail</module>
      -->
- 
-    <module>bundles</module>
+
+    <module>bundles/org.eclipse.core.commands</module>
+    <module>bundles/org.eclipse.core.databinding</module>
+    <module>bundles/org.eclipse.core.databinding.beans</module>
+    <module>bundles/org.eclipse.core.databinding.observable</module>
+    <module>bundles/org.eclipse.core.databinding.property</module>
+    <module>bundles/org.eclipse.e4.core.commands</module>
+    <module>bundles/org.eclipse.e4.emf.xpath</module>
+    <module>bundles/org.eclipse.e4.ui.bindings</module>
+    <module>bundles/org.eclipse.e4.ui.css.core</module>
+    <module>bundles/org.eclipse.e4.ui.css.swt</module>
+    <module>bundles/org.eclipse.e4.ui.css.swt.theme</module>
+    <module>bundles/org.eclipse.e4.ui.di</module>
+    <module>bundles/org.eclipse.e4.ui.dialogs</module>
+    <module>bundles/org.eclipse.e4.ui.model.workbench</module>
+    <module>bundles/org.eclipse.e4.ui.progress</module>
+    <module>bundles/org.eclipse.e4.ui.services</module>
+    <module>bundles/org.eclipse.e4.ui.widgets</module>
+    <module>bundles/org.eclipse.e4.ui.workbench</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.renderers.swt.cocoa</module>
+    <module>bundles/org.eclipse.e4.ui.workbench.swt</module>
+    <module>bundles/org.eclipse.e4.ui.workbench3</module>
+    <module>bundles/org.eclipse.jface</module>
+    <module>bundles/org.eclipse.jface.databinding</module>
+    <module>bundles/org.eclipse.ui</module>
+    <module>bundles/org.eclipse.ui.browser</module>
+    <module>bundles/org.eclipse.ui.forms</module>
+    <module>bundles/org.eclipse.ui.views</module>
+    <module>bundles/org.eclipse.ui.views.properties.tabbed</module>
+    <module>bundles/org.eclipse.ui.workbench</module>
+    <module>bundles/org.eclipse.ui.monitoring</module>
+    <module>bundles/org.eclipse.ui.navigator</module>
+    <module>bundles/org.eclipse.ui.themes</module>
+    <module>features/org.eclipse.e4.rcp</module>
+    <module>bundles/org.eclipse.ui.ide</module>
+    <module>bundles/org.eclipse.ui.ide.application</module>
+    <module>bundles/org.eclipse.ui.win32</module>
+    <module>bundles/org.eclipse.ui.cocoa</module>
+    <module>bundles/org.eclipse.e4.ui.swt.gtk</module>
+    <module>bundles/org.eclipse.ui.navigator.resources</module>
+
     <module>tests</module>
 
   </modules>