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 2021/04/21 14:35:03 UTC
[camel] branch main updated (ba4385c -> 387859f)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ba4385c CAMEL-16535: Add option to dump routes as XML on startup
new ff14bf5 Upgrade Solr to version 8.8.2
new 708c334 Upgrade Solr Zookeeper dependency to version 3.6.2
new 6969b30 Use a property placeholder for Solr Zookeeper
new fa85cdb Camel-Solr: Use the solr zookeeper version property placeholder
new 387859f Sync deps
The 5 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 | 3 ++-
.../camel/catalog/main/camel-main-configuration-metadata.json | 1 -
components/camel-solr/pom.xml | 7 ++++++-
parent/pom.xml | 3 ++-
4 files changed, 10 insertions(+), 4 deletions(-)
[camel] 01/05: Upgrade Solr to version 8.8.2
Posted by ac...@apache.org.
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.git
commit ff14bf5fc60527ebab6e68ea5597786327b78ae1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 15:28:18 2021 +0200
Upgrade Solr to version 8.8.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d1ed4c0..1c15d44 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -509,7 +509,7 @@
<snakeyaml-engine-version>2.2.1</snakeyaml-engine-version>
<snmp4j-version>2.6.3_1</snmp4j-version>
<!-- solr version aligned with lucene -->
- <solr-version>8.6.1</solr-version>
+ <solr-version>8.8.2</solr-version>
<solr-version-range>[8,9)</solr-version-range>
<spark-version>2.4.6</spark-version>
<splunk-version>1.6.5.0_1</splunk-version>
[camel] 04/05: Camel-Solr: Use the solr zookeeper version property
placeholder
Posted by ac...@apache.org.
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.git
commit fa85cdbbed12326f7c34699424cd96895da4e7a3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 16:22:12 2021 +0200
Camel-Solr: Use the solr zookeeper version property placeholder
---
components/camel-solr/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index c29b2ec..f6358db 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.6.2</version>
+ <version>${solr-zookeeper-version}</version>
</dependency>
<!-- test dependencies -->
[camel] 05/05: Sync deps
Posted by ac...@apache.org.
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.git
commit 387859f56a00784a1777259ce9da6cb2b79c38a5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 16:28:16 2021 +0200
Sync deps
---
camel-dependencies/pom.xml | 3 ++-
.../apache/camel/catalog/main/camel-main-configuration-metadata.json | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 3d9c9ef..c6cfe2c 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -521,8 +521,9 @@
<snakeyaml-engine-version>2.2.1</snakeyaml-engine-version>
<snakeyaml-version>1.28</snakeyaml-version>
<snmp4j-version>2.6.3_1</snmp4j-version>
- <solr-version>8.6.1</solr-version>
+ <solr-version>8.8.2</solr-version>
<solr-version-range>[8,9)</solr-version-range>
+ <solr-zookeeper-version>3.6.2</solr-zookeeper-version>
<sourcecheckExcludes></sourcecheckExcludes>
<sourcecheckExcludesComma></sourcecheckExcludesComma>
<spark-version>2.4.6</spark-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 33981f1..025eed5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -26,7 +26,6 @@
{ "name": "camel.main.configurationClasses", "description": "Sets classes names that will be used to configure the camel context as example by providing custom beans through org.apache.camel.BindToRegistry annotation.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "string", "javaType": "java.lang.String" },
{ "name": "camel.main.configurations", "description": "Sets the configuration objects used to configure the camel context.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "object", "javaType": "java.util.List" },
{ "name": "camel.main.consumerTemplateCacheSize", "description": "Consumer template endpoints cache size.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", "javaType": "int", "defaultValue": 1000 },
- { "name": "camel.main.dumpRoutes", "description": "If dumping is enabled then Camel will during startup dump all loaded routes (incl rests and route templates) represented as XML DSL into the log. This is intended for trouble shooting or to assist during development. Sensitive information that may be configured in the route endpoints could potentially be included in the dump output and is therefore not recommended to be used for production usage. This requires to have camel-xml-jaxb [...]
{ "name": "camel.main.durationHitExitCode", "description": "Sets the exit code for the application if duration was hit", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "integer", "javaType": "int" },
{ "name": "camel.main.durationMaxIdleSeconds", "description": "To specify for how long time in seconds Camel can be idle before automatic terminating the JVM. You can use this to run Camel for a short while.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", "javaType": "int" },
{ "name": "camel.main.durationMaxMessages", "description": "To specify how many messages to process by Camel before automatic terminating the JVM. You can use this to run Camel for a short while.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", "javaType": "int" },
[camel] 02/05: Upgrade Solr Zookeeper dependency to version 3.6.2
Posted by ac...@apache.org.
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.git
commit 708c3344befad76b87b08274f5ccd4dd916b2072
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 15:40:45 2021 +0200
Upgrade Solr Zookeeper dependency to version 3.6.2
---
components/camel-solr/pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index a40d240..c29b2ec 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -32,7 +32,7 @@
<properties>
<java.awt.headless>true</java.awt.headless>
- <solr-test-framework-jetty-version>9.4.19.v20190610</solr-test-framework-jetty-version>
+ <solr-test-framework-jetty-version>9.4.34.v20201102</solr-test-framework-jetty-version>
<camel.osgi.import.before.defaults>
javax.activation.*;version="${javax-activation-version-range}"
</camel.osgi.import.before.defaults>
@@ -67,6 +67,11 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.6.2</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
[camel] 03/05: Use a property placeholder for Solr Zookeeper
Posted by ac...@apache.org.
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.git
commit 6969b306d120ae65d37709d868a880491502a9b5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 16:21:36 2021 +0200
Use a property placeholder for Solr Zookeeper
---
parent/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1c15d44..e9f5587 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -511,6 +511,7 @@
<!-- solr version aligned with lucene -->
<solr-version>8.8.2</solr-version>
<solr-version-range>[8,9)</solr-version-range>
+ <solr-zookeeper-version>3.6.2</solr-zookeeper-version>
<spark-version>2.4.6</spark-version>
<splunk-version>1.6.5.0_1</splunk-version>
<spock-version>2.0-M4-groovy-3.0</spock-version>