Author: rombert
Date: Fri Sep 13 09:44:16 2013
New Revision: 1522835
URL: http://svn.apache.org/r1522835
Log:
SLING-3035 - Eclipse build - target feature cleanup
- merge the two duplicate indigo update sites into a single one
- remove the unneeded 'Feature' location from the target definition
- use a stable update site for m2e as the main one is refreshed on each
release
- move to a slightly older m2e version to allow installation in older
versions
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF?rev=1522835&r1=1522834&r2=1522835&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
Fri Sep 13 09:44:16 2013
@@ -8,8 +8,8 @@ Require-Bundle: org.eclipse.core.runtime
org.eclipse.osgi.services;bundle-version="3.2.100",
org.eclipse.core.resources,
org.eclipse.ui,
- org.eclipse.m2e.core;bundle-version="1.4.0",
- org.eclipse.m2e.archetype.common;bundle-version="1.4.0"
+ org.eclipse.m2e.core;bundle-version="1.2.0",
+ org.eclipse.m2e.archetype.common;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF?rev=1522835&r1=1522834&r2=1522835&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
(original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
Fri Sep 13 09:44:16 2013
@@ -76,8 +76,8 @@ Require-Bundle: org.eclipse.wst.common.p
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.eclipse.core.runtime,
- org.eclipse.m2e.core;bundle-version="1.4.0",
- org.eclipse.m2e.archetype.common;bundle-version="1.4.0",
+ org.eclipse.m2e.core;bundle-version="1.2.0",
+ org.eclipse.m2e.archetype.common;bundle-version="1.2.0",
org.eclipse.ui.console,
org.eclipse.jdt.ui,
org.apache.sling.ide.eclipse-core,
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target?rev=1522835&r1=1522834&r2=1522835&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
Fri Sep 13 09:44:16 2013
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="Sling IDE Tools" sequenceNumber="23">
+<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="28">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
@@ -12,42 +11,37 @@
<repository
location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.m2e.feature.feature.group"
version="1.4.0.20130601-0317"/>
-<repository location="http://download.eclipse.org/technology/m2e/releases"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.feature.group"
version="3.7.2.v20120207-1839-9gF7UHPDFxGjd-PqDr2jX_4yKaumkoHTz04_q-q"/>
-<unit id="org.eclipse.jdt.feature.group"
version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
-<unit id="org.eclipse.pde.feature.group"
version="3.7.2.v20120120-1420-7b7rFUOFEx2Xnqafnpz0E--0"/>
-<unit id="org.eclipse.wst.server_adapters.feature.feature.group"
version="3.2.100.v20110303-51EoAkF77g8HBSc"/>
-<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group"
version="3.3.2.v201111030500-7b7II1YFSK2WIuPRDEnExPV-RvTn"/>
-<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group"
version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
-<unit id="org.eclipse.libra.facet.feature.feature.group"
version="0.1.2.201202130952"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-</location>
-<location id="org.sonatype.tycho.m2e.feature" path="${eclipse_home}"
type="Feature"/>
-<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jst.web_ui.feature.feature.group"
version="3.3.2.v201112072049-7F7AFO7C25ToiIbpoiuW12GT78Mciy6W7iwuxaco"/>
+<unit id="org.eclipse.pde.feature.group"
version="3.7.2.v20120120-1420-7b7rFUOFEx2Xnqafnpz0E--0"/>
<unit id="org.eclipse.wst.common_core.feature.feature.group"
version="3.3.2.v201111030500-7B7DFO9F7RZHOhIjR6Mz-NJ"/>
<unit id="org.eclipse.wst.web_core.feature.feature.group"
version="3.3.2.v201111030500-7E7EFMcAJvn8cwW45JTLsz-TCw6tofoJ"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group"
version="3.3.2.v201111030500-7C79FVsEdhO_sfog9oNekiJkS7Nz00OK"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group"
version="3.3.2.v20111026_1748-7B79FBdAtJcez0EONePJUSNPjBC42"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group"
version="3.3.2.v201112072049-7C7OFeMF7RZHQOIsNANyRc"/>
+<unit id="org.eclipse.jdt.feature.group"
version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
+<unit id="org.eclipse.platform.feature.group"
version="3.7.2.v20120207-1839-9gF7UHPDFxGjd-PqDr2jX_4yKaumkoHTz04_q-q"/>
<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group"
version="3.3.2.v20111010_1242-777HFHzCcNBDjCbIUfEEE3"/>
<unit id="org.eclipse.wst.server_userdoc.feature.feature.group"
version="3.3.0.v20110512-20DF7w312215222664"/>
-<unit id="org.eclipse.wst.xml_userdoc.feature.feature.group"
version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group"
version="3.2.100.v20110303-51EoAkF77g8HBSc"/>
+<unit id="org.eclipse.wst.xml_userdoc.feature.feature.group"
version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group"
version="1.5.301.v201102200555-2407w312123151655"/>
+<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group"
version="3.3.2.v201111030500-7b7II1YFSK2WIuPRDEnExPV-RvTn"/>
+<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group"
version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group"
version="3.3.2.v20111026_1748-30FBd8s7356394Ka2531"/>
<unit id="org.eclipse.wst.ws_userdoc.feature.feature.group"
version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
<unit id="org.eclipse.wst.web_userdoc.feature.feature.group"
version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
<unit id="org.eclipse.jst.web_core.feature.feature.group"
version="3.3.2.v201112072049-7Q7DGLAFE9LeAHGQwz0Yz0Nmuitz01z01sRxi387"/>
<unit id="org.eclipse.wst.ws_core.feature.feature.group"
version="3.3.1.v201108230355-7L7RFi8FGtGd-thsz0z0rQwh2766"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group"
version="3.3.2.v201112142348-7I7AFg1EtEoVFjz-98J1iuhhBz-uuWclgZtNHnEN"/>
-<unit id="org.eclipse.jst.web_userdoc.feature.feature.group"
version="3.3.1.v201108102009-2107w31211938"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group"
version="3.3.0.v201102200555-7A6FHr9xFcAVCFLZBBJLIR43A"/>
+<unit id="org.eclipse.jst.web_userdoc.feature.feature.group"
version="3.3.1.v201108102009-2107w31211938"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group"
version="3.2.100.v20110303-208Z7w31211419"/>
+<unit id="org.eclipse.libra.facet.feature.feature.group"
version="0.1.2.201202130952"/>
<repository location="http://download.eclipse.org/releases/indigo"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2e.feature.feature.group"
version="1.2.0.20120903-1050"/>
+<repository
location="http://download.eclipse.org/technology/m2e/releases/1.2/1.2.0.20120903-1050"/>
+</location>
</locations>
</target>
