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 2017/10/26 07:41:12 UTC
[camel] branch master updated (e1720f7 -> 6a01f7f)
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 e1720f7 Upgrade OkHttpClient and related bundle to version 3.9.0
new 4145b33 Upgrade Elasticsearch 5.x bundle to version 5.6.3_1
new 6a01f7f Use the new Java Util 1.31.1_1 bundle in the Camel-headersmap Karaf feature
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:
parent/pom.xml | 3 ++-
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].
[camel] 01/02: Upgrade Elasticsearch 5.x bundle to version 5.6.3_1
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 4145b331d5475b707f253c2bf19beb5b0b39a166
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 26 09:30:52 2017 +0200
Upgrade Elasticsearch 5.x bundle to version 5.6.3_1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d266ba1..ed6dbee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -200,7 +200,7 @@
<elasticsearch-guava-version>18.0</elasticsearch-guava-version>
<elasticsearch-version>2.4.4</elasticsearch-version>
<elasticsearch5-version>5.6.3</elasticsearch5-version>
- <elasticsearch5-bundle-version>5.5.2_1</elasticsearch5-bundle-version>
+ <elasticsearch5-bundle-version>5.6.3_1</elasticsearch5-bundle-version>
<elasticsearch-sniffer-version>5.6.3</elasticsearch-sniffer-version>
<elasticsearch-cluster-runner-version>2.4.0.0</elasticsearch-cluster-runner-version>
<elasticsearch5-cluster-runner-version>5.6.3.0</elasticsearch5-cluster-runner-version>
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.
[camel] 02/02: Use the new Java Util 1.31.1_1 bundle in the
Camel-headersmap Karaf feature
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 6a01f7f4574f1d01dee7c29ab1aa9fd72d8c8bdb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 26 09:34:54 2017 +0200
Use the new Java Util 1.31.1_1 bundle in the Camel-headersmap Karaf feature
---
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ed6dbee..3854d93 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -340,6 +340,7 @@
<java-apns-version>1.0.0.Beta6</java-apns-version>
<java-ewah-version>1.1.6</java-ewah-version>
<java-util-version>1.31.1</java-util-version>
+ <java-util-bundle-version>1.31.1_1</java-util-bundle-version>
<jna-version>4.2.2</jna-version>
<jnats-version>1.0</jnats-version>
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index a8bc759..ebc6e51 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -927,7 +927,7 @@
</feature>
<feature name='camel-headersmap' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>wrap:mvn:com.cedarsoftware/java-util/${java-util-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-util/${java-util-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-headersmap/${project.version}</bundle>
</feature>
<feature name='camel-hipchat' version='${project.version}' resolver='(obr)' start-level='50'>
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.