From commits-return-66088-archive-asf-public=cust-asf.ponee.io@camel.apache.org Thu Oct 18 18:02:39 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 74E9F180679 for ; Thu, 18 Oct 2018 18:02:36 +0200 (CEST) Received: (qmail 65191 invoked by uid 500); 18 Oct 2018 16:02:29 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 63893 invoked by uid 99); 18 Oct 2018 16:02:29 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2018 16:02:29 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 0BE7785860; Thu, 18 Oct 2018 16:02:29 +0000 (UTC) Date: Thu, 18 Oct 2018 16:03:08 +0000 To: "commits@camel.apache.org" Subject: [camel] 44/45: Fixed JPA conflicting package MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: acosentino@apache.org In-Reply-To: <153987854483.24578.6070086575593465941@gitbox.apache.org> References: <153987854483.24578.6070086575593465941@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/sandbox/camel-3.x X-Git-Reftype: branch X-Git-Rev: 35bc796d111b1888e272fb22f00f80eea223f65f X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181018160229.0BE7785860@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 35bc796d111b1888e272fb22f00f80eea223f65f Author: Andrea Cosentino AuthorDate: Thu Oct 18 16:09:17 2018 +0200 Fixed JPA conflicting package --- .../camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java index 3afb7ee..844b947 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jpa.JpaConstants; import org.apache.camel.examples.Customer; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.util.ServiceHelper; +import org.apache.camel.support.ServiceHelper; import org.junit.After; import org.junit.Assert; import org.junit.Before;