Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.

Former-commit-id: 99ba7adfe7 [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]
Former-commit-id: e4874a873a

edexOsgi/build.edex/edex/customTargets.xml

@@ -191,7 +191,7 @@
         				<fileset dir="${builder}/postBuild/${edex.root.directory}/lib">
         					<include name="**/*.jar" />
         				</fileset>
-        				<mapper type="regexp" from="^(.*)_(.*).jar" to="\1.jar" />
+        				<mapper type="regexp" from="^(.+?)_(.+).jar" to="\1.jar" />
         			</move>
         		</then>
         	</if>
@@ -208,6 +208,37 @@
         		<fileset dir="${builder}"
         			includes="dependencies-stash/**" />
         	</delete>
+	
+			<!--
+				Remove all PDE-generated FOSS artifacts from the
+				plugins directory.
+			-->
+			<loadfile property="includefile.foss"
+				srcfile="${builder}/includes/cots.includes" />
+			<var name="index" value="1" />
+	
+			<for param="line" list="${includefile.foss}"
+			delimiter="${line.separator}">
+				<sequential>
+					<!-- skip the first line -->
+					<if>
+						<not>
+							<equals arg1="${index}" arg2="1" />
+						</not>
+						<then>
+							<!--
+								Remove the empty FOSS jar from plugins.
+							-->
+							<delete file="${builder}/postBuild/${edex.root.directory}/lib/plugins/@{line}.jar" />	
+						</then>
+					</if>
+					<math result="index"
+						operand1="${index}"
+						operation="+"
+						operand2="1"
+						datatype="int" />
+				</sequential>
+			</for>
         	
         	<!-- manipulate the topLevelElementId - the feature -->
         	<propertyregex property="edex.component"