From d240b732dd43a9e49c8c3638ac469338e2b1e407 Mon Sep 17 00:00:00 2001
From: Elena Parovyshnaia <elena.parovyshnaya@gmail.com>
Date: Thu, 8 Apr 2021 08:48:51 +0300
Subject: [PATCH] Bug 572623 redesign license containment

Delete `floating` bundles
- lic.floating.e4.ui
- lic.floating.edit
- lic.floating.ecore
- lic.floating.model
- lic.floating.design (place diagram under 'lic.licensing.design')
- loc.floating.emfforms

Signed-off-by: eparovyshnaya <elena.parovyshnaya@gmail.com>
---
 .../feature.xml                               | 28 -------------------
 .../feature.xml                               |  7 -----
 .../pom.xml                                   |  4 ---
 .../pom.xml                                   |  2 --
 4 files changed, 41 deletions(-)

diff --git a/features/org.eclipse.passage.lic.floating.feature/feature.xml b/features/org.eclipse.passage.lic.floating.feature/feature.xml
index 220e99d44..9dbb1ea3a 100644
--- a/features/org.eclipse.passage.lic.floating.feature/feature.xml
+++ b/features/org.eclipse.passage.lic.floating.feature/feature.xml
@@ -45,32 +45,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.passage.lic.floating.ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.passage.lic.floating.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.passage.lic.floating.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.passage.lic.floating.e4.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/org.eclipse.passage.loc.licenses.feature/feature.xml b/features/org.eclipse.passage.loc.licenses.feature/feature.xml
index f808d28b0..f2d853e78 100644
--- a/features/org.eclipse.passage.loc.licenses.feature/feature.xml
+++ b/features/org.eclipse.passage.loc.licenses.feature/feature.xml
@@ -52,11 +52,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.passage.loc.floating.emfforms"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/releng/org.eclipse.passage.lic.aggregator/pom.xml b/releng/org.eclipse.passage.lic.aggregator/pom.xml
index e11979771..1dac9a24f 100644
--- a/releng/org.eclipse.passage.lic.aggregator/pom.xml
+++ b/releng/org.eclipse.passage.lic.aggregator/pom.xml
@@ -120,10 +120,6 @@
 		<module>../../tests/org.eclipse.passage.lic.licenses.migration.tests</module>
 
 		<module>../../bundles/org.eclipse.passage.lic.floating</module>
-		<module>../../bundles/org.eclipse.passage.lic.floating.ecore</module>
-		<module>../../bundles/org.eclipse.passage.lic.floating.model</module>
-		<module>../../bundles/org.eclipse.passage.lic.floating.edit</module>
-		<module>../../bundles/org.eclipse.passage.lic.floating.e4.ui</module>
 		<module>../../features/org.eclipse.passage.lic.floating.feature</module>
 
 		<module>../../bundles/org.eclipse.passage.lic.compile.branding</module>
diff --git a/releng/org.eclipse.passage.loc.aggregator/pom.xml b/releng/org.eclipse.passage.loc.aggregator/pom.xml
index bda1bacbd..f3caeb14d 100644
--- a/releng/org.eclipse.passage.loc.aggregator/pom.xml
+++ b/releng/org.eclipse.passage.loc.aggregator/pom.xml
@@ -57,8 +57,6 @@
 		<module>../../bundles/org.eclipse.passage.loc.licenses.emfforms</module>
 		<module>../../features/org.eclipse.passage.loc.licenses.feature</module>
 
-		<module>../../bundles/org.eclipse.passage.loc.floating.emfforms</module>
-
 		<module>../../bundles/org.eclipse.passage.loc.billing.core</module>
 		<module>../../features/org.eclipse.passage.loc.billing.feature</module>
 		<module>../../tests/org.eclipse.passage.loc.billing.core.tests</module>