Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 565111028A for ; Mon, 1 Jul 2013 16:25:59 +0000 (UTC) Received: (qmail 35482 invoked by uid 500); 1 Jul 2013 16:25:57 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 35453 invoked by uid 500); 1 Jul 2013 16:25:57 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 35446 invoked by uid 99); 1 Jul 2013 16:25:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jul 2013 16:25:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jul 2013 16:25:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3EDD02388906; Mon, 1 Jul 2013 16:25:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1498549 - /sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java Date: Mon, 01 Jul 2013 16:25:35 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130701162535.3EDD02388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Mon Jul 1 16:25:34 2013 New Revision: 1498549 URL: http://svn.apache.org/r1498549 Log: SLING-2938 - do not start Felix HTTP service in integration tests Modified: sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java Modified: sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java?rev=1498549&r1=1498548&r2=1498549&view=diff ============================================================================== --- sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java (original) +++ sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java Mon Jul 1 16:25:34 2013 @@ -130,10 +130,10 @@ public class AdapterMethodManagerIT { mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.0"), mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.2.8"), mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.0.2"), - mavenBundle("org.apache.felix", "org.apache.felix.http.jetty", "2.2.0"), mavenBundle("commons-io", "commons-io", "1.4"), mavenBundle("commons-lang", "commons-lang", "2.5"), mavenBundle("javax.jcr", "jcr", "2.0"), + mavenBundle("javax.servlet", "javax.servlet-api", "3.0.1"), // TODO use newer API bundle when released mavenBundle("org.apache.sling", "org.apache.sling.api", "2.4.3-SNAPSHOT"),