[camel] branch camel-3.x updated: CAMEL-18983: camel-jbang - Automatic detect atlassian maven repo when using camel-jira
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 37d61676d8a CAMEL-18983: camel-jbang - Automatic detect atlassian
maven repo when using camel-jira
37d61676d8a is described below
commit 37d61676d8a8fc29a99165cb8047bee0e8e754e1
Author: Claus Ibsen
AuthorDate: Mon Mar 6 08:57:50 2023 +0100
CAMEL-18983: camel-jbang - Automatic detect atlassian maven repo when using
camel-jira
---
.../java/org/apache/camel/main/KameletMain.java| 4 ++
.../camel/main/download/DependencyDownloader.java | 10
.../camel/main/download/KnownReposResolver.java| 64 ++
.../main/download/MavenDependencyDownloader.java | 59 ++--
.../resources/camel-main-known-repos.properties| 18 ++
5 files changed, 151 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index 611214f32fb..c5abe8e204c 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -49,6 +49,7 @@ import org.apache.camel.main.download.DownloadListener;
import org.apache.camel.main.download.DownloadModelineParser;
import org.apache.camel.main.download.KameletMainInjector;
import org.apache.camel.main.download.KnownDependenciesResolver;
+import org.apache.camel.main.download.KnownReposResolver;
import org.apache.camel.main.download.MavenDependencyDownloader;
import org.apache.camel.main.download.TypeConverterLoaderDownloadListener;
import org.apache.camel.main.http.VertxHttpServer;
@@ -308,7 +309,10 @@ public class KameletMain extends MainCommandLineSupport {
answer.getPackageScanClassResolver().addClassLoader(dynamicCL);
answer.getPackageScanResourceResolver().addClassLoader(dynamicCL);
+KnownReposResolver known = new KnownReposResolver(camelContext);
+known.loadKnownDependencies();
MavenDependencyDownloader downloader = new
MavenDependencyDownloader();
+downloader.setKnownReposResolver(known);
downloader.setClassLoader(dynamicCL);
downloader.setCamelContext(answer);
downloader.setRepos(repos);
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
index cce2e991f6e..1ebf173e5a3 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
@@ -81,6 +81,16 @@ public interface DependencyDownloader extends
CamelContextAware, StaticService {
*/
void downloadDependency(String groupId, String artifactId, String version);
+/**
+ * Downloads the dependency incl transitive dependencies
+ *
+ * @param groupIdmaven group id
+ * @param artifactId maven artifact id
+ * @param versionmaven version
+ * @param extraRepos additional remote maven repositories to use when
downloading
+ */
+void downloadDependency(String groupId, String artifactId, String version,
String extraRepos);
+
/**
* Downloads the dependency
*
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java
new file mode 100644
index 000..fc5626010f1
--- /dev/null
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.main.download;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import
[camel] branch main updated: CAMEL-18983: camel-jbang - Automatic detect atlassian maven repo when using camel-jira
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 bd79f14f815 CAMEL-18983: camel-jbang - Automatic detect atlassian
maven repo when using camel-jira
bd79f14f815 is described below
commit bd79f14f815d109f8776f4f9f7ef98d4c88ebd1f
Author: Claus Ibsen
AuthorDate: Mon Mar 6 08:57:50 2023 +0100
CAMEL-18983: camel-jbang - Automatic detect atlassian maven repo when using
camel-jira
---
.../java/org/apache/camel/main/KameletMain.java| 4 ++
.../camel/main/download/DependencyDownloader.java | 10
.../camel/main/download/KnownReposResolver.java| 64 ++
.../main/download/MavenDependencyDownloader.java | 59 ++--
.../resources/camel-main-known-repos.properties| 18 ++
5 files changed, 151 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index bdd6aafdf68..0ec69e2d310 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -48,6 +48,7 @@ import org.apache.camel.main.download.DownloadListener;
import org.apache.camel.main.download.DownloadModelineParser;
import org.apache.camel.main.download.KameletMainInjector;
import org.apache.camel.main.download.KnownDependenciesResolver;
+import org.apache.camel.main.download.KnownReposResolver;
import org.apache.camel.main.download.MavenDependencyDownloader;
import org.apache.camel.main.download.TypeConverterLoaderDownloadListener;
import org.apache.camel.main.http.VertxHttpServer;
@@ -307,7 +308,10 @@ public class KameletMain extends MainCommandLineSupport {
answer.getCamelContextExtension().getPackageScanClassResolver().addClassLoader(dynamicCL);
answer.getCamelContextExtension().getPackageScanResourceResolver().addClassLoader(dynamicCL);
+KnownReposResolver known = new KnownReposResolver(camelContext);
+known.loadKnownDependencies();
MavenDependencyDownloader downloader = new
MavenDependencyDownloader();
+downloader.setKnownReposResolver(known);
downloader.setClassLoader(dynamicCL);
downloader.setCamelContext(answer);
downloader.setRepos(repos);
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
index cce2e991f6e..1ebf173e5a3 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
@@ -81,6 +81,16 @@ public interface DependencyDownloader extends
CamelContextAware, StaticService {
*/
void downloadDependency(String groupId, String artifactId, String version);
+/**
+ * Downloads the dependency incl transitive dependencies
+ *
+ * @param groupIdmaven group id
+ * @param artifactId maven artifact id
+ * @param versionmaven version
+ * @param extraRepos additional remote maven repositories to use when
downloading
+ */
+void downloadDependency(String groupId, String artifactId, String version,
String extraRepos);
+
/**
* Downloads the dependency
*
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java
new file mode 100644
index 000..fc5626010f1
--- /dev/null
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.main.download;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import
[camel] branch regen_bot_3x updated (1de7b842d40 -> 788df1eab2e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from 1de7b842d40 CAMEL-19112: camel init - Should work with xxx.camel.yaml file names also add 80fb9cf8965 CAMEL-19017: Using tracing should output headers by default. add 788df1eab2e CAMEL-19017: Using tracing should output headers by default. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/impl/engine/DefaultTracer.java | 2 +- docs/user-manual/modules/ROOT/pages/tracer.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (7576906192c -> eb1d593b18f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 7576906192c Build archetypes later as it depend on catalog to be built first add 98426924c09 CAMEL-19017: Using tracing should output headers by default. add eb1d593b18f CAMEL-19017: Using tracing should output headers by default. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/impl/engine/DefaultTracer.java | 2 +- docs/user-manual/modules/ROOT/pages/tracer.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch camel-3.x updated (1de7b842d40 -> 788df1eab2e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git from 1de7b842d40 CAMEL-19112: camel init - Should work with xxx.camel.yaml file names also new 80fb9cf8965 CAMEL-19017: Using tracing should output headers by default. new 788df1eab2e CAMEL-19017: Using tracing should output headers by default. The 2 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. Summary of changes: .../src/main/java/org/apache/camel/impl/engine/DefaultTracer.java | 2 +- docs/user-manual/modules/ROOT/pages/tracer.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 01/02: CAMEL-19017: Using tracing should output headers by default.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 80fb9cf8965161a79cab2c8820b1404b2ee40840 Author: Claus Ibsen AuthorDate: Mon Mar 6 08:09:51 2023 +0100 CAMEL-19017: Using tracing should output headers by default. --- .../src/main/java/org/apache/camel/impl/engine/DefaultTracer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java index 6d25689fd5c..c41bcf034a7 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java @@ -65,7 +65,7 @@ public class DefaultTracer extends ServiceSupport implements CamelContextAware, formatter.setShowExchangeId(true); formatter.setShowExchangePattern(false); formatter.setMultiline(false); -formatter.setShowHeaders(false); +formatter.setShowHeaders(true); formatter.setStyle(DefaultExchangeFormatter.OutputStyle.Default); setExchangeFormatter(formatter); }
[camel] 02/02: CAMEL-19017: Using tracing should output headers by default.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 788df1eab2ef46b352e1cb150274129880ae5b2e Author: Claus Ibsen AuthorDate: Mon Mar 6 08:10:55 2023 +0100 CAMEL-19017: Using tracing should output headers by default. --- docs/user-manual/modules/ROOT/pages/tracer.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/tracer.adoc b/docs/user-manual/modules/ROOT/pages/tracer.adoc index a2845c74a8c..7d22edaa451 100644 --- a/docs/user-manual/modules/ROOT/pages/tracer.adoc +++ b/docs/user-manual/modules/ROOT/pages/tracer.adoc @@ -1,7 +1,7 @@ = Tracer Camel's tracer is used for logging message details during routing, where -you can see the route path of each message as they happen. Details of the message is also logged such as the message body. +you can see the route path of each message as they happen. Details of the message is also logged such as the message body, and headers. TIP: There is an alternative tracer that captures the messages in a xref:backlog-tracer.adoc[Backlog Tracer].
[camel] 02/02: CAMEL-19017: Using tracing should output headers by default.
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 commit eb1d593b18fb3b5855176b0aa068c3f7089fa67e Author: Claus Ibsen AuthorDate: Mon Mar 6 08:10:55 2023 +0100 CAMEL-19017: Using tracing should output headers by default. --- docs/user-manual/modules/ROOT/pages/tracer.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/tracer.adoc b/docs/user-manual/modules/ROOT/pages/tracer.adoc index a2845c74a8c..7d22edaa451 100644 --- a/docs/user-manual/modules/ROOT/pages/tracer.adoc +++ b/docs/user-manual/modules/ROOT/pages/tracer.adoc @@ -1,7 +1,7 @@ = Tracer Camel's tracer is used for logging message details during routing, where -you can see the route path of each message as they happen. Details of the message is also logged such as the message body. +you can see the route path of each message as they happen. Details of the message is also logged such as the message body, and headers. TIP: There is an alternative tracer that captures the messages in a xref:backlog-tracer.adoc[Backlog Tracer].
[camel] 01/02: CAMEL-19017: Using tracing should output headers by default.
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 commit 98426924c09143ea918b3d34926c2a07c64308e7 Author: Claus Ibsen AuthorDate: Mon Mar 6 08:09:51 2023 +0100 CAMEL-19017: Using tracing should output headers by default. --- .../src/main/java/org/apache/camel/impl/engine/DefaultTracer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java index 451f526bf0b..51f42e5358e 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java @@ -64,7 +64,7 @@ public class DefaultTracer extends ServiceSupport implements CamelContextAware, formatter.setShowExchangeId(true); formatter.setShowExchangePattern(false); formatter.setMultiline(false); -formatter.setShowHeaders(false); +formatter.setShowHeaders(true); formatter.setStyle(DefaultExchangeFormatter.OutputStyle.Default); setExchangeFormatter(formatter); }
[camel] branch main updated (7576906192c -> eb1d593b18f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 7576906192c Build archetypes later as it depend on catalog to be built first new 98426924c09 CAMEL-19017: Using tracing should output headers by default. new eb1d593b18f CAMEL-19017: Using tracing should output headers by default. The 2 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. Summary of changes: .../src/main/java/org/apache/camel/impl/engine/DefaultTracer.java | 2 +- docs/user-manual/modules/ROOT/pages/tracer.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (dfdd5b1274a -> 7576906192c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from dfdd5b1274a CAMEL-19087: camel trace - Added pretty option add 5a5de86ec15 CAMEL-19117: camel-catalog - Remove archetypeAsXml from CamelCatalog add 7576906192c Build archetypes later as it depend on catalog to be built first No new revisions were added by this update. Summary of changes: .../camel/catalog/archetypes/archetype-catalog.xml | 41 -- .../org/apache/camel/catalog/CamelCatalog.java | 7 .../apache/camel/catalog/DefaultCamelCatalog.java | 36 ++- .../org/apache/camel/catalog/CamelCatalogTest.java | 6 .../ROOT/pages/camel-4-migration-guide.adoc| 1 + pom.xml| 2 +- .../camel/maven/packaging/PrepareCatalogMojo.java | 23 7 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
[camel] 01/02: CAMEL-19117: camel-catalog - Remove archetypeAsXml from CamelCatalog
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
commit 5a5de86ec15e32dc1a1445878e675d5b98a7ad38
Author: Claus Ibsen
AuthorDate: Sun Mar 5 21:44:41 2023 +0100
CAMEL-19117: camel-catalog - Remove archetypeAsXml from CamelCatalog
---
.../camel/catalog/archetypes/archetype-catalog.xml | 41 --
.../org/apache/camel/catalog/CamelCatalog.java | 7
.../apache/camel/catalog/DefaultCamelCatalog.java | 36 ++-
.../org/apache/camel/catalog/CamelCatalogTest.java | 6
.../ROOT/pages/camel-4-migration-guide.adoc| 1 +
.../camel/maven/packaging/PrepareCatalogMojo.java | 23
6 files changed, 3 insertions(+), 111 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
deleted file mode 100644
index b68f1eb6904..000
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
- org.apache.camel.archetypes
- camel-archetype-api-component
- 4.0.0-SNAPSHOT
- Creates a new Camel component that wraps one or more API
proxies.
-
-
- org.apache.camel.archetypes
- camel-archetype-component
- 4.0.0-SNAPSHOT
- Creates a new Camel component.
-
-
- org.apache.camel.archetypes
- camel-archetype-dataformat
- 4.0.0-SNAPSHOT
- Creates a new Camel data format.
-
-
- org.apache.camel.archetypes
- camel-archetype-java
- 4.0.0-SNAPSHOT
- Creates a new Camel project using Java DSL.
-
-
- org.apache.camel.archetypes
- camel-archetype-main
- 4.0.0-SNAPSHOT
- Creates a new Camel project using standalone Camel
Main.
-
-
- org.apache.camel.archetypes
- camel-archetype-spring
- 4.0.0-SNAPSHOT
- Creates a new Camel project with added Spring DSL
support.
-
-
-
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index ff9bcf1d13c..bd09766368c 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -321,13 +321,6 @@ public interface CamelCatalog {
*/
Set findOtherLabels();
-/**
- * Returns the Apache Camel Maven Archetype catalog in XML format.
- *
- * @return the catalog in XML
- */
-String archetypeCatalogAsXml();
-
/**
* Returns the Camel Spring XML schema
*
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 5f6c2078446..f093d8c75e4 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.catalog;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -34,13 +33,6 @@ import java.util.regex.PatternSyntaxException;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathFactory;
-
-import org.w3c.dom.Document;
-
import org.apache.camel.catalog.impl.AbstractCamelCatalog;
import org.apache.camel.catalog.impl.CatalogHelper;
import org.apache.camel.tooling.model.ArtifactModel;
@@ -60,7 +52,6 @@ import org.apache.camel.util.json.JsonObject;
public class DefaultCamelCatalog extends AbstractCamelCatalog implements
CamelCatalog {
private static final String MODELS_CATALOG =
"org/apache/camel/catalog/models.properties";
-private static final String ARCHETYPES_CATALOG =
"org/apache/camel/catalog/archetypes/archetype-catalog.xml";
private static final String SCHEMAS_XML =
"org/apache/camel/catalog/schemas";
private static final String MAIN_DIR = "org/apache/camel/catalog/main";
@@ -392,11 +383,6 @@ public class DefaultCamelCatalog extends
AbstractCamelCatalog implements CamelCa
return answer;
}
-@Override
-public String archetypeCatalogAsXml() {
-return cache(ARCHETYPES_CATALOG, this::loadResource);
-}
-
@Override
public String springSchemaAsXml() {
return cache(SCHEMAS_XML + "/camel-spring.xsd", this::loadResource);
@@ -457,11 +443,11 @@ public class DefaultCamelCatalog
[camel] 02/02: Build archetypes later as it depend on catalog to be built first
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 commit 7576906192c8c4b2f8edf6032841aa27f9fab8e1 Author: Claus Ibsen AuthorDate: Sun Mar 5 21:45:37 2023 +0100 Build archetypes later as it depend on catalog to be built first --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b7af08571ba..beaa1437ded 100644 --- a/pom.xml +++ b/pom.xml @@ -76,10 +76,10 @@ core test-infra components -archetypes catalog camel-dependencies dsl +archetypes tests docs
[camel] branch main updated (dfdd5b1274a -> 7576906192c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from dfdd5b1274a CAMEL-19087: camel trace - Added pretty option new 5a5de86ec15 CAMEL-19117: camel-catalog - Remove archetypeAsXml from CamelCatalog new 7576906192c Build archetypes later as it depend on catalog to be built first The 2 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. Summary of changes: .../camel/catalog/archetypes/archetype-catalog.xml | 41 -- .../org/apache/camel/catalog/CamelCatalog.java | 7 .../apache/camel/catalog/DefaultCamelCatalog.java | 36 ++- .../org/apache/camel/catalog/CamelCatalogTest.java | 6 .../ROOT/pages/camel-4-migration-guide.adoc| 1 + pom.xml| 2 +- .../camel/maven/packaging/PrepareCatalogMojo.java | 23 7 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 880eed1d6b Updated CHANGELOG.md 880eed1d6b is described below commit 880eed1d6b7849f9ff7eac87b2774277a078d834 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Mar 6 03:22:06 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e34beca2fc..8c8e696853 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,6 +81,7 @@ **Merged pull requests:** +- Generated sources regen for SBOM [\#4623](https://github.com/apache/camel-quarkus/pull/4623) ([github-actions[bot]](https://github.com/apps/github-actions)) - Bump to CycloneDX Maven Plugin 2.7.5 [\#4618](https://github.com/apache/camel-quarkus/pull/4618) ([oscerd](https://github.com/oscerd)) - Aws2-cw: remove io.quarkus:quarkus-jaxp from aws2-cw \#4614 [\#4615](https://github.com/apache/camel-quarkus/pull/4615) ([JiriOndrusek](https://github.com/JiriOndrusek)) - Upgrade to cq-maven-plugin 3.5.4 [\#4613](https://github.com/apache/camel-quarkus/pull/4613) ([ppalaga](https://github.com/ppalaga))
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1455366657 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 4339348274-1047-f3c3d2dc-5fd2-4988-b7d3-a9e3f72b7593 * Camel Quarkus Commit: 9577f338e7096dd990de13143e0b92a081259dd1 * Quarkus Main Commit: d2a63d12ff12c9f5409602a41ee82cd6aab28cf9 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/4339348274 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch dependabot/go_modules/golang.org/x/oauth2-0.6.0 created (now 951d31efa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/golang.org/x/oauth2-0.6.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 951d31efa chore(deps): bump golang.org/x/oauth2 from 0.5.0 to 0.6.0 No new revisions were added by this update.
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #4103: chore(deps): bump golang.org/x/oauth2 from 0.5.0 to 0.6.0
dependabot[bot] opened a new pull request, #4103: URL: https://github.com/apache/camel-k/pull/4103 Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.5.0 to 0.6.0. Commits https://github.com/golang/oauth2/commit/62b4eedd7210c3ff2fc694318a8a312b96f01a74;>62b4eed go.mod: update golang.org/x dependencies https://github.com/golang/oauth2/commit/885f294722cab86dbe73633465663b9a43e3ba78;>885f294 google: Add support for OAuth2 token exchange over mTLS https://github.com/golang/oauth2/commit/6f9c1a18cc48103b815a810b907f038d953749a9;>6f9c1a1 google: use Credentials instead of deprecated DefaultCredentials https://github.com/golang/oauth2/commit/c82d0e16dcd7c2b3907866fc2124725806a3ed67;>c82d0e1 google/internal/externalaccount: Removed URL validation for google URLs in AD... See full diff in https://github.com/golang/oauth2/compare/v0.5.0...v0.6.0;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (7ba7c8b3417 -> dfdd5b1274a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 7ba7c8b3417 Regen SBOM from commit 93e3d74d5f43568879e458661fcf9a70a284b500 add dfdd5b1274a CAMEL-19087: camel trace - Added pretty option No new revisions were added by this update. Summary of changes: .../apache/camel/util/xml/XmlPrettyPrinter.java| 182 + .../camel/util/xml/XmlPrettyPrinterTest.java | 53 ++ .../core/commands/action/CamelTraceAction.java | 23 ++- .../camel/dsl/jbang/core/common/XmlHelper.java | 34 4 files changed, 291 insertions(+), 1 deletion(-) create mode 100644 core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlPrettyPrinter.java create mode 100644 core/camel-xml-jaxp/src/test/java/org/apache/camel/util/xml/XmlPrettyPrinterTest.java
[camel] branch main updated: CAMEL-19087: camel trace - Added pretty option
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 dfdd5b1274a CAMEL-19087: camel trace - Added pretty option
dfdd5b1274a is described below
commit dfdd5b1274a5170da5e78c3679ea7e7d52bb31e8
Author: Claus Ibsen
AuthorDate: Sun Mar 5 21:06:44 2023 +0100
CAMEL-19087: camel trace - Added pretty option
---
.../apache/camel/util/xml/XmlPrettyPrinter.java| 182 +
.../camel/util/xml/XmlPrettyPrinterTest.java | 53 ++
.../core/commands/action/CamelTraceAction.java | 23 ++-
.../camel/dsl/jbang/core/common/XmlHelper.java | 34
4 files changed, 291 insertions(+), 1 deletion(-)
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlPrettyPrinter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlPrettyPrinter.java
new file mode 100644
index 000..23a91a2081b
--- /dev/null
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlPrettyPrinter.java
@@ -0,0 +1,182 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.util.xml;
+
+import java.io.ByteArrayInputStream;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import static org.apache.camel.util.StringHelper.padString;
+
+public final class XmlPrettyPrinter {
+
+@FunctionalInterface
+public interface ColorPrintElement {
+
+int DECLARATION = 1;
+int ELEMENT = 2;
+int ATTRIBUTE_KEY = 3;
+int ATTRIBUTE_VALUE = 4;
+int ATTRIBUTE_EQUAL = 5;
+int ATTRIBUTE_QUOTE = 6;
+int VALUE = 7;
+
+String color(int type, String value);
+}
+
+public static String colorPrint(String xml, int blanks, boolean
declaration, ColorPrintElement color)
+throws Exception {
+return doParse(xml, blanks, declaration, color);
+}
+
+/**
+ * Pretty print the XML (does not use DOM or any kind of parser)
+ *
+ * @param xmlthe XML
+ * @param blanks number of blanks to use as indent
+ * @returnthe XML in pretty, without XML declaration
+ */
+public static String pettyPrint(String xml, int blanks) throws Exception {
+return doParse(xml, blanks, false, new NoopColor());
+}
+
+/**
+ * Pretty print the XML (does not use DOM or any kind of parser)
+ *
+ * @param xml the XML
+ * @param blanks number of blanks to use as indent
+ * @param declaration whether to include XML declaration
+ * @return the XML in pretty
+ */
+public static String pettyPrint(String xml, int blanks, boolean
declaration) throws Exception {
+return doParse(xml, blanks, declaration, new NoopColor());
+}
+
+private static class NoopColor implements ColorPrintElement {
+
+@Override
+public String color(int type, String value) {
+return value;
+}
+}
+
+private static String doParse(String xml, int blanks, boolean declaration,
ColorPrintElement color) throws Exception {
+SAXParser parser;
+final SAXParserFactory factory = SAXParserFactory.newInstance();
+factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+
factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl;,
true);
+factory.setFeature("http://xml.org/sax/features/namespaces;, false);
+factory.setFeature("http://xml.org/sax/features/validation;, false);
+
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar;,
false);
+
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd;,
false);
+
factory.setFeature("http://xml.org/sax/features/external-parameter-entities;,
false);
+
factory.setFeature("http://xml.org/sax/features/external-general-entities;,
false);
+parser
[GitHub] [camel-spring-boot] oscerd merged pull request #772: [Github Actions] Periodic Sync Camel Spring Boot SBOM (Camel 4)
oscerd merged PR #772: URL: https://github.com/apache/camel-spring-boot/pull/772 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch automatic-periodic-sync updated (97c5fecef49 -> 151d6fbe4b7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 97c5fecef49 CAMEL-19110: Upgrade Spring Boot to 3.0.4 (#771) add 151d6fbe4b7 [create-pull-request] automated change No new revisions were added by this update. Summary of changes: camel-spring-boot-sbom/camel-spring-boot-sbom.json | 21339 ++- camel-spring-boot-sbom/camel-spring-boot-sbom.xml | 18111 2 files changed, 19955 insertions(+), 19495 deletions(-)
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #772: [Github Actions] Periodic Sync Camel Spring Boot SBOM (Camel 4)
github-actions[bot] opened a new pull request, #772: URL: https://github.com/apache/camel-spring-boot/pull/772 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main for SBOM Generation. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/generate-sbom-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] gastaldi commented on issue #4620: Dead guide link in tagsoup extension
gastaldi commented on issue #4620: URL: https://github.com/apache/camel-quarkus/issues/4620#issuecomment-1455150687 @holly-cummins that makes sense. However the registry would need to support patching the extension release's metadata. See https://github.com/quarkusio/registry.quarkus.io/pull/176 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Update .asf.yaml
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 354e45d6 Update .asf.yaml 354e45d6 is described below commit 354e45d6a47deaf92d6d727a38fb7d4122057b12 Author: Marat Gubaidullin AuthorDate: Sun Mar 5 12:18:03 2023 -0500 Update .asf.yaml --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 6c60b8e2..cf95a31a 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -20,7 +20,7 @@ notifications: issues: commits@camel.apache.org pullrequests: commits@camel.apache.org github: - description: "Karavan an Integration Toolkit for Apache Camel" + description: "Karavan an Integration Platform for Apache Camel" homepage: https://camel.apache.org labels: - camel
[camel-karavan] branch main updated: Update README.md
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new c3b6b4af Update README.md c3b6b4af is described below commit c3b6b4af1321801f97080fd12869a9eaf7ab3da0 Author: Marat Gubaidullin AuthorDate: Sun Mar 5 12:07:18 2023 -0500 Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b16c5b4..58fb1d6a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@   -Karavan is an Integration Toolkit for Apache Camel, which makes integration easy and fun through the visualization of pipelines, integration with runtimes and package, image build and deploy to kubernetes out-of-the-box. +Karavan is an Integration Platform for Apache Camel, which makes integration easy and fun through the visualization of pipelines, integration with runtimes and package, image build and deploy to kubernetes out-of-the-box. 
[camel] branch regen_bot updated (93e3d74d5f4 -> 7ba7c8b3417)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 93e3d74d5f4 CAMEL-19087: camel trace - Added pretty option add 7ba7c8b3417 Regen SBOM from commit 93e3d74d5f43568879e458661fcf9a70a284b500 No new revisions were added by this update. Summary of changes: camel-sbom/camel-sbom.json | 5519 +--- camel-sbom/camel-sbom.xml | 4732 +++-- 2 files changed, 5582 insertions(+), 4669 deletions(-)
[GitHub] [camel] oscerd merged pull request #9469: Generated sources regen for SBOM
oscerd merged PR #9469: URL: https://github.com/apache/camel/pull/9469 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_sbom updated (d224c671eca -> 1992e802156)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_sbom in repository https://gitbox.apache.org/repos/asf/camel.git omit d224c671eca Regen SBOM from commit 589018eaf3d7df5ccae7a1cda5afd6d02bf32ac9 add 62b98b18b8c Regen SBOM from commit 589018eaf3d7df5ccae7a1cda5afd6d02bf32ac9 add 142ceba4ac3 Upgrade to Jetty 11.0.13 add 60b4a6b069b Regen for commit 142ceba4ac34ad7d71c5634badc6f0e53b7d438f add 6cf5d0c0f16 fixed type on Getting Started Page under Concepts And Terminology Fundamental To Camel section add 055c5577630 Upgrade AWS SDK v2 to version 2.20.12 add cd3b9c8a08c Sync deps add 1a066bd9aee CAMEL-19090: Remove deprecated apis in core add b8b5757b545 CAMEL-19090: Remove deprecated apis in core add 5d52a6d9076 CAMEL-19090: Remove deprecated apis in core add c90c8cc48a3 CAMEL-19090: Remove deprecated apis in core add e53148b32fb CAMEL-19090: Remove deprecated apis in core add 332a3a657d9 CAMEL-19091: Deprecate discard/discardOldest in rejected policy for thread pool policy add 933a91ecf4c CAMEL-19090: Remove deprecated apis in core add 3e500bf13f3 CAMEL-19090: Remove deprecated apis in core add 3f3430ce438 Regen for commit 332a3a657d9d2b0c3c74f9f0cd67810ca5538919 add 88c2709691e CAMEL-19062 - Clean up Parent POM - Groovy add 4c724752822 CAMEL-19062 - Clean up Parent POM - Groovy add 26fc31d8c32 CAMEL-19062 - Clean up Parent POM - Groovy XML add 99108ef6f6c Regen add 105b5b8923c CAMEL-19090: Remove deprecated apis in core add 68cb212a82f CAMEL-19090: Remove deprecated apis in core add b3e8de2eaed Regen for commit 4c724752822ab41ff7f9b51ed019e6e11843b464 (#9422) add 09ce9762628 [CAMEL-19092] Upgrade to maven-resolver 1.9.5 add 2ca93160037 Camel-Dhis2: Fix website build add 8e976d873dc CAMEL-19062 - Clean up Parent POM - Groovy Ant add 2adaab862fe Camel-Dhis2: Fixed website build add 593ddbf81f8 (chores) documentation: cleaned up the exchange pooling documentation add 5a3f67164dc CAMEL-15105: documented CamelContext API changes on the API documentation and migration guide add 7129c3e7140 CAMEL-15105: documented Exchange API changes on the API documentation and migration guide add 9752173dfb9 CAMEL-15105: removed deprecated method adapt add bac5e877e95 CAMEL-19062 - Clean up Parent POM - Groovy JSR 223 add 5f1f861c6c7 Sync deps add 413da0fb9ad Camel-Dhis2: Fixed website build add 97523ad8f92 Regen for commit 2adaab862fe338cff0515de4e934bd51339bfd7d (#9427) add 51e418970db CAMEL-19062 - Clean up Parent POM - OGNL add 1e3ad3cf89a CAMEL-19062 - Clean up Parent POM - OGNL add 149ab1315d8 Regen for commit 1e3ad3cf89a716a9b536f65298d90e47ac3e7f55 add 31f0b6a614d CAMEL-19060: avoid extra unnecessary work when copying the messages add 0f25205251d CAMEL-19060: avoid extra unnecessary work when copying the messages add 65eee38f909 Regen for commit 0f25205251d05fb2e12eee1dc95b7ad43fddc350 add 676b282ba90 CAMEL-19091: camel-core - Remove Discard and DiscardOldest from thread pool policy add 56331d32320 CAMEL-19091: camel-core - Remove Discard and DiscardOldest from thread pool policy add c1cd97d1add CAMEL-19091: camel-core - Remove Discard and DiscardOldest from thread pool policy add 421206d2500 CAMEL-19060: move the isFailureHandled logic to a field in the ExchangeExtension to avoid costly operations add 23542fc5b65 CAMEL-19060 (camel-seda): cache queue reference to avoid costly operations in the hot path add b3a2978c915 CAMEL-19094: Tokenizer ignores includeTokens add ef1a560b762 Regen for commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f add fc8dcb7d99d CAMEL-19090: Remove deprecated apis in core add 4a3fe6aa91e CAMEL-19090: Remove deprecated apis in core add e4abec465be Regen for commit b3a2978c915f1bd3a28b4c3e4ed0901ab45e60df (#9439) add 396b7b69bb7 Removed not in use code add 504c1c2205f Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 (#9441) add c74d9e04e9f (chores) camel-main: use log markers for a warning message add 9d6b5e6b434 (chores) camel-base-engine: delay checking if the exchange failed add 3ea27fdcbd0 Regen for commit 396b7b69bb707e2bcd9010b18b6c78ed5144f77f (#9442) add d6c7e6b2979 CAMEL-19090: Remove deprecated apis in core add 406dd0158fa Fixed RAT add b86569124f6 (chores) camel-base-engine: cleanup duplicated code add 82bae503a78 (chores) camel-base-engine: fix misplaced comment add 94322d2c2b9 CAMEL-19060: avoid a potentially costly call to AtomicInteger.get() when notifying that the exchange had been created add cb14edd0e4f CAMEL-19058: use type checks instead of instance checks for handling event notifications add e6ec9ebaf7c CAMEL-19090: Remove deprecated apis in core add 610c31d2e4a Regen
[GitHub] [camel] github-actions[bot] opened a new pull request, #9469: Generated sources regen for SBOM
github-actions[bot] opened a new pull request, #9469: URL: https://github.com/apache/camel/pull/9469 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch for generating SBOMs. Please do not delete `regen_bot_sbom` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (1e1647ad426 -> 93e3d74d5f4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 1e1647ad426 Add surefire plugin configuration for release profile add 645d053020c Polished add 93e3d74d5f4 CAMEL-19087: camel trace - Added pretty option No new revisions were added by this update. Summary of changes: .../dsl/jbang/core/commands/ExportSpringBoot.java | 2 -- .../core/commands/action/CamelTraceAction.java | 33 +- 2 files changed, 32 insertions(+), 3 deletions(-)
[camel-kamelets] branch regen_bot updated (8d0da4aa -> be97d2d4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 8d0da4aa Remove spurious description. add be97d2d4 Regen SBOM from commit 8d0da4aaedfcce28e15d8982193c5e4739271590 No new revisions were added by this update. Summary of changes: camel-kamelets-sbom/camel-kamelets-sbom.json | 143 ++- camel-kamelets-sbom/camel-kamelets-sbom.xml | 99 ++- 2 files changed, 62 insertions(+), 180 deletions(-)
[camel-kamelets] branch main updated: Regen SBOM from commit 8d0da4aaedfcce28e15d8982193c5e4739271590
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new be97d2d4 Regen SBOM from commit
8d0da4aaedfcce28e15d8982193c5e4739271590
be97d2d4 is described below
commit be97d2d471ceb277980f92c08df81dad112af6de
Author: oscerd
AuthorDate: Sun Mar 5 11:32:08 2023 +
Regen SBOM from commit 8d0da4aaedfcce28e15d8982193c5e4739271590
Signed-off-by: GitHub
---
camel-kamelets-sbom/camel-kamelets-sbom.json | 143 ++-
camel-kamelets-sbom/camel-kamelets-sbom.xml | 99 ++-
2 files changed, 62 insertions(+), 180 deletions(-)
diff --git a/camel-kamelets-sbom/camel-kamelets-sbom.json
b/camel-kamelets-sbom/camel-kamelets-sbom.json
index 84aaff46..f3632ba6 100644
--- a/camel-kamelets-sbom/camel-kamelets-sbom.json
+++ b/camel-kamelets-sbom/camel-kamelets-sbom.json
@@ -1,10 +1,10 @@
{
"bomFormat" : "CycloneDX",
"specVersion" : "1.4",
- "serialNumber" : "urn:uuid:56e9a5e2-4d37-4c98-99f6-80fdf8eb6abd",
+ "serialNumber" : "urn:uuid:6e682fdc-fa65-4abe-90b2-52dd95b9a2b5",
"version" : 1,
"metadata" : {
-"timestamp" : "2023-03-02T17:41:50Z",
+"timestamp" : "2023-03-05T11:31:59Z",
"tools" : [
{
"vendor" : "OWASP Foundation",
@@ -169,41 +169,41 @@
"publisher" : "QOS.ch",
"group" : "org.slf4j",
"name" : "slf4j-api",
- "version" : "1.7.36",
+ "version" : "2.0.6",
"description" : "The slf4j API",
"scope" : "optional",
"hashes" : [
{
"alg" : "MD5",
- "content" : "872da51f5de7f3923da4de871d57fd85"
+ "content" : "0dd65c386e8c5f4e6e014de3f7a7ae60"
},
{
"alg" : "SHA-1",
- "content" : "6c62681a2f655b49963a5983b8b0950a6120ae14"
+ "content" : "88c40d8b4f33326f19a7d3c0aaf2c7e8721d4953"
},
{
"alg" : "SHA-256",
- "content" :
"d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0"
+ "content" :
"2f2a92d410b268139d7d63b75ed25e21995cfe4100c19bf23577cfdbc8077bda"
},
{
"alg" : "SHA-512",
- "content" :
"f9b033fc019a44f98b16048da7e2b59edd4a6a527ba60e358f65ab88e0afae03a9340f1b3e8a543d49fa542290f499c5594259affa1ff3e6e7bf3b428d4c610b"
+ "content" :
"4f8bcafcbb105542ae9333a79f1779aa299570c129abc718331cb5969af52e06e53e645ba52e67ebbe822006ea95093186656742dd24a4b167e270ba9e55e1e1"
},
{
"alg" : "SHA-384",
- "content" :
"2b14ad035877087157e379d3277dcdcd79e58d6bdb147c47d29e377d75ce53ad42cafbf22f5fb7827c7e946ff4876b9a"
+ "content" :
"aae19620668b33d8a5837cd39bfd398644199693c08869812948b52eff238cd9d363cbe1a5bbdd25d6efaac4bd2caa67"
},
{
"alg" : "SHA3-384",
- "content" :
"3bc3110dafb8d5be16a39f3b2671a466463cd99eb39610c0e4719a7bf2d928f2ea213c734887c6926a07c4cca7769e4b"
+ "content" :
"e70ca0766bfb4ab7b5d4f22855fa7ea28bc26f51e345ce34f11f0d042d08d8fa9b718fa6eab3c19d669dd05ce8075962"
},
{
"alg" : "SHA3-256",
- "content" :
"ba2608179fcf46e2291a90b9cbb4aa30d718e481f59c350cc21c73b88d826881"
+ "content" :
"e0c8b3a870481be3bd73d454901bb6db2a2bd0b34dcd62a13eac94890861caa7"
},
{
"alg" : "SHA3-512",
- "content" :
"14c4edcd19702ef607d78826839d8a6d3a39157df54b89a801d3d3cbbe1307131a77671b041c761122730fb1387888c5ec2e46bdd80e1cb07f8f144676441824"
+ "content" :
"d5a1aabdb809a4eb9bf2b81747d33438ec52dbd4cfa87d4f7c11213ec582553d6921c5537e5a09547feb8830c9a7265a163f21df118b9c2e11bc4379a0f514a3"
}
],
"licenses" : [
@@ -214,7 +214,7 @@
}
}
],
- "purl" : "pkg:maven/org.slf4j/slf4j-api@1.7.36?type=jar",
+ "purl" : "pkg:maven/org.slf4j/slf4j-api@2.0.6?type=jar",
"externalReferences" : [
{
"type" : "website",
@@ -230,7 +230,7 @@
}
],
"type" : "library",
- "bom-ref" : "pkg:maven/org.slf4j/slf4j-api@1.7.36?type=jar"
+ "bom-ref" : "pkg:maven/org.slf4j/slf4j-api@2.0.6?type=jar"
},
{
"publisher" : "FasterXML",
@@ -308,7 +308,6 @@
"name" : "jackson-databind",
"version" : "2.14.1",
"description" : "General data-binding functionality for Jackson: works
on core streaming API",
- "scope" : "required",
"hashes" : [
{
"alg" : "MD5",
@@ -446,7 +445,6 @@
"name" : "jackson-core",
"version" : "2.14.1",
"description" : "Core Jackson processing abstractions (aka Streaming
API), implementation for JSON",
- "scope" : "required",
"hashes" : [
{
"alg" : "MD5",
@@ -516,7 +514,7 @@
"name" : "camel-k-model-v1alpha1",
"version" :
[GitHub] [camel-kamelets] oscerd merged pull request #1338: Generated sources regen for SBOM
oscerd merged PR #1338: URL: https://github.com/apache/camel-kamelets/pull/1338 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] oscerd merged pull request #4623: Generated sources regen for SBOM
oscerd merged PR #4623: URL: https://github.com/apache/camel-quarkus/pull/4623 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch regen_bot_sbom updated (48feae4d -> 093dd60d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_sbom in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git omit 48feae4d Regen SBOM from commit 1c65f878e70c01c4f0515dde05df255befdba29c add fd7fcebe Regen SBOM from commit 1c65f878e70c01c4f0515dde05df255befdba29c add f39f47fa Updated CHANGELOG.md add 500caa14 Upgrade PostgreSQL driver to version 42.5.4 add 54eba723 Regen add 2c78cf35 Release should be set to JDK17 add 00841ae4 Update Kamelets for release 4.0.0-M1 add 8a94ef27 [maven-release-plugin] prepare release v4.0.0-M1 add af58fae1 [maven-release-plugin] prepare for next development iteration add cea90b47 Regen for commit af58fae1eb45ae9d13f1d91d4a42040778514da5 add 7fde9101 Restore required setting for chatId and made documentation clearer. add 804aafe8 Updated CHANGELOG.md add 02933800 chore: Fix YAKS tests add e384fb27 MQ sink does not map headers from Kafka source add acc84dbb MQ sink does not map headers from Kafka source add 4bec1495 MQ sink does not map headers from Kafka source add fb31175e MQ sink does not map headers from Kafka source add c403c391 chore: Remove Jitpack add a193a528 Updated CHANGELOG.md add 331abebb chore: Add data-type-action Kamelet add 95247c31 Upgrade to CycloneDX Maven plugin 2.7.5 add 38d6fef9 Regen SBOM add 4f1dd7b8 chore: Remove experimental data type Kamelets add 90a5af60 chore: Fix Log4j2 to SLF4J2 binding add a109bb7c chore: Run deploy GitHub workflow job on main repo only add 6e9eed72 Issue-1336: DynamoDB Sink - use enum for available operations add 8d0da4aa Remove spurious description. add 093dd60d Regen SBOM from commit 8d0da4aaedfcce28e15d8982193c5e4739271590 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (48feae4d) \ N -- N -- N refs/heads/regen_bot_sbom (093dd60d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/ci-build.yml | 4 +- .github/workflows/java-tests.yaml | 2 +- .github/workflows/yaks-tests.yaml | 89 +++ .gitignore | 1 + CHANGELOG.md | 59 - camel-kamelets-sbom/camel-kamelets-sbom.json | 258 ++--- camel-kamelets-sbom/camel-kamelets-sbom.xml| 159 +++-- docs/modules/ROOT/nav.adoc | 3 +- kamelets/avro-deserialize-action.kamelet.yaml | 2 +- kamelets/avro-serialize-action.kamelet.yaml| 2 +- kamelets/aws-ddb-experimental-sink.kamelet.yaml| 149 kamelets/aws-ddb-sink.kamelet.yaml | 26 ++- kamelets/aws-kinesis-source.kamelet.yaml | 2 +- kamelets/aws-s3-experimental-source.kamelet.yaml | 168 -- kamelets/aws-s3-source.kamelet.yaml| 2 +- kamelets/aws-sqs-source.kamelet.yaml | 2 +- kamelets/azure-storage-blob-source.kamelet.yaml| 2 +- kamelets/azure-storage-queue-source.kamelet.yaml | 2 +- kamelet.yaml => data-type-action.kamelet.yaml} | 50 ++-- kamelets/extract-field-action.kamelet.yaml | 2 +- kamelets/hoist-field-action.kamelet.yaml | 2 +- kamelets/insert-field-action.kamelet.yaml | 2 +- kamelets/json-deserialize-action.kamelet.yaml | 2 +- kamelets/json-serialize-action.kamelet.yaml| 2 +- kamelets/kafka-manual-commit-action.kamelet.yaml | 2 +- kamelets/kafka-not-secured-sink.kamelet.yaml | 2 +- kamelets/kafka-not-secured-source.kamelet.yaml | 19 +- kamelets/kafka-scram-source.kamelet.yaml | 2 +- kamelets/kafka-source.kamelet.yaml | 2 +- kamelets/kafka-ssl-source.kamelet.yaml | 2 +- kamelets/mask-field-action.kamelet.yaml| 2 +- .../message-timestamp-router-action.kamelet.yaml | 2 +- kamelets/openai-classification-action.kamelet.yaml | 2 +- kamelets/postgresql-sink.kamelet.yaml | 2 +- kamelets/postgresql-source.kamelet.yaml| 2 +- kamelets/protobuf-deserialize-action.kamelet.yaml | 2 +- kamelets/protobuf-serialize-action.kamelet.yaml| 2 +- kamelets/regex-router-action.kamelet.yaml
[GitHub] [camel-kamelets] github-actions[bot] opened a new pull request, #1338: Generated sources regen for SBOM
github-actions[bot] opened a new pull request, #1338: URL: https://github.com/apache/camel-kamelets/pull/1338 Regen bot :robot: found some uncommitted changes after running build on :camel-kamelets: `main` branch for generating SBOMs. Please do not delete `regen_bot_sbom` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] opened a new pull request, #4623: Generated sources regen for SBOM
github-actions[bot] opened a new pull request, #4623: URL: https://github.com/apache/camel-quarkus/pull/4623 Regen bot :robot: found some uncommitted changes after running build on :camel-quarkus: `main` branch for generating SBOMs. Please do not delete `regen_bot_sbom` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch regen_bot_sbom updated (bae1a09afa -> 02a870d7cf)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot_sbom
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
omit bae1a09afa Regen SBOM from commit
6fe669669e7a658c41a329c856db1d989f9b3486
add 9c187e3e00 Regen SBOM from commit
6fe669669e7a658c41a329c856db1d989f9b3486
add 210a6dc60a Updated CHANGELOG.md
add a92a48feed Zendesk test cannot be compiled to native with Camel 4 and
Quarkus 3 #4514
add b24512c649 Remove workaround for quarkus.http.test-ssl-port being
ignored by REST Assured
add bb4e85ce8e Updated CHANGELOG.md
add 011f67aea8 Micrometer test coverage - @Counted
add bf5eb74a79 Updated CHANGELOG.md
add 77a5999cea Telegram : improve integration tests with Telegram
credentials
add eda3bb96cc Telegram: add integration test for the webhook endpoint
add 1beb466b48 Revert "Disable infinispan test temporarily #4499"
add 4f1c2ea5e0 Split infinispan testing into separate modules for the
quarkus and camel managed clients
add a2e7c1bb0e Exclude banned xml-apis from
org.seleniumhq.selenium:htmlunit-driver
add ed1b0a5167 Upgrade to cq-maven-plugin 3.5.3: flatten faster,
sync-versions in proper order
add 0e059a15c9 Updated CHANGELOG.md
add 588b5f431a Aws2-cw: dependency io.quarkus:quarkus-jaxp is not needed
for the native run #4614
add 03e432d453 Updated CHANGELOG.md
add f47ed6e2cc Bump to CycloneDX Maven Plugin 2.7.5
add 1156664162 Upgrade to cq-maven-plugin 3.5.4 #4606
add e1d491d5b5 MAVEN_ARGS honored by Maven 3.9.0 so rename it and rather
use ./mvnw
add 30037c77b1 Updated CHANGELOG.md
add 02a870d7cf Regen SBOM from commit
30037c77b154db1b5fcd07d3abe35ddea6319c8e
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (bae1a09afa)
\
N -- N -- N refs/heads/regen_bot_sbom (02a870d7cf)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/camel-master-cron.yaml | 46 +-
.github/workflows/ci-build.yaml| 34 +-
.github/workflows/generate-sbom-main.yml |2 +-
.github/workflows/pr-validate.yml |4 +-
.github/workflows/quarkus-master-cron.yaml | 48 +-
CHANGELOG.md | 19 +
camel-quarkus-sbom/camel-quarkus-sbom.json | 7715 ++--
camel-quarkus-sbom/camel-quarkus-sbom.xml | 3695 +-
.../ahc/deployment/SupportAhcProcessor.java|6 +
extensions-support/ahc/runtime/pom.xml | 17 +
.../ahc/runtime/graal/AhcSubstitutions.java| 23 +-
extensions/aws2-cw/deployment/pom.xml |4 -
extensions/aws2-cw/runtime/pom.xml |4 -
.../infinispan/deployment/InfinispanProcessor.java | 15 +
.../{main-devmode => infinispan-common}/pom.xml| 73 +-
.../common/InfinispanCommonProducers.java | 53 +
.../common/InfinispanCommonResources.java | 325 +
.../infinispan/common/InfinispanCommonRoutes.java | 198 +
.../component/infinispan/common}/model/Person.java |2 +-
.../infinispan/common}/model/PersonSchema.java |2 +-
.../InfinispanCommonServerTestResource.java} | 40 +-
.../infinispan/common/InfinispanCommonTest.java} | 235 +-
.../src/test/resources/infinispan.xml | 18 +-
.../{consul => infinispan-quarkus-client}/pom.xml | 27 +-
.../infinispan/InfinispanQuarkusClientRoutes.java | 68 +
.../src/main/resources/application.properties |0
.../infinispan/InfinispanQuarkusClientIT.java} |2 +-
.../infinispan/InfinispanQuarkusClientTest.java} | 22 +-
.../infinispan/InfinispanServerTestResource.java | 42 +
integration-tests/infinispan/pom.xml | 73 +-
.../infinispan/src/main/java/InfinispanRoutes.java | 75 +
.../component/infinispan/InfinispanResources.java | 376 -
.../component/infinispan/InfinispanRoutes.java | 305 -
.../component/infinispan => }/InfinispanIT.java|1 -
.../test/java/InfinispanServerTestResource.java| 40 +
.../src/test/java/InfinispanTest.java} | 34 +-
.../infinispan/InfinispanServerTestResource.java | 99 -
integration-tests/micrometer/pom.xml |4 +
.../micrometer/it/MicrometerResource.java | 41 +-
[camel] 02/02: CAMEL-19087: camel trace - Added pretty option
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
commit 93e3d74d5f43568879e458661fcf9a70a284b500
Author: Claus Ibsen
AuthorDate: Sun Mar 5 11:53:39 2023 +0100
CAMEL-19087: camel trace - Added pretty option
---
.../core/commands/action/CamelTraceAction.java | 33 +-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
index 27b4f97d53b..df35b0f42de 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
@@ -41,6 +41,7 @@ import com.github.freva.asciitable.HorizontalAlign;
import com.github.freva.asciitable.OverflowBehaviour;
import org.apache.camel.catalog.impl.TimePatternConverter;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
+import org.apache.camel.dsl.jbang.core.common.JSonHelper;
import org.apache.camel.dsl.jbang.core.common.ProcessHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.StringHelper;
@@ -129,6 +130,10 @@ public class CamelTraceAction extends ActionBaseCommand {
description = "Only output traces from the latest
(follow if necessary until complete and exit)")
boolean latest;
+@CommandLine.Option(names = { "--pretty" },
+description = "Pretty print message body when using
JSon format")
+boolean pretty;
+
String findAnsi;
private int nameMaxWidth;
@@ -735,7 +740,7 @@ public class CamelTraceAction extends ActionBaseCommand {
if (bodyRow.value != null) {
tab6 = AsciiTable.getTable(AsciiTable.NO_BORDERS,
List.of(bodyRow), Arrays.asList(
new Column().dataAlign(HorizontalAlign.LEFT).maxWidth(160,
OverflowBehaviour.NEWLINE)
-.with(TableRow::valueAsString)));
+.with(b -> pretty ? bodyRow.valueAsStringPretty()
: bodyRow.valueAsString(;
}
String tab7 = null;
jo = r.exception;
@@ -893,6 +898,32 @@ public class CamelTraceAction extends ActionBaseCommand {
return value != null ? value.toString() : "null";
}
+String valueAsStringPretty() {
+if (value == null) {
+return "null";
+}
+String s = value.toString();
+if (!s.isEmpty()) {
+try {
+s = Jsoner.unescape(s);
+if (loggingColor) {
+s = JSonHelper.colorPrint(s, 2, true);
+} else {
+s = JSonHelper.prettyPrint(s, 2);
+}
+} catch (Throwable e) {
+// ignore as not json
+}
+if (s == null || s.isEmpty()) {
+s = value.toString();
+}
+}
+if (s == null) {
+return "null";
+}
+return s;
+}
+
String valueAsStringRed() {
if (value != null) {
if (loggingColor) {
[camel] branch main updated (1e1647ad426 -> 93e3d74d5f4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 1e1647ad426 Add surefire plugin configuration for release profile new 645d053020c Polished new 93e3d74d5f4 CAMEL-19087: camel trace - Added pretty option The 2 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. Summary of changes: .../dsl/jbang/core/commands/ExportSpringBoot.java | 2 -- .../core/commands/action/CamelTraceAction.java | 33 +- 2 files changed, 32 insertions(+), 3 deletions(-)
[camel] 01/02: Polished
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
commit 645d053020c9db6acea7d9a52ee05af6eb07a1f4
Author: Claus Ibsen
AuthorDate: Sun Mar 5 11:16:54 2023 +0100
Polished
---
.../java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index ef0264add9d..22b9ee8d483 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -40,8 +40,6 @@ import org.apache.commons.io.FileUtils;
class ExportSpringBoot extends Export {
-private static final String DEFAULT_CAMEL_CATALOG =
"org.apache.camel.catalog.DefaultCamelCatalog";
-
public ExportSpringBoot(CamelJBangMain main) {
super(main);
}
[camel] branch regen_bot updated (37779cf97d7 -> 1e1647ad426)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 37779cf97d7 Don't expect test executions on release profile add 1e1647ad426 Add surefire plugin configuration for release profile No new revisions were added by this update. Summary of changes: pom.xml | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-)
[camel] branch main updated: Add surefire plugin configuration for release profile
This is an automated email from the ASF dual-hosted git repository. gzurowski 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 1e1647ad426 Add surefire plugin configuration for release profile 1e1647ad426 is described below commit 1e1647ad4265fa15f5bdd05b808a2798e7113d29 Author: Gregor Zurowski AuthorDate: Sun Mar 5 11:01:20 2023 +0100 Add surefire plugin configuration for release profile --- pom.xml | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 649d9d6ba0f..b7af08571ba 100644 --- a/pom.xml +++ b/pom.xml @@ -779,11 +779,19 @@ org.apache.maven.plugins maven-failsafe-plugin -false false +false true + +org.apache.maven.plugins +maven-surefire-plugin + + false +false + +
[camel] branch regen_bot updated (99a67965570 -> 37779cf97d7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 99a67965570 Fix version property in DHIS2 component (#9468) add 37779cf97d7 Don't expect test executions on release profile No new revisions were added by this update. Summary of changes: pom.xml | 2 ++ 1 file changed, 2 insertions(+)
[camel] branch main updated: Don't expect test executions on release profile
This is an automated email from the ASF dual-hosted git repository. gzurowski 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 37779cf97d7 Don't expect test executions on release profile 37779cf97d7 is described below commit 37779cf97d7af52f33a8c05b1a0f863d62296466 Author: Gregor Zurowski AuthorDate: Sun Mar 5 09:08:11 2023 +0100 Don't expect test executions on release profile --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 8aeadf32e9d..649d9d6ba0f 100644 --- a/pom.xml +++ b/pom.xml @@ -779,6 +779,8 @@ org.apache.maven.plugins maven-failsafe-plugin +false + false true
