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 2016/11/02 15:52:02 UTC
svn commit: r1767713 - in
/sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e:
LegacyMavenBundleProjectTest.java legacy-pom.xml
Author: rombert
Date: Wed Nov 2 15:52:01 2016
New Revision: 1767713
URL: http://svn.apache.org/viewvc?rev=1767713&view=rev
Log:
SLING-6112 - Make Sling IDE independent of m2e-tycho
Prevent LegacyMavenBundleProjectTest from timing out:
- remove all build dependencies so they are not downloaded by Maven
- set a longer timeout for the marker to appear
Modified:
sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/LegacyMavenBundleProjectTest.java
sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/legacy-pom.xml
Modified: sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/LegacyMavenBundleProjectTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/LegacyMavenBundleProjectTest.java?rev=1767713&r1=1767712&r2=1767713&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/LegacyMavenBundleProjectTest.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/LegacyMavenBundleProjectTest.java Wed Nov 2 15:52:01 2016
@@ -16,6 +16,8 @@
*/
package org.apache.sling.ide.eclipse.m2e;
+import java.util.concurrent.TimeUnit;
+
import org.apache.sling.ide.eclipse.m2e.impl.helpers.MavenProjectAdapter;
import org.apache.sling.ide.test.impl.helpers.DefaultJavaVMInstall;
import org.apache.sling.ide.test.impl.helpers.DisableDebugStatusHandlers;
@@ -57,7 +59,8 @@ public class LegacyMavenBundleProjectTes
project.convertToMavenProject();
- Poller markerPoller = new Poller();
+ // wait up to 1 minute for the build to succeed due to time needed to retrieve dependencies
+ Poller markerPoller = new Poller(TimeUnit.MINUTES.toMillis(1));
markerPoller.pollUntilSuccessful(new Runnable() {
@Override
public void run() {
Modified: sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/legacy-pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/legacy-pom.xml?rev=1767713&r1=1767712&r2=1767713&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/legacy-pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/legacy-pom.xml Wed Nov 2 15:52:01 2016
@@ -38,34 +38,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.12.0</version>
- </dependency>
- <!--
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- <version>2.4.0</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>5.0.0</version>
- </dependency>
- </dependencies>
</project>