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/07/23 13:47:48 UTC

svn commit: r1612813 - in /sling/trunk/tooling/ide: eclipse-test/pom.xml pom.xml

Author: rombert
Date: Wed Jul 23 11:47:48 2014
New Revision: 1612813

URL: http://svn.apache.org/r1612813
Log:
Updated to tycho 0.21.0

Modified:
    sling/trunk/tooling/ide/eclipse-test/pom.xml
    sling/trunk/tooling/ide/pom.xml

Modified: sling/trunk/tooling/ide/eclipse-test/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/pom.xml?rev=1612813&r1=1612812&r2=1612813&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-test/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-test/pom.xml Wed Jul 23 11:47:48 2014
@@ -38,31 +38,37 @@
         <plugins>
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
+                <artifactId>target-platform-configuration</artifactId>
+                <configuration>
+                    <dependency-resolution>
+                        <extraRequirements>
+                            <requirement>
+                                <type>eclipse-plugin</type>
+                                <id>org.eclipse.equinox.event</id>
+                                <versionRange>0.0.0</versionRange>
+                            </requirement>
+                            <requirement>
+                                <type>eclipse-plugin</type>
+                                <id>org.eclipse.equinox.ds</id>
+                                <versionRange>0.0.0</versionRange>
+                            </requirement>
+                            <requirement>
+                                <type>eclipse-feature</type>
+                                <id>org.apache.sling.ide.feature</id>
+                                <versionRange>0.0.0</versionRange>
+                            </requirement>
+                        </extraRequirements>
+                    </dependency-resolution>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-surefire-plugin</artifactId>
                 <version>${tycho.version}</version>
                 <configuration>
                     <useUIHarness>true</useUIHarness>
                     <useUIThread>false</useUIThread>
                     <argLine>-XX:MaxPermSize=512m ${ui.test.args}</argLine>
-                    <dependencies>
-                        <!-- Pull in all the artifacts we reference from 
-                            the base feature, to be on the safe side -->
-                        <dependency>
-                            <type>eclipse-feature</type>
-                            <artifactId>org.apache.sling.ide.feature</artifactId>
-                            <version>0.0.0</version>
-                        </dependency>
-                        <dependency>
-                            <type>eclipse-plugin</type>
-                            <artifactId>org.eclipse.equinox.ds</artifactId>
-                            <version>0.0.0</version>
-                        </dependency>
-                        <dependency>
-                            <type>eclipse-plugin</type>
-                            <artifactId>org.eclipse.equinox.event</artifactId>
-                            <version>0.0.0</version>
-                        </dependency>
-                    </dependencies>
                     <systemProperties>
                         <launchpad.http.port>${http.port}</launchpad.http.port>
                     </systemProperties>

Modified: sling/trunk/tooling/ide/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1612813&r1=1612812&r2=1612813&view=diff
==============================================================================
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Wed Jul 23 11:47:48 2014
@@ -191,7 +191,7 @@
     </pluginRepositories>    
 
 	<properties>
-		<tycho.version>0.20.0</tycho.version>
+		<tycho.version>0.21.0</tycho.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>