Source feature and generator.infrastructure feature removed

features/org.yakindu.sct-feature/feature.xml

@@ -217,4 +217,25 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.yakindu.sct.generator.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.generator.genmodel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.generator.genmodel.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

features/org.yakindu.sct.generator-feature/feature.xml

@@ -21,12 +21,12 @@
          id="org.yakindu.sct.generator.c"
          version="0.0.0"/>
 
-   <includes
-         id="org.yakindu.sct.generator.infrastructure"
-         version="0.0.0"/>
-
    <includes
          id="org.yakindu.sct.generator.java"
          version="0.0.0"/>
 
+   <requires>
+      <import feature="org.yakindu.sct" version="1.0.0.qualifier"/>
+   </requires>
+
 </feature>

features/org.yakindu.sct.generator.c-feature/feature.xml

@@ -17,9 +17,9 @@
       %license
    </license>
 
-   <includes
-         id="org.yakindu.sct.generator.infrastructure"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.yakindu.sct" version="1.0.0.qualifier"/>
+   </requires>
 
    <plugin
          id="org.yakindu.sct.generator.c"

features/org.yakindu.sct.generator.java-feature/feature.xml

@@ -17,9 +17,9 @@
       %license
    </license>
 
-   <includes
-         id="org.yakindu.sct.generator.infrastructure"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.yakindu.sct" version="1.0.0.qualifier"/>
+   </requires>
 
    <plugin
          id="org.yakindu.sct.generator.java"

features/org.yakindu.sct.sdk-feature/feature.xml

@@ -22,19 +22,160 @@
          version="0.0.0"/>
 
    <includes
-         id="org.yakindu.sct.source"
+         id="org.yakindu.sct.generator"
          version="0.0.0"/>
 
-   <includes
-         id="org.yakindu.sct.generator"
+   <plugin
+         id="org.yakindu.base.types.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.base.types.ui.scope.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.sgraph.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.sgraph.edit.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.stext.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.stext.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.ui.editor.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.ui.integration.stext.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.simulation.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.simulation.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.doc.user.source"
+         download-size="0"
+         install-size="0"
          version="0.0.0"/>
 
-   <includes
+   <plugin
+         id="org.yakindu.sct.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.sexec.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.sexec.edit.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.stext.resource.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.sgen.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.ui.navigator.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.sgraph.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.yakindu.sct.model.sexec.interpreter.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.yakindu.sct.generator.c.source"
-         version="0.0.0"/>
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
+   <plugin
+         id="org.yakindu.sct.generator.cpp.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.yakindu.sct.generator.java.source"
-         version="0.0.0"/>
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>

releng/org.yakindu.sct.releng/pom.xml

@@ -12,6 +12,7 @@
 	<properties>
 		<tycho-version>0.13.0</tycho-version>
 		<antrun-version>1.6</antrun-version>
+		<xtextUtilsRepository>https://builds.itemis.de/jenkins/view/YAKINDU%202/job/XTEXT_UTILS/lastSuccessfulBuild/</xtextUtilsRepository>
 	</properties>
 
 	<build>
@@ -108,11 +109,11 @@
 
 	<repositories>
 		<repository>
-			<!-- Last stable repository for xtextUtils which are shipped with this repository  -->
+			<!-- Selected version of xtextUtils repository which is shipped with this repository  -->
 			<!-- Todo: works only with a custom java keystore because of self signed ssl-cert, local results previous build in local repo are used as fallback -->
 			<id>xtextUtils</id>
 			<layout>p2</layout>
-			<url>https://builds.itemis.de/jenkins/view/YAKINDU%202/job/XTEXT_UTILS/lastSuccessfulBuild/artifact/update-site/</url>
+			<url>${xtextUtilsRepository}/artifact/update-site/</url>
 		</repository>
 	</repositories>
 	
@@ -179,6 +180,9 @@
 		<module>../org.yakindu.base.types</module>
 		<module>../org.yakindu.base.types.scope</module>
 		<module>../org.yakindu.sct.doc.user</module>
+		<module>../org.yakindu.sct.generator.core</module>
+		<module>../org.yakindu.sct.generator.genmodel</module>
+		<module>../org.yakindu.sct.generator.genmodel.ui</module>
 		<module>../org.yakindu.sct.model.sexec</module>
 		<module>../org.yakindu.sct.model.sexec.edit</module>
 		<module>../org.yakindu.sct.model.sexec.interpreter</module>
@@ -198,21 +202,13 @@
 		<module>../org.yakindu.sct.ui.integration.stext</module>
 		<module>../org.yakindu.sct.ui.navigator</module>
 		<module>../org.yakindu.sct-feature</module>
-		<module>../org.yakindu.sct.source-feature</module>
-		
-		<module>../org.yakindu.sct.generator.infrastructure-feature</module>
-		<module>../org.yakindu.sct.generator.core</module>
-		<module>../org.yakindu.sct.generator.genmodel</module>
-		<module>../org.yakindu.sct.generator.genmodel.ui</module>
-		
+
 		<module>../org.yakindu.sct.generator.c</module>
 		<module>../org.yakindu.sct.generator.cpp</module>
 		<module>../org.yakindu.sct.generator.c-feature</module>
-		<module>../org.yakindu.sct.generator.c.source-feature</module>
 
 		<module>../org.yakindu.sct.generator.java</module>
 		<module>../org.yakindu.sct.generator.java-feature</module>
-		<module>../org.yakindu.sct.generator.java.source-feature</module>
 
 		<module>../org.yakindu.sct.generator-feature</module>
 		<module>../org.yakindu.sct.sdk-feature</module>