Move FormattedText from incubation to release eclipse#515

Needed to add FormattedText widget to incubation reactor build because DateChooser has a dependency to it
chrhem · May 25, 2023 · a334fc8 · a334fc8
1 parent f2af449
commit a334fc8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/releng/org.eclipse.nebula.feature/feature.xml b/releng/org.eclipse.nebula.feature/feature.xml
@@ -254,4 +254,7 @@
          id="org.eclipse.nebula.widgets.roundedcheckbox.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.nebula.widgets.formattedtext.feature"
+         version="0.0.0"/>
 </feature>
diff --git a/releng/org.eclipse.nebula.incubation.feature/feature.xml b/releng/org.eclipse.nebula.incubation.feature/feature.xml
@@ -29,10 +29,6 @@
          id="org.eclipse.nebula.widgets.datechooser.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.nebula.widgets.formattedtext.feature"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.nebula.widgets.treemapper.feature"
          version="0.0.0"/>

diff --git a/releng/org.eclipse.nebula.nebula-incubation/pom.xml b/releng/org.eclipse.nebula.nebula-incubation/pom.xml
@@ -38,10 +38,10 @@ Contributors:
 		<module>../org.eclipse.nebula.nebula-parent</module>
 		<module>../../examples/org.eclipse.nebula.examples</module>
 		<module>../../examples/org.eclipse.nebula.examples.feature</module>
+		<module>../../widgets/formattedtext</module>
 		<module>../org.eclipse.nebula.examples.incubation.feature</module>
 
 		<module>../../widgets/collapsiblebuttons</module>
-		<module>../../widgets/formattedtext</module>
 		<module>../../widgets/datechooser</module>
 		<module>../../widgets/radiogroup</module>
 		<module>../../widgets/treemapper</module>

diff --git a/releng/org.eclipse.nebula.nebula-release/pom.xml b/releng/org.eclipse.nebula.nebula-release/pom.xml
@@ -80,6 +80,7 @@
 		<module>../../widgets/roundedcheckbox</module>
 		<module>../../widgets/segmentedbar</module>
 		<module>../../widgets/tiles</module>
+		<module>../../widgets/formattedtext</module>
 
 		<!-- Releng -->
 		<module>../org.eclipse.nebula.feature</module>

diff --git a/releng/org.eclipse.nebula.updatesite.incubation/category.xml b/releng/org.eclipse.nebula.updatesite.incubation/category.xml
@@ -12,9 +12,6 @@
    <feature url="features/org.eclipse.nebula.widgets.datechooser.feature_1.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.datechooser.feature" version="1.0.0.qualifier">
       <category name="Nebula Individual Incubation Widgets"/>
    </feature>
-   <feature url="features/org.eclipse.nebula.widgets.formattedtext.feature_1.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.formattedtext.feature" version="1.0.0.qualifier">
-      <category name="Nebula Individual Incubation Widgets"/>
-   </feature>
    <feature url="features/org.eclipse.nebula.widgets.radiogroup.feature_0.1.0.qualifier.jar" id="org.eclipse.nebula.widgets.radiogroup.feature" version="0.1.0.qualifier">
       <category name="Nebula Individual Incubation Widgets"/>
    </feature>

diff --git a/releng/org.eclipse.nebula.updatesite/category.xml b/releng/org.eclipse.nebula.updatesite/category.xml
@@ -183,13 +183,15 @@
    <feature url="features/org.eclipse.nebula.widgets.tiles.feature_1.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.tiles.feature" version="1.0.0.qualifier">
       <category name="Nebula Release Individual Widgets"/>
    </feature>
-  <feature url="features/org.eclipse.nebula.widgets.roundedcheckbox.feature_1.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.roundedcheckbox.feature" version="1.0.0.qualifier">
+   <feature url="features/org.eclipse.nebula.widgets.roundedcheckbox.feature_1.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.roundedcheckbox.feature" version="1.0.0.qualifier">
       <category name="Nebula Release Individual Widgets"/>
-   </feature>   
-  <feature url="features/org.eclipse.nebula.widgets.roundedswitch.feature_1.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.roundedswitch.feature" version="1.0.0.qualifier">
+   </feature>
+   <feature url="features/org.eclipse.nebula.widgets.roundedswitch.feature_1.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.roundedswitch.feature" version="1.0.0.qualifier">
+      <category name="Nebula Release Individual Widgets"/>
+   </feature>
+   <feature id="org.eclipse.nebula.widgets.formattedtext.feature">
       <category name="Nebula Release Individual Widgets"/>
    </feature>
-
    <bundle id="org.eclipse.nebula.widgets.tablecombo" version="1.2.0.qualifier">
       <category name="Nebula Release Individual Widgets"/>
    </bundle>