You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2026/07/06 13:24:31 UTC
(camel) branch ci-is-failing-on-all-prs-due-to-uncommitted-format created (now c0a3d8950975)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch ci-is-failing-on-all-prs-due-to-uncommitted-format
in repository https://gitbox.apache.org/repos/asf/camel.git
at c0a3d8950975 chore: Fix uncommitted formatter changes breaking CI on all PRs
This branch includes the following new commits:
new c0a3d8950975 chore: Fix uncommitted formatter changes breaking CI on all PRs
The 1 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/01: chore: Fix uncommitted formatter changes breaking CI on all PRs
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch ci-is-failing-on-all-prs-due-to-uncommitted-format
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c0a3d895097595038187ac408f207985a4cac5ff
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 6 13:24:08 2026 +0000
chore: Fix uncommitted formatter changes breaking CI on all PRs
Commit cdaf5a8b8b4 (CAMEL-19807) introduced Javadoc and string
concatenation formatting that differs from what the project formatter
produces. The CI step "Fail if there are uncommitted changes" detects
these differences after running the formatter, causing all PR builds
to fail.
Run `mvn formatter:format impsort:sort` on the two affected modules
to align the code with the project's formatting rules.
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../src/main/java/org/apache/camel/model/app/BeansDefinition.java | 8 ++++----
.../java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/app/BeansDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/app/BeansDefinition.java
index ad2cc3f95859..6643d11f6eb3 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/app/BeansDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/app/BeansDefinition.java
@@ -143,8 +143,8 @@ public class BeansDefinition {
}
/**
- * @deprecated use standard Camel XML DSL (camel-xml-io) instead of legacy Spring/Blueprint XML.
- * This feature will be removed in a future release.
+ * @deprecated use standard Camel XML DSL (camel-xml-io) instead of legacy Spring/Blueprint XML. This feature will
+ * be removed in a future release.
*/
@Deprecated(since = "4.22")
public List<Element> getSpringOrBlueprintBeans() {
@@ -152,8 +152,8 @@ public class BeansDefinition {
}
/**
- * @deprecated use standard Camel XML DSL (camel-xml-io) instead of legacy Spring/Blueprint XML.
- * This feature will be removed in a future release.
+ * @deprecated use standard Camel XML DSL (camel-xml-io) instead of legacy Spring/Blueprint XML. This feature will
+ * be removed in a future release.
*/
@Deprecated(since = "4.22")
public void setSpringOrBlueprintBeans(List<Element> springOrBlueprintBeans) {
diff --git a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
index 1c07e3b8a49f..181aea18d486 100644
--- a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
+++ b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
@@ -398,7 +398,7 @@ public class XmlRoutesBuilderLoader extends RouteBuilderLoaderSupport {
springBlueprintWarned = true;
LOG.warn(
"Detected legacy Spring <beans> or OSGi <blueprint> XML. This feature is deprecated and will be removed in a future release."
- + " Migrate to standard Camel XML DSL (camel-xml-io).");
+ + " Migrate to standard Camel XML DSL (camel-xml-io).");
}
Document doc = app.getSpringOrBlueprintBeans().get(0).getOwnerDocument();
String ns = doc.getDocumentElement().getNamespaceURI();