From 6dd34f0b0365e0529f3852c688bfd99519f035d1 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 6 Dec 2018 11:38:58 +0000 Subject: [PATCH] IU inclusion changes: * Change features bundling third-party modules to feature requirements * Make some IU name changes to accommodate for distro-specific packaging --- .../org.eclipse.jdt-feature/feature.xml | 114 ++----------- .../org.eclipse.pde-feature/feature.xml | 16 +- .../bundles/org.eclipse.jdt.doc.isv/pom.xml | 2 +- .../bundles/org.eclipse.pde.doc.user/pom.xml | 2 +- .../org.eclipse.platform.doc.isv/pom.xml | 10 +- .../org.eclipse.help-feature/feature.xml | 130 +++------------ .../org.eclipse.platform-feature/feature.xml | 18 +-- .../org.eclipse.sdk.tests/feature.xml | 58 ++----- .../org.eclipse.test-feature/feature.xml | 56 +------ .../org.eclipse.tips.feature/feature.xml | 11 +- .../features/org.eclipse.e4.rcp/feature.xml | 150 ++---------------- 11 files changed, 87 insertions(+), 480 deletions(-) diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml index e12ef6a13..6deae2a13 100644 --- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml @@ -19,6 +19,23 @@ %license + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - eclipse-plugin - javax.annotation + javax.annotation 0.0.0 eclipse-plugin - javax.el + javax.el-api 0.0.0 @@ -93,7 +93,7 @@ eclipse-plugin - javax.servlet + javax.servlet-api 0.0.0 @@ -118,7 +118,7 @@ eclipse-plugin - org.apache.jasper.glassfish + org.glassfish.web.javax.servlet.jsp 0.0.0 diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml index 79fa77d7e..5f3d6f6d0 100644 --- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml @@ -21,69 +21,6 @@ %license - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml index 94f21e6f8..694d49dc1 100644 --- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml @@ -19,6 +19,11 @@ %license + + + + + @@ -32,12 +37,6 @@ id="org.eclipse.help" version="0.0.0"/> - - - - + + + + + + + + + @@ -427,20 +436,6 @@ install-size="0" version="0.0.0"/> - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - diff --git a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml index b8f52fe1a..a1d866a52 100644 --- a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml +++ b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml @@ -32,6 +32,10 @@ %license + + + + - - diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml index 0ce4361be..ac28b73c2 100644 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml @@ -22,6 +22,23 @@ + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -