You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/08/07 10:20:02 UTC
[camel] branch assembly created (now c451f78a524)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch assembly
in repository https://gitbox.apache.org/repos/asf/camel.git
at c451f78a524 Regen
This branch includes the following new commits:
new 6ccf561fdfd CAMEL-19649: Cleanup apache-camel
new 7b02f6bfdf2 CAMEL-19649: Add apache-camel as module in root to be included
new c451f78a524 Regen
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/03: CAMEL-19649: Cleanup apache-camel
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch assembly
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6ccf561fdfd5e0b4dbb12e5b00072609b01b23df
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 7 11:33:06 2023 +0200
CAMEL-19649: Cleanup apache-camel
---
apache-camel/src/main/descriptors/src.xml | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/apache-camel/src/main/descriptors/src.xml b/apache-camel/src/main/descriptors/src.xml
index 59da2fc98af..33659e40a86 100644
--- a/apache-camel/src/main/descriptors/src.xml
+++ b/apache-camel/src/main/descriptors/src.xml
@@ -23,7 +23,6 @@
<format>zip</format>
</formats>
<fileSets>
- <!-- Binary Files -->
<fileSet>
<directory>..</directory>
<outputDirectory></outputDirectory>
@@ -33,32 +32,23 @@
<excludes>
<exclude>**/eclipse-classes/**</exclude>
<exclude>**/target/**</exclude>
-
<exclude>**/build/**</exclude>
- <!-- exclude>data/**</exclude>
- <exclude>*/data/**</exclude -->
<exclude>activemq-data/**</exclude>
<exclude>*/activemq-data/**</exclude>
<exclude>**/eclipse-classes/**</exclude>
<exclude>**/.*</exclude>
<exclude>**/.*/**</exclude>
-
<exclude>**/surefire*</exclude>
- <exclude>**/svn-commit*</exclude>
-
<exclude>**/.idea/**</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.ipr</exclude>
<exclude>**/*.iws</exclude>
-
<exclude>**/cobertura.ser</exclude>
-
<exclude>**/node_modules/**</exclude>
- <exclude>docs/node/**</exclude>
- <exclude>docs/.yarn/**</exclude>
+ <exclude>**/docs/node/**</exclude>
+ <exclude>**/docs/.yarn/**</exclude>
<exclude>**/.flattened-pom.xml</exclude>
</excludes>
</fileSet>
-
</fileSets>
</assembly>
[camel] 02/03: CAMEL-19649: Add apache-camel as module in root to be included
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch assembly
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7b02f6bfdf2638a294c8b1c3330f1598729785fd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 7 11:56:43 2023 +0200
CAMEL-19649: Add apache-camel as module in root to be included
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 4941ffc1935..f2b7b54fcf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
<module>archetypes</module>
<module>tests</module>
<module>docs</module>
+ <module>apache-camel</module>
</modules>
<scm>
[camel] 03/03: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch assembly
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c451f78a524ade071873c31585b5d5f59ed12e2f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 7 12:16:40 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);