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/05/28 09:13:44 UTC
[camel] branch main updated (e98499b8239 -> fe417ac290c)
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 e98499b8239 CAMEL-19396: camel-management - Add DoCatch and DoFinally as managed processors
new 756c93f527f camel-report:route-coverage - Fix indent for doTry .. doCatch .. doFinally to be aligned
new fe417ac290c Upgrade to maven 3.8.8 using in maven plugins
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-dependencies/pom.xml | 2 +-
.../src/main/java/org/apache/camel/maven/RouteCoverageMojo.java | 5 +++++
parent/pom.xml | 2 +-
tooling/parent/pom.xml | 3 +--
4 files changed, 8 insertions(+), 4 deletions(-)
[camel] 01/02: camel-report:route-coverage - Fix indent for doTry .. doCatch .. doFinally to be aligned
Posted by da...@apache.org.
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 756c93f527f8067f1b5a9bf08da06cd29680f872
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun May 28 11:09:03 2023 +0200
camel-report:route-coverage - Fix indent for doTry .. doCatch .. doFinally to be aligned
---
.../src/main/java/org/apache/camel/maven/RouteCoverageMojo.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index f63f5cf2b5d..aa026830e14 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -471,6 +471,11 @@ public class RouteCoverageMojo extends AbstractExecMojo {
return;
}
+ // end block to make doTry .. doCatch .. doFinally aligned
+ if ("doCatch".equals(node.getName()) || "doFinally".equals(node.getName())) {
+ level.decrementAndGet();
+ }
+
RouteCoverageNode data = new RouteCoverageNode();
data.setName(node.getName());
data.setLineNumber(Integer.parseInt(node.getLineNumber()));
[camel] 02/02: Upgrade to maven 3.8.8 using in maven plugins
Posted by da...@apache.org.
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 fe417ac290cde52e46ec7b64eca15710c0c0a589
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun May 28 11:13:15 2023 +0200
Upgrade to maven 3.8.8 using in maven plugins
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
tooling/parent/pom.xml | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 7744266ad7d..1d49025691b 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -343,7 +343,7 @@
<lightcouch-version>0.2.0</lightcouch-version>
<mapstruct-version>1.5.5.Final</mapstruct-version>
<!-- needed from tooling/archetypes -->
- <maven-version>3.8.7</maven-version>
+ <maven-version>3.8.8</maven-version>
<maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
<maven-archetype-plugin-version>3.2.1</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7f441b6f065..181c97ef811 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -338,7 +338,7 @@
<lightcouch-version>0.2.0</lightcouch-version>
<mapstruct-version>1.5.5.Final</mapstruct-version>
<!-- needed from tooling/archetypes -->
- <maven-version>3.8.7</maven-version>
+ <maven-version>3.8.8</maven-version>
<maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
<maven-archetype-plugin-version>3.2.1</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml
index 21c0de599ad..fa033106956 100644
--- a/tooling/parent/pom.xml
+++ b/tooling/parent/pom.xml
@@ -33,8 +33,7 @@
<description>Camel Tooling Parent POM</description>
<properties>
-
- <maven-version>3.8.7</maven-version>
+ <maven-version>3.8.8</maven-version>
<maven-maven-plugin-descriptor-version>2.2.1</maven-maven-plugin-descriptor-version>
<maven-project-version>2.2.1</maven-project-version>
<maven-dependency-tree-version>2.2</maven-dependency-tree-version>