Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C1F7518ACE for ; Wed, 9 Dec 2015 11:23:46 +0000 (UTC) Received: (qmail 17575 invoked by uid 500); 9 Dec 2015 11:23:46 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17380 invoked by uid 500); 9 Dec 2015 11:23:46 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 16645 invoked by uid 99); 9 Dec 2015 11:23:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Dec 2015 11:23:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 15BFCE0B28; Wed, 9 Dec 2015 11:23:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Wed, 09 Dec 2015 11:24:25 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [43/51] [abbrv] ignite git commit: Fix OSGi test. Fix OSGi test. (@ProbeBuilder applies to all test classes when run from a suite). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bdbe4068 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bdbe4068 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bdbe4068 Branch: refs/heads/ignite-843-rc2 Commit: bdbe4068b3851f7a412935acb3e36860cd08efa9 Parents: 3baf4d1 Author: Raul Kripalani Authored: Tue Dec 8 21:04:36 2015 +0100 Committer: Raul Kripalani Committed: Tue Dec 8 21:04:36 2015 +0100 ---------------------------------------------------------------------- .../test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bdbe4068/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java ---------------------------------------------------------------------- diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java index 9a2e92d..4f875ed 100644 --- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java +++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java @@ -93,7 +93,7 @@ public class IgniteOsgiServiceTest extends AbstractIgniteKarafTest { */ @ProbeBuilder public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) { - probe.setHeader(Constants.IMPORT_PACKAGE, "*,org.apache.ignite.osgi.activators"); + probe.setHeader(Constants.IMPORT_PACKAGE, "*,org.apache.ignite.osgi.activators;resolution:=\"optional\""); return probe; }