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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a7762c8bdb6 [create-pull-request] automated change
a7762c8bdb6 is described below
commit a7762c8bdb60c8434ff5493d3fe976222dc8ae68
Author: oscerd <[email protected]>
AuthorDate: Sat Jul 30 01:04:39 2022 +0000
[create-pull-request] automated change
---
.../camel/springboot/catalog/components/jpa.json | 1 +
.../camel-jpa-starter/src/main/docs/jpa.json | 6 +++
.../jpa/springboot/JpaComponentConfiguration.java | 15 ++++++
.../jpa/springboot/JpaComponentConverter.java | 2 +
tooling/camel-spring-boot-dependencies/pom.xml | 61 ++++++++++++----------
5 files changed, 57 insertions(+), 28 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jpa.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jpa.json
index 7c39058913c..752df629dd4 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jpa.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jpa.json
@@ -27,6 +27,7 @@
"joinTransaction": { "kind": "property", "displayName": "Join
Transaction", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "The camel-jpa component
will join transaction by default. You can use this option to turn this off, for
example if you use LOCAL_RESOURCE and join transaction doesn't work with your
JPA provider. This option can also be set [...]
"sharedEntityManager": { "kind": "property", "displayName": "Shared Entity
Manager", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Whether to use Spring's
SharedEntityManager for the consumer\/producer. Note in most cases
joinTransaction should be set to false as this is not an EXTENDED
EntityManager." },
"transactionManager": { "kind": "property", "displayName": "Transaction
Manager", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.springframework.transaction.PlatformTransactionManager",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use the PlatformTransactionManager for managing transactions." },
+ "transactionStrategy": { "kind": "property", "displayName": "Transaction
Strategy", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.jpa.TransactionStrategy", "deprecated":
false, "autowired": false, "secret": false, "description": "To use the
TransactionStrategy for running the operations in a transaction." },
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
diff --git a/components-starter/camel-jpa-starter/src/main/docs/jpa.json
b/components-starter/camel-jpa-starter/src/main/docs/jpa.json
index 2b7af227927..ece82281f73 100644
--- a/components-starter/camel-jpa-starter/src/main/docs/jpa.json
+++ b/components-starter/camel-jpa-starter/src/main/docs/jpa.json
@@ -76,6 +76,12 @@
"type": "org.springframework.transaction.PlatformTransactionManager",
"description": "To use the PlatformTransactionManager for managing
transactions. The option is a
org.springframework.transaction.PlatformTransactionManager type.",
"sourceType":
"org.apache.camel.component.jpa.springboot.JpaComponentConfiguration"
+ },
+ {
+ "name": "camel.component.jpa.transaction-strategy",
+ "type": "org.apache.camel.component.jpa.TransactionStrategy",
+ "description": "To use the TransactionStrategy for running the
operations in a transaction. The option is a
org.apache.camel.component.jpa.TransactionStrategy type.",
+ "sourceType":
"org.apache.camel.component.jpa.springboot.JpaComponentConfiguration"
}
],
"hints": []
diff --git
a/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConfiguration.java
b/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConfiguration.java
index 1307de8b5db..cb1e3d41f8e 100644
---
a/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConfiguration.java
+++
b/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.jpa.springboot;
import java.util.Map;
import javax.annotation.Generated;
import javax.persistence.EntityManagerFactory;
+import org.apache.camel.component.jpa.TransactionStrategy;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.transaction.PlatformTransactionManager;
@@ -70,6 +71,12 @@ public class JpaComponentConfiguration
* type.
*/
private PlatformTransactionManager transactionManager;
+ /**
+ * To use the TransactionStrategy for running the operations in a
+ * transaction. The option is a
+ * org.apache.camel.component.jpa.TransactionStrategy type.
+ */
+ private TransactionStrategy transactionStrategy;
/**
* Allows for bridging the consumer to the Camel routing Error Handler,
* which mean any exceptions occurred while the consumer is trying to
pickup
@@ -142,6 +149,14 @@ public class JpaComponentConfiguration
this.transactionManager = transactionManager;
}
+ public TransactionStrategy getTransactionStrategy() {
+ return transactionStrategy;
+ }
+
+ public void setTransactionStrategy(TransactionStrategy
transactionStrategy) {
+ this.transactionStrategy = transactionStrategy;
+ }
+
public Boolean getBridgeErrorHandler() {
return bridgeErrorHandler;
}
diff --git
a/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConverter.java
b/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConverter.java
index a7e4df78c4c..b9257264cd2 100644
---
a/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConverter.java
+++
b/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConverter.java
@@ -43,6 +43,7 @@ public class JpaComponentConverter implements
GenericConverter {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
javax.persistence.EntityManagerFactory.class));
answer.add(new ConvertiblePair(String.class,
org.springframework.transaction.PlatformTransactionManager.class));
+ answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.jpa.TransactionStrategy.class));
return answer;
}
@@ -61,6 +62,7 @@ public class JpaComponentConverter implements
GenericConverter {
switch (targetType.getName()) {
case "javax.persistence.EntityManagerFactory": return
applicationContext.getBean(ref, javax.persistence.EntityManagerFactory.class);
case "org.springframework.transaction.PlatformTransactionManager":
return applicationContext.getBean(ref,
org.springframework.transaction.PlatformTransactionManager.class);
+ case "org.apache.camel.component.jpa.TransactionStrategy": return
applicationContext.getBean(ref,
org.apache.camel.component.jpa.TransactionStrategy.class);
}
return null;
}
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 22f6bdd6c67..806c98ccfed 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -2119,6 +2119,11 @@
<artifactId>camel-avro-spi</artifactId>
<version>3.19.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-aws-cloudtrail</artifactId>
+ <version>3.19.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws-parent</artifactId>
@@ -4293,142 +4298,142 @@
<dependency>
<groupId>org.apache.cxf.services.sts</groupId>
<artifactId>cxf-services-sts-core</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.ws-discovery</groupId>
<artifactId>cxf-services-ws-discovery-api</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-clustering</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-mex</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security-oauth2</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
