You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/05/07 12:36:01 UTC

svn commit: r1592964 - in /sling/trunk/tooling/ide/target-definition: org.apache.sling.ide.target-definition-dev.target org.apache.sling.ide.target-definition.target

Author: rombert
Date: Wed May  7 10:36:00 2014
New Revision: 1592964

URL: http://svn.apache.org/r1592964
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance

Update target definitions to pick up JUnit 4.10 from Orbit. This allows
us to use rule chains.

Modified:
    sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target
    sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target

Modified: sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target?rev=1592964&r1=1592963&r2=1592964&view=diff
==============================================================================
--- sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target (original)
+++ sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target Wed May  7 10:36:00 2014
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="43">
+<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="44">
 <locations>
 <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"/>
@@ -35,17 +35,18 @@
 <repository location="http://download.eclipse.org/technology/m2e/releases/1.2/1.2.0.20120903-1050"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.json" version="1.0.0.v201011060100"/>
+<unit id="org.sonatype.tycho.m2e.feature.feature.group" version="0.6.0.201207302152"/>
+<repository location="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.6.0/N/0.6.0.201207302152/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
 <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
-<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>
 <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>
+<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
+<unit id="org.json" version="1.0.0.v201011060100"/>
 <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.sonatype.tycho.m2e.feature.feature.group" version="0.6.0.201207302152"/>
-<repository location="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.6.0/N/0.6.0.201207302152/"/>
-</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 <launcherArgs>

Modified: sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target?rev=1592964&r1=1592963&r2=1592964&view=diff
==============================================================================
--- sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target (original)
+++ sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target Wed May  7 10:36:00 2014
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="38">
+<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="39">
 <locations>
 <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"/>
@@ -38,8 +38,9 @@
 <unit id="org.json" version="1.0.0.v201011060100"/>
 <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
 <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
-<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>
 <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>
+<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository"/>
 </location>
 </locations>