[Releng] Improve EPPPackages.setup.
diff --git a/setups/interim/EPPPackages.setup b/setups/interim/EPPPackages.setup
index 1d9cf50..b382f70 100644
--- a/setups/interim/EPPPackages.setup
+++ b/setups/interim/EPPPackages.setup
@@ -66,6 +66,16 @@
<description>${scope.project.label}</description>
</setupTask>
<setupTask
+ xsi:type="setup:TextModifyTask"
+ excludedTriggers="BOOTSTRAP"
+ url="${git.clone.epp.packages.location|uri}/packages/org.eclipse.epp.package.javascript.tests/.project"
+ encoding="UTF-8">
+ <modification
+ pattern="\t(<nature>org.eclipse.m2e.core.maven2Nature</nature>)">
+ <substitution><!-- \1 --></substitution>
+ </modification>
+ </setupTask>
+ <setupTask
xsi:type="setup.targlets:TargletTask">
<targlet
name="${scope.project.label}">
@@ -94,16 +104,6 @@
</workingSet>
<description>The dynamic working sets for ${scope.project.label}</description>
</setupTask>
- <setupTask
- xsi:type="setup:TextModifyTask"
- excludedTriggers="BOOTSTRAP"
- url="${git.clone.epp.packages.location|uri}/packages/org.eclipse.epp.package.javascript.tests/.project"
- encoding="UTF-8">
- <modification
- pattern="\t(<nature>org.eclipse.m2e.core.maven2Nature</nature>)">
- <substitution><!-- \1 --></substitution>
- </modification>
- </setupTask>
<stream name="master"
label="Master"/>
<logicalProjectContainer