Rebase

Signed-off-by: Christoph Läubrich <[email protected]>

Author: laeubi

target-platform/target-platform.target

@@ -33,23 +33,17 @@
 			<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<<<<<<< Upstream, based on master
 			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.7/"/>
 			<repository location="https://download.eclipse.org/tm4e/releases/0.12.0/"/>
 			<repository location="https://download.eclipse.org/lsp4e/releases/0.26.4/"/>
-=======
-			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
-			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4e/releases/0.26.2/"/>
->>>>>>> a1e492d Setup basic properties and return as project
 			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1/"/>
 			<repository location="https://download.eclipse.org/mylyn/updates/release/4.3.0/"/>
-			<repository location="https://download.eclipse.org/tm4e/releases/0.12.0/"/>
-			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.6/"/>
-			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
 			<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
+			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/4.2.1/"/>
@@ -73,12 +67,6 @@
 		</location>
 		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Misc" missingManifest="error" type="Maven">
 			<dependencies>
-				<dependency>
-					<groupId>biz.aQute.bnd</groupId>
-					<artifactId>biz.aQute.bnd.maven</artifactId>
-					<version>7.0.0</version>
-					<type>jar</type>
-				</dependency>
 				<dependency>
 					<groupId>com.google.code.gson</groupId>
 					<artifactId>gson</artifactId>
@@ -115,9 +103,16 @@
 					<version>3.17.0</version>
 					<type>jar</type>
 				</dependency>
+				<dependency>
+					<groupId>biz.aQute.bnd</groupId>
+					<artifactId>biz.aQute.bnd.maven</artifactId>
+					<version>7.0.0</version>
+					<type>jar</type>
+				</dependency>
 			</dependencies>
 		</location>
-		<location includeDependencyDepth="none" includeDependencyScopes="compile" label="M2E Workspace CLI" missingManifest="error" type="Maven">
+		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" label="M2E Workspace CLI" missingManifest="error" type="Maven">
+			<!-- Dedicated location to *NOT* include sources -->
 			<dependencies>
 				<dependency>
 					<groupId>io.takari.m2e.workspace</groupId>