You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/25 12:10:03 UTC
[camel] branch master updated (962f5c6 -> 8450b59)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 962f5c6 Camel-Performance: Removed the blueprint testing part
new b4583ae Upgrade Spring to version 5.2.5.RELEASE
new 8450b59 Camel-base: Fixed CS
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:
.../main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 6 +++---
parent/pom.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
[camel] 02/02: Camel-base: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8450b59bbea52aca3596bec9f507cd6954d620d7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 25 13:09:24 2020 +0100
Camel-base: Fixed CS
---
.../main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index 821d79d..4500bdd 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -49,6 +49,9 @@ import org.slf4j.LoggerFactory;
*/
public class DefaultUnitOfWork implements UnitOfWork, Service {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUnitOfWork.class);
+ final InflightRepository inflightRepository;
+ final boolean allowUseOriginalMessage;
+ final boolean useBreadcrumb;
// TODO: This implementation seems to have transformed itself into a to broad concern
// where unit of work is doing a bit more work than the transactional aspect that ties
@@ -57,9 +60,6 @@ public class DefaultUnitOfWork implements UnitOfWork, Service {
// SubUnitOfWork into a general parent/child unit of work concept. However this
// requires API changes and thus is best kept for future Camel work
private final Deque<Route> routes = new ArrayDeque<>(8);
- final InflightRepository inflightRepository;
- final boolean allowUseOriginalMessage;
- final boolean useBreadcrumb;
private final Exchange exchange;
private final ExtendedCamelContext context;
private Logger log;
[camel] 01/02: Upgrade Spring to version 5.2.5.RELEASE
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b4583ae584536b23e1e317d62234e85f63f78219
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 25 13:07:24 2020 +0100
Upgrade Spring to version 5.2.5.RELEASE
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5998f18..108b0bb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -616,7 +616,7 @@
<spring-ldap-bundle-version>2.3.2.RELEASE_2</spring-ldap-bundle-version>
<spring-version-range>[5,6)</spring-version-range>
<spring-version>${spring5-version}</spring-version>
- <spring5-version>5.2.4.RELEASE</spring5-version>
+ <spring5-version>5.2.5.RELEASE</spring5-version>
<spring-security-version>5.3.0.RELEASE</spring-security-version>
<spring-ws-version>3.0.7.RELEASE</spring-ws-version>
<spring-ws-bundle-version>3.0.7.RELEASE_1</spring-ws-bundle-version>