This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 211c68e31e5 Regen 211c68e31e5 is described below commit 211c68e31e5a809f5821a2836e13af077d2da743 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Aug 7 11:53:59 2023 +0200 Regen --- .../component/xmpp/XmppDeferredConnectionIT.java | 2 +- .../xmpp/integration/XmppMultiUserChatIT.java | 19 +++++++++---------- .../xmpp/integration/XmppProducerConcurrentIT.java | 2 +- .../component/xmpp/integration/XmppRouteChatIT.java | 2 +- .../camel/component/xmpp/integration/XmppRouteIT.java | 2 +- .../XmppRouteMultipleProducersSingleConsumerIT.java | 2 +- .../camel/maven/bom/generator/BomGeneratorMojo.java | 3 +-- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionIT.java index c9db21ac461..0a994c6bde2 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionIT.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionIT.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; * expected. */ @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", - disabledReason = "Github environment has trouble running the XMPP test container and/or component") + disabledReason = "Github environment has trouble running the XMPP test container and/or component") public class XmppDeferredConnectionIT extends XmppBaseContainerTest { private static final Logger LOG = LoggerFactory.getLogger(XmppDeferredConnectionIT.class); diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppMultiUserChatIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppMultiUserChatIT.java index c5879596650..b65449c2dc3 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppMultiUserChatIT.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppMultiUserChatIT.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", - disabledReason = "Github environment has trouble running the XMPP test container and/or component") + disabledReason = "Github environment has trouble running the XMPP test container and/or component") class XmppMultiUserChatIT extends XmppBaseIT { private static final String BODY_1 = "the first message"; @@ -36,7 +36,7 @@ class XmppMultiUserChatIT extends XmppBaseIT { private CountDownLatch latch = new CountDownLatch(2); @BeforeEach - void doSetup(){ + void doSetup() { template.sendBody("direct:toProducer", BODY_1); template.sendBody("direct:toProducer", BODY_2); } @@ -44,16 +44,16 @@ class XmppMultiUserChatIT extends XmppBaseIT { @Test void testXmppChat() throws Exception { - MockEndpoint consumerEndpoint = context.getEndpoint("mock:out", MockEndpoint.class); - consumerEndpoint.expectedBodiesReceived(BODY_1, BODY_2); + MockEndpoint consumerEndpoint = context.getEndpoint("mock:out", MockEndpoint.class); + consumerEndpoint.expectedBodiesReceived(BODY_1, BODY_2); - if (!latch.await(5, TimeUnit.SECONDS)) { - Assertions.fail("Some error"); - } + if (!latch.await(5, TimeUnit.SECONDS)) { + Assertions.fail("Some error"); + } - consumerEndpoint.setResultWaitTime(TimeUnit.MINUTES.toMillis(1)); + consumerEndpoint.setResultWaitTime(TimeUnit.MINUTES.toMillis(1)); - consumerEndpoint.assertIsSatisfied(); + consumerEndpoint.assertIsSatisfied(); } @Override @@ -61,7 +61,6 @@ class XmppMultiUserChatIT extends XmppBaseIT { return new RouteBuilder() { public void configure() { - from("direct:toProducer") .process(e -> latch.countDown()) .to(getProducerUri()); diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppProducerConcurrentIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppProducerConcurrentIT.java index 9bcea0a2e03..573dbc004e5 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppProducerConcurrentIT.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppProducerConcurrentIT.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import static org.apache.camel.test.junit5.TestSupport.body; @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", - disabledReason = "Github environment has trouble running the XMPP test container and/or component") + disabledReason = "Github environment has trouble running the XMPP test container and/or component") public class XmppProducerConcurrentIT extends XmppBaseIT { @Test diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteChatIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteChatIT.java index be6f16526ca..71f88406854 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteChatIT.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteChatIT.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", - disabledReason = "Github environment has trouble running the XMPP test container and/or component") + disabledReason = "Github environment has trouble running the XMPP test container and/or component") public class XmppRouteChatIT extends XmppBaseIT { protected MockEndpoint consumerEndpoint; diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteIT.java index 8b9d4a95ddc..3508fb65fd2 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteIT.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteIT.java @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", - disabledReason = "Github environment has trouble running the XMPP test container and/or component") + disabledReason = "Github environment has trouble running the XMPP test container and/or component") public class XmppRouteIT extends XmppBaseIT { private static final Logger LOG = LoggerFactory.getLogger(XmppRouteIT.class); diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteMultipleProducersSingleConsumerIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteMultipleProducersSingleConsumerIT.java index 4fd43234bae..7ba83b275cd 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteMultipleProducersSingleConsumerIT.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteMultipleProducersSingleConsumerIT.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", - disabledReason = "Github environment has trouble running the XMPP test container and/or component") + disabledReason = "Github environment has trouble running the XMPP test container and/or component") public class XmppRouteMultipleProducersSingleConsumerIT extends XmppBaseIT { protected MockEndpoint goodEndpoint; protected MockEndpoint badEndpoint; diff --git a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java index 08c17e11c46..eb68df235d8 100644 --- a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java +++ b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java @@ -430,8 +430,7 @@ public class BomGeneratorMojo extends AbstractMojo { private Artifact resolveArtifact(String groupId, String artifactId, String version, String type) throws Exception { Artifact art = artifactFactory.createArtifact(groupId, artifactId, version, "runtime", type); - ProjectBuildingRequest buildingRequest = - new DefaultProjectBuildingRequest(session.getProjectBuildingRequest()); + ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest(session.getProjectBuildingRequest()); buildingRequest .setRemoteRepositories(remoteRepositories) .setLocalRepository(localRepository);