Ignore optional feature includes in Parallel package

2 files changed, 22 insertions, 1 deletions

diff --git a/packages/org.eclipse.epp.package.parallel.feature/pom.xml b/packages/org.eclipse.epp.package.parallel.feature/pom.xml
index fd1bf3c8..730f71a6 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/pom.xml
@@ -29,4 +29,24 @@
   <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
+  <build>
+    <plugins>
+      <!-- The Parallel Package feature.xml includes a number of other
+           features that are marked as optional, and unfortunately they
+           seem to be missing in Luna. Ignoring these options features
+           for now.
+        -->
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <dependency-resolution>
+            <optionalDependencies>ignore</optionalDependencies>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/pom.xml b/pom.xml
index 3f39962c..c92a060c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   <modules>
     <module>packages/org.eclipse.epp.package.common.feature</module>
-
+<!-- 
     <module>packages/org.eclipse.epp.package.automotive</module>
     <module>packages/org.eclipse.epp.package.automotive.feature</module>
     <module>packages/org.eclipse.epp.package.automotive.product</module>
@@ -54,6 +54,7 @@
     <module>packages/org.eclipse.epp.package.modeling</module>
     <module>packages/org.eclipse.epp.package.modeling.feature</module>
     <module>packages/org.eclipse.epp.package.modeling.product</module>
+ -->
 
     <module>packages/org.eclipse.epp.package.parallel</module>
     <module>packages/org.eclipse.epp.package.parallel.feature</module>