Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 3AF94182E9 for ; Fri, 9 Oct 2015 18:24:07 +0000 (UTC) Received: (qmail 10768 invoked by uid 500); 9 Oct 2015 18:24:06 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 10640 invoked by uid 500); 9 Oct 2015 18:24:06 -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 10444 invoked by uid 99); 9 Oct 2015 18:24:06 -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; Fri, 09 Oct 2015 18:24:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47D0EE03BE; Fri, 9 Oct 2015 18:24:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acosentino@apache.org To: commits@camel.apache.org Date: Fri, 09 Oct 2015 18:24:07 -0000 Message-Id: <2c9250dbea0e492c96e6cc960b6b4be6@git.apache.org> In-Reply-To: <1141b296de6447cdbb528adeb54cddeb@git.apache.org> References: <1141b296de6447cdbb528adeb54cddeb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] camel git commit: Upgrade Optaplanner to version 6.3.0.Final Upgrade Optaplanner to version 6.3.0.Final Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c1cd0dd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c1cd0dd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c1cd0dd Branch: refs/heads/master Commit: 2c1cd0ddfb1f06b898d128f1e1941595d3f61e1d Parents: ed601fb Author: Andrea Cosentino Authored: Fri Oct 9 20:22:51 2015 +0200 Committer: Andrea Cosentino Committed: Fri Oct 9 20:22:51 2015 +0200 ---------------------------------------------------------------------- .../component/optaplanner/OptaPlannerConsumerTest.java | 11 ----------- .../optaplanner/OptaPlannerDaemonSolverTest.java | 6 +++--- parent/pom.xml | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2c1cd0dd/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java index 2e86201..19fd296 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java @@ -16,21 +16,10 @@ */ package org.apache.camel.component.optaplanner; -import java.util.ArrayList; -import java.util.Iterator; - -import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit4.CamelTestSupport; -import org.apache.commons.lang.ObjectUtils; -import org.junit.Ignore; import org.junit.Test; -import org.optaplanner.core.impl.score.director.ScoreDirector; -import org.optaplanner.core.impl.solver.ProblemFactChange; import org.optaplanner.examples.cloudbalancing.domain.CloudBalance; -import org.optaplanner.examples.cloudbalancing.domain.CloudComputer; -import org.optaplanner.examples.cloudbalancing.domain.CloudProcess; import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator; /** http://git-wip-us.apache.org/repos/asf/camel/blob/2c1cd0dd/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java index 596fd16..663776f 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java @@ -21,7 +21,7 @@ import java.util.Iterator; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit4.CamelTestSupport; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.junit.Test; import org.optaplanner.core.impl.score.director.ScoreDirector; import org.optaplanner.core.impl.solver.ProblemFactChange; @@ -46,7 +46,7 @@ public class OptaPlannerDaemonSolverTest extends CamelTestSupport { template.requestBody("direct:in", planningProblem); getMockEndpoint("mock:result").assertIsSatisfied(); getMockEndpoint("mock:result").reset(); - getMockEndpoint("mock:result").setExpectedCount(1); + getMockEndpoint("mock:result").setExpectedCount(0); template.requestBody("direct:in", new ProblemFactChange() { @Override @@ -77,7 +77,7 @@ public class OptaPlannerDaemonSolverTest extends CamelTestSupport { getMockEndpoint("mock:result").assertIsSatisfied(); CloudBalance bestSolution = (CloudBalance) template.requestBody("direct:in", "foo"); - assertEquals(3, bestSolution.getComputerList().size()); + assertEquals(4, bestSolution.getComputerList().size()); } protected RouteBuilder createRouteBuilder() { http://git-wip-us.apache.org/repos/asf/camel/blob/2c1cd0dd/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2e17c54..636555c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -391,7 +391,7 @@ 4.7.2 2.4.0 2.7.0.Final - 6.2.0.Final + 6.3.0.Final 2.0.8_6 2.4_5 4.3.1