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 2023/01/11 05:18:02 UTC
[camel-spring-boot] branch main updated: [create-pull-request] automated change
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 f4769f69e11 [create-pull-request] automated change
f4769f69e11 is described below
commit f4769f69e11364732f738bb41f3baea354a040d2
Author: oscerd <os...@users.noreply.github.com>
AuthorDate: Wed Jan 11 01:02:16 2023 +0000
[create-pull-request] automated change
---
.../camel/springboot/catalog/components/elasticsearch.json | 2 +-
.../apache/camel/springboot/catalog/components/jpa.json | 2 +-
.../camel/springboot/catalog/components/rabbitmq.json | 2 +-
.../camel-jpa-starter/src/main/docs/jpa.json | 14 ++++++++------
.../jpa/springboot/JpaComponentConfiguration.java | 5 +++++
tooling/camel-spring-boot-dependencies/pom.xml | 6 +++---
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
index da5a39ca595..efaa5b85caf 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
@@ -67,7 +67,7 @@
"enableSniffer": { "kind": "parameter", "displayName": "Enable Sniffer", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable automatically discover nodes from a running Elasticsearch cluster. If this option is us [...]
"sniffAfterFailureDelay": { "kind": "parameter", "displayName": "Sniff After Failure Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 60000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The delay of a sniff execution scheduled after a failure (in milliseconds)" },
"snifferInterval": { "kind": "parameter", "displayName": "Sniffer Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 300000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The interval between consecutive ordinary sniff executions in milliseconds. Will be honoured [...]
- "certificatePath": { "kind": "parameter", "displayName": "Certificate Path", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The path of the self-signed certificate to use to access to Elasticsearch." },
+ "certificatePath": { "kind": "parameter", "displayName": "Certificate Path", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The certificate that can be used to access the ES Cluster. It can be loaded by default from classpath, bu [...]
"enableSSL": { "kind": "parameter", "displayName": "Enable SSL", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable SSL" }
}
}
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 3611626610f..f626e318538 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
@@ -26,7 +26,7 @@
"entityManagerFactory": { "kind": "property", "displayName": "Entity Manager Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.persistence.EntityManagerFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use the EntityManagerFactory. This is strongly recommended to configure." },
"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." },
+ "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": true, "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 [...]
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
index 5c0edef0a43..0ae7d3bbe8c 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
@@ -4,7 +4,7 @@
"name": "rabbitmq",
"title": "RabbitMQ",
"description": "Send and receive messages from RabbitMQ instances.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.12.0",
"label": "messaging",
"javaType": "org.apache.camel.component.rabbitmq.RabbitMQComponent",
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 ece82281f73..6707f8581f4 100644
--- a/components-starter/camel-jpa-starter/src/main/docs/jpa.json
+++ b/components-starter/camel-jpa-starter/src/main/docs/jpa.json
@@ -71,17 +71,19 @@
"sourceType": "org.apache.camel.component.jpa.springboot.JpaComponentConfiguration",
"defaultValue": false
},
- {
- "name": "camel.component.jpa.transaction-manager",
- "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"
+ },
+ {
+ "name": "camel.component.jpa.transaction-manager",
+ "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",
+ "deprecated": true,
+ "deprecation": {}
}
],
"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 cb1e3d41f8e..2a3250c7e3f 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
@@ -22,6 +22,7 @@ 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.boot.context.properties.DeprecatedConfigurationProperty;
import org.springframework.transaction.PlatformTransactionManager;
/**
@@ -70,6 +71,7 @@ public class JpaComponentConfiguration
* option is a org.springframework.transaction.PlatformTransactionManager
* type.
*/
+ @Deprecated
private PlatformTransactionManager transactionManager;
/**
* To use the TransactionStrategy for running the operations in a
@@ -140,10 +142,13 @@ public class JpaComponentConfiguration
this.sharedEntityManager = sharedEntityManager;
}
+ @Deprecated
+ @DeprecatedConfigurationProperty
public PlatformTransactionManager getTransactionManager() {
return transactionManager;
}
+ @Deprecated
public void setTransactionManager(
PlatformTransactionManager transactionManager) {
this.transactionManager = transactionManager;
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 243e8a409fa..ee312d08ce2 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4505,12 +4505,12 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
- <version>2.10.2</version>
+ <version>2.10.3</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-admin</artifactId>
- <version>2.10.2</version>
+ <version>2.10.3</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
@@ -4555,7 +4555,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>