(camel-karaf) branch main updated: [project] Add version badge on readme (#304)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 7d102d3ad [project] Add version badge on readme (#304) 7d102d3ad is described below commit 7d102d3adfa1a6a2c7919f39fad1ea50ec9acdf4 Author: François Papon AuthorDate: Wed May 29 15:41:27 2024 +0200 [project] Add version badge on readme (#304) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c251af66c..02c188b1a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Apache Camel Karaf +[](https://maven-badges.herokuapp.com/maven-central/org.apache.camel.karaf/karaf) + [Apache Camel](http://camel.apache.org/) is a powerful open source integration framework based on known Enterprise Integration Patterns with powerful bean integration. This project provides Apache Karaf support for Apache Camel. -
(camel-karaf) branch main updated: Add reviews rule on PR
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 279736efc Add reviews rule on PR 279736efc is described below commit 279736efce821dfe515e2c3d7decb4af02e5288b Author: JB Onofré AuthorDate: Wed May 29 11:10:02 2024 +0200 Add reviews rule on PR --- .asf.yaml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 2b1defbdf..91d30828a 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -33,6 +33,12 @@ github: protected_branches: main: required_linear_history: true + required_status_checks: +strict: true + required_pull_request_reviews: +required_approving_review_count: 1 +dismiss_stale_reviews: true + required_conversation_resolution: true features: wiki: true
(camel-karaf) branch main updated: camel-influxdb2 - missing dependencies added after integration test (#293)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 65b14521 camel-influxdb2 - missing dependencies added after
integration test (#293)
65b14521 is described below
commit 65b145212a47dd0537911194adf3e6fd65c4f17d
Author: ozgurkisir-qlik <157804972+ozgurkisir-q...@users.noreply.github.com>
AuthorDate: Wed May 22 10:37:37 2024 +0300
camel-influxdb2 - missing dependencies added after integration test (#293)
Co-authored-by: OZGUR KISIR
---
features/src/main/feature/camel-features.xml | 17 +
1 file changed, 17 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 854af5e6..e63bc2e6 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1239,6 +1239,23 @@
camel-core
wrap:mvn:com.influxdb/influxdb-client-java/${influx-client-java-driver-version}
wrap:mvn:com.influxdb/influxdb-client-core/${influx-client-java-driver-version}
+wrap:mvn:com.influxdb/influxdb-client-utils/${influx-client-java-driver-version}
+wrap:mvn:com.squareup.okhttp3/logging-interceptor/4.12.0
+wrap:mvn:com.squareup.okhttp3/okhttp/4.12.0
+wrap:mvn:com.squareup.retrofit2/adapter-rxjava3/2.9.0
+wrap:mvn:com.squareup.retrofit2/converter-scalars/2.9.0
+wrap:mvn:com.squareup.retrofit2/converter-gson/2.9.0
+wrap:mvn:com.squareup.retrofit2/retrofit/2.9.0
+wrap:mvn:org.jetbrains.kotlin/kotlin-reflect/${kotlin-version}
+wrap:mvn:org.jetbrains.kotlin/kotlin-stdlib/1.9.21
+wrap:mvn:org.reactivestreams/reactive-streams/1.0.4
+wrap:mvn:io.reactivex.rxjava3/rxjava/3.1.8$overwrite=mergeExport-Package=io.reactivex.rxjava3.internal*,*
+wrap:mvn:org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.8.21
+wrap:mvn:org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.8.21
+wrap:mvn:com.squareup.okio/okio/3.7.0
+wrap:mvn:com.squareup.okio/okio-jvm/3.7.0
+wrap:mvn:org.jetbrains/annotations/13.0
+wrap:mvn:com.google.code.gson/gson/${gson-version}
mvn:org.apache.camel.karaf/camel-influxdb2/${project.version}
(camel-karaf) branch main updated: Add missing bundles for camel-google-pubsub feature (#292)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 0e69d7f9 Add missing bundles for camel-google-pubsub feature (#292)
0e69d7f9 is described below
commit 0e69d7f95d9edc627a93a7890bdc64e224f3920d
Author: lopushen
AuthorDate: Wed May 22 10:37:09 2024 +0300
Add missing bundles for camel-google-pubsub feature (#292)
Co-authored-by: Yevhenii Lopushen
---
features/src/main/feature/camel-features.xml | 39 +++-
pom.xml | 3 +++
2 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index ecf517dc..854af5e6 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1007,20 +1007,45 @@
wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}
wrap:mvn:com.google.apis/google-api-services-gmail/${google-api-services-mail-version}
mvn:org.apache.camel.karaf/camel-google-mail/${project.version}
-
+
camel-core
guava
-wrap:mvn:com.google.cloud/google-cloud-pubsub/1.126.2
-wrap:mvn:com.google.api/api-common/2.24.0
+netty
+spifly
+wrap:mvn:com.google.cloud/google-cloud-pubsub/1.127.1
+wrap:mvn:com.google.api/api-common/2.28.0
mvn:com.google.protobuf/protobuf-java/${protobuf-version}
-wrap:mvn:com.google.api/gax/2.41.0
-wrap:mvn:com.google.api/gax-grpc/2.41.0
-wrap:mvn:com.google.api.grpc/proto-google-cloud-pubsub-v1/1.108.2
+wrap:mvn:com.google.api/gax/2.45.0
+wrap:mvn:com.google.api/gax-grpc/2.45.0
+wrap:mvn:com.google.api.grpc/proto-google-cloud-pubsub-v1/1.109.1
wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}
wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}
-wrap:mvn:io.grpc/grpc-api/1.61.0
+wrap:mvn:io.grpc/grpc-api/${grpc-version}$${spi-consumer}
mvn:org.threeten/threetenbp/1.6.8
+wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[32,33)",*;resolution:=optional
+wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}
+wrap:mvn:io.opencensus/opencensus-api/0.31.1
+wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1
+wrap:mvn:io.grpc/grpc-protobuf/${grpc-version}
+wrap:mvn:io.grpc/grpc-protobuf-lite/${grpc-version}
+wrap:mvn:com.google.api.grpc/proto-google-iam-v1/1.31.0
+mvn:io.netty/netty-transport-native-epoll/${netty-version}
+mvn:io.netty/netty-transport-classes-epoll/${netty-version}
+mvn:io.netty/netty-codec-http/${netty-version}
+mvn:io.netty/netty-codec-http2/${netty-version}
+mvn:io.netty/netty-handler-proxy/${netty-version}
+mvn:io.netty/netty-codec-socks/${netty-version}
+wrap:mvn:com.google.api.grpc/proto-google-common-protos/2.36.0$Export-Package=com.google.longrunning*;version=2.36.0,*
+wrap:mvn:io.perfmark/perfmark-api/0.27.0
+wrap:mvn:io.grpc/grpc-stub/${grpc-version}
+wrap:mvn:io.grpc/grpc-netty/${grpc-version}$${spi-provider}
+wrap:mvn:io.grpc/grpc-core/${grpc-version}$${spi-provider}
+wrap:mvn:io.grpc/grpc-grpclb/${grpc-version}$${spi-provider}
+wrap:mvn:io.grpc/grpc-googleapis/${grpc-version}$${spi-provider}
+wrap:mvn:io.grpc/grpc-xds/${grpc-version}$${spi-provider}
+wrap:mvn:io.grpc/grpc-services/${grpc-version}$${spi-provider}
+wrap:mvn:io.grpc/grpc-util/${grpc-version}$${spi-provider}
mvn:org.apache.camel.karaf/camel-google-pubsub/${project.version}
diff --git a/pom.xml b/pom.xml
index d715dc53..8c8c42b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -565,6 +565,9 @@
4.11.1
2.3
1.77
+
+SPI-Provider=*
+SPI-Consumer=*
(camel-karaf) branch main updated: Add camel-google-storage wrapper (#290)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new f096a4bd Add camel-google-storage wrapper (#290)
f096a4bd is described below
commit f096a4bd747d688c13da05f5e162cdaa456228e7
Author: Stefan Tataru
AuthorDate: Wed May 22 09:36:29 2024 +0200
Add camel-google-storage wrapper (#290)
* Add camel-google-storage wrapper
* Add camel-google-storage wrapper - minor fix
---
features/src/main/feature/camel-features.xml | 28
1 file changed, 28 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 48213875..ecf517dc 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1055,6 +1055,34 @@
wrap:mvn:com.google.apis/google-api-services-sheets/${google-api-services-sheets-version}
mvn:org.apache.camel.karaf/camel-google-sheets/${project.version}
+
+camel-cloudevents
+camel-gson
+guava
+http-client
+jackson
+mvn:com.google.api-client/google-api-client/${google-api-client-version}
+mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}
+mvn:org.threeten/threetenbp/1.6.8
+wrap:mvn:com.google.api/api-common/2.28.0
+wrap:mvn:com.google.api/gax/2.45.0
+wrap:mvn:com.google.api/gax-httpjson/2.45.0
+wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0
+wrap:mvn:com.google.auth/google-auth-library-credentials/${google-auth-library-oauth2-http-version}
+wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${google-auth-library-oauth2-http-version}
+wrap:mvn:com.google.cloud/google-cloud-core/2.35.0
+wrap:mvn:com.google.cloud/google-cloud-core-http/2.35.0
+wrap:mvn:com.google.cloud/google-cloud-storage/2.35.0
+wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
+wrap:mvn:com.google.http-client/google-http-client-appengine/${google-cloud-http-client-version}
+wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}
+wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}
+wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
+wrap:mvn:io.grpc/grpc-api/${grpc-version}
+wrap:mvn:io.opencensus/opencensus-api/0.31.1
+wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1
+
mvn:org.apache.camel.karaf/camel-google-storage/${project.version}
+
camel-core
mvn:org.apache.groovy/groovy/${groovy-version}
(camel-karaf) branch dependabot/maven/camel.version-4.6.0 deleted (was 37b2e2dc)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/camel.version-4.6.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 37b2e2dc Bump camel.version from 4.5.0 to 4.6.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: GH-284: Upgrade to ActiveMQ 6.1.2 (#285)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new fb63411a GH-284: Upgrade to ActiveMQ 6.1.2 (#285)
fb63411a is described below
commit fb63411a6596816ad6ea234e5d94440bff5dc375
Author: JB Onofré
AuthorDate: Thu May 16 17:16:18 2024 +0200
GH-284: Upgrade to ActiveMQ 6.1.2 (#285)
---
components/camel-activemq/pom.xml| 1 +
features/src/main/feature/camel-features.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-activemq/pom.xml
b/components/camel-activemq/pom.xml
index 53a34469..b1811886 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -38,6 +38,7 @@
com.thoughtworks.xstream*;resolution:=optional,
+org.apache.activemq*;version="[5,7)",
*
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 8ea5fda8..48213875 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -280,7 +280,7 @@
camel-jms
-mvn:org.apache.activemq/activemq-client-jakarta/${activemq-version}
+mvn:org.apache.activemq/activemq-client/${activemq-version}
mvn:org.fusesource.hawtbuf/hawtbuf/1.11
mvn:org.apache.camel.karaf/camel-activemq/${project.version}
diff --git a/pom.xml b/pom.xml
index 3bcde132..d715dc53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
4.5.0
-5.18.3
+6.1.2
2.32.0
2.0.3
2.0.0.AM26
(camel-karaf) branch main updated: Cleanup
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 4a9f4c47 Cleanup 4a9f4c47 is described below commit 4a9f4c47b26ea3d3c019ced58f33106563b22913 Author: JB Onofré AuthorDate: Wed May 15 13:51:01 2024 +0200 Cleanup --- .../java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java index c3e0ebde..077503c2 100644 --- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java +++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java @@ -16,7 +16,6 @@ */ package org.apache.camel.blueprint.handler; -import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier;
(camel-karaf) branch main updated: camel-http wrapper - integration test fix (#279)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 39376cfe camel-http wrapper - integration test fix (#279)
39376cfe is described below
commit 39376cfe847398e37e1baf6e228bd5d25c45e278
Author: ozgurkisir-qlik <157804972+ozgurkisir-q...@users.noreply.github.com>
AuthorDate: Thu May 9 07:54:36 2024 +0300
camel-http wrapper - integration test fix (#279)
---
features/src/main/feature/camel-features.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 23548c9f..9021aedb 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1128,10 +1128,12 @@
camel-core
http-client
+jakarta-servlet
mvn:org.apache.camel.karaf/camel-attachments/${project.version}
mvn:org.apache.camel.karaf/camel-http-base/${project.version}
mvn:org.apache.camel.karaf/camel-http-common/${project.version}
mvn:org.apache.camel.karaf/camel-http/${project.version}
+wrap:mvn:org.apache.httpcomponents.core5/httpcore5-h2/${httpcore-version}
camel-core
(camel-karaf) branch main updated: #Ref 274: add missing camel google features (#275)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 13674538 #Ref 274: add missing camel google features (#275)
13674538 is described below
commit 136745386c17cb8106d1d5091ca450e055f8c8ae
Author: Nicolas Filotto
AuthorDate: Sat May 4 07:44:08 2024 +0200
#Ref 274: add missing camel google features (#275)
* Add camel-google-drive wrapper (#274)
* Add camel-google-functions wrapper (#274)
* Add camel-google-mail wrapper (#274)
* Set correct guava version in camel-jira (#274)
-
Co-authored-by: lopushen
Co-authored-by: ozgurkisir-qlik
<157804972+ozgurkisir-q...@users.noreply.github.com>
---
.../camel-google/camel-google-functions/pom.xml| 1 +
components/camel-google/camel-google-mail/pom.xml | 1 +
features/src/main/feature/camel-features.xml | 51 ++
3 files changed, 53 insertions(+)
diff --git a/components/camel-google/camel-google-functions/pom.xml
b/components/camel-google/camel-google-functions/pom.xml
index d5fa4679..81f53032 100644
--- a/components/camel-google/camel-google-functions/pom.xml
+++ b/components/camel-google/camel-google-functions/pom.xml
@@ -37,6 +37,7 @@
org.apache.camel*;version=${camel.version}
+com.google.common*;version="[33,34)",
*
diff --git a/components/camel-google/camel-google-mail/pom.xml
b/components/camel-google/camel-google-mail/pom.xml
index 51298648..78f5e434 100644
--- a/components/camel-google/camel-google-mail/pom.xml
+++ b/components/camel-google/camel-google-mail/pom.xml
@@ -37,6 +37,7 @@
org.apache.camel*;version=${camel.version}
+com.google.common.base*;version="[33,34)",
*
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index bd8c3d36..23548c9f 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -943,6 +943,20 @@
wrap:mvn:com.google.cloud/google-cloud-bigquery/2.38.1
mvn:org.apache.camel.karaf/camel-google-bigquery/${project.version}
+
+camel-core
+guava
+http-client
+wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
+wrap:mvn:com.google.api/gax/2.45.0
+wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}
+wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}
+wrap:mvn:com.google.cloud/google-cloud-functions/${google-cloud-functions-bom-version}
+mvn:com.google.protobuf/protobuf-java/${protobuf-version}
+wrap:mvn:io.opencensus/opencensus-api/0.31.1
+wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1
+
mvn:org.apache.camel.karaf/camel-google-functions/${project.version}
+
camel-core
guava
@@ -960,6 +974,43 @@
wrap:mvn:com.google.apis/google-api-services-calendar/${google-api-services-calendar-version}
mvn:org.apache.camel.karaf/camel-google-calendar/${project.version}
+
+camel-core
+guava
+http-client
+wrap:mvn:com.google.api-client/google-api-client/${google-api-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
+wrap:mvn:com.google.apis/google-api-services-drive/${google-api-services-drive-version}
+wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}
+wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}
+mvn:com.google.code.gson/gson/${gson-version}
+wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
+mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}
+wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}
+wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}
+mvn:com.google.oauth-client/google-oauth-client-java6/${google-oauth-client-version}
+wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
+wrap:mvn:com.google.oauth-client/google-oauth-client-jetty/${google-oauth-client-version}$overwri
(camel-karaf) branch main updated: Add docs skeleton ready to be populated with more details
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 984413bc Add docs skeleton ready to be populated with more details 984413bc is described below commit 984413bc81a45f11bd14f5bf252e7f3df4441878 Author: JB Onofré AuthorDate: Fri May 3 18:57:05 2024 +0200 Add docs skeleton ready to be populated with more details --- docs/README_local_build.adoc | 22 docs/antora.yml | 28 ++ docs/local-build.sh | 24 docs/modules/ROOT/examples/js/karaf.js| 79 +++ docs/modules/ROOT/nav.adoc| 1 + docs/modules/ROOT/pages/components.adoc | 7 +++ docs/modules/ROOT/pages/index.adoc| 65 ++ docs/modules/ROOT/partials/summary-table.adoc | 7 +++ docs/source-map.yml | 25 + docs/source-watch.yml | 21 +++ 10 files changed, 279 insertions(+) diff --git a/docs/README_local_build.adoc b/docs/README_local_build.adoc new file mode 100644 index ..1d2b8dae --- /dev/null +++ b/docs/README_local_build.adoc @@ -0,0 +1,22 @@ += Local/partial build of docs + +See https://camel.apache.org/manual/improving-the-documentation.html for initial setup instructions and more details. + +After initial setup, there are three local build options: + +== Quick: `./local-build.sh quick` + +This will build this project only. +Links out of this component will go to the published Camel website, and there will be no links back. +This is primarily intended to check for errors. + +== Full: `./local-build.sh full` + +This will build the full site locally, with your changes in this project. +Running this (at least) once is a prerequisite for the partial build. +This should show the site exactly as it would be should your changes be merged. + +== Partial: `./local-build.sh` + +This will build this project only, replacing this component in the locally built "full" build, and start a local server to view with, rebuild the project when file changes are detected, and sync your browser with the rebuilt site. +This is intended for documentation development. diff --git a/docs/antora.yml b/docs/antora.yml new file mode 100644 index ..5d2926ff --- /dev/null +++ b/docs/antora.yml @@ -0,0 +1,28 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +name: camel-karaf +title: Camel Karaf +version: 4.5.x +display_version: 4.5.x +nav: +- modules/ROOT/nav.adoc + +asciidoc: + attributes: +requires: "'util=camel-website-util,karaf=xref:js/karaf.js'" + diff --git a/docs/local-build.sh b/docs/local-build.sh new file mode 100755 index ..0db0fcc1 --- /dev/null +++ b/docs/local-build.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +CW=./../../camel-website +LOCAL=./../camel-karaf + +cd $CW || (echo 'camel-website not in expected location $CW' && exit) +./antora-local-build.sh $LOCAL $* diff --git a/docs/modules/ROOT/examples/js/karaf.js b/docs/modules/ROOT/examples/js/karaf.js new file mode 100644 index ..91d3be4d --- /dev/null +++ b/docs/modules/ROOT/examples/js/karaf.js @@ -0,0 +1,79 @@ +/* + * Licensed to th
(camel-karaf) branch 269/remove-spring-features deleted (was f46ed80e)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch 269/remove-spring-features in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was f46ed80e Ref #269: Remove Spring features The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: Ref #269: Remove Spring features (#270)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 4a3d7fe3 Ref #269: Remove Spring features (#270)
4a3d7fe3 is described below
commit 4a3d7fe3d5c80752148da53591ffb3a14eb35ada
Author: Nicolas Filotto
AuthorDate: Fri May 3 15:10:49 2024 +0200
Ref #269: Remove Spring features (#270)
---
features/pom.xml | 6 ---
features/src/main/feature/camel-features.xml | 2 -
features/src/main/feature/spring-features.xml | 57 ---
3 files changed, 65 deletions(-)
diff --git a/features/pom.xml b/features/pom.xml
index 44f8bff3..75029136 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -70,7 +70,6 @@
file:${project.build.directory}/feature/camel-features.xml
-
file:${project.build.directory}/feature/spring-features.xml
mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features
mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features
@@ -111,11 +110,6 @@
features
xml
-
-
target/feature/spring-features.xml
-spring-features
-xml
-
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 82e75017..bd8c3d36 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -19,8 +19,6 @@
-->
http://karaf.apache.org/xmlns/features/v1.5.0;
name="camel-${project.version}">
-
mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/spring-features
-
mvn:jakarta.activation/jakarta.activation-api/2.1.2
diff --git a/features/src/main/feature/spring-features.xml
b/features/src/main/feature/spring-features.xml
deleted file mode 100644
index 6b66b04e..
--- a/features/src/main/feature/spring-features.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-http://karaf.apache.org/xmlns/features/v1.5.0;
name="spring-${spring-version}">
-
-
-wrap:mvn:org.springframework/spring-core/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-wrap:mvn:org.springframework/spring-expression/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-wrap:mvn:org.springframework/spring-beans/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-wrap:mvn:org.springframework/spring-aop/${spring-version}$Export-Package=org.*;version=${spring-version}
-wrap:mvn:org.springframework/spring-context/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-wrap:mvn:org.springframework/spring-context-support/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-
-
-
-spring-tx
-mvn:jakarta.jms/jakarta.jms-api/${jakarta-jms-api-version}
-wrap:mvn:org.springframework/spring-jms/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-
-
-
-spring
-mvn:jakarta.transaction/jakarta.transaction-api/${jakarta-transaction-api-version}
-wrap:mvn:org.springframework/spring-tx/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-
-
-
-spring-jdbc
-wrap:mvn:org.springframework/spring-orm/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-
-
-
-spring-tx
-wrap:mvn:org.springframework/spring-jdbc/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-
-
-
-spring
-wrap:mvn:org.springframework/spring-messaging/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}
-
-
\ No newline at end of file
(camel-karaf) branch main updated (13e7f0b7 -> 5cb17bc7)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from 13e7f0b7 Ref #267: Add camel-google-secret-manager wrapper (#268) add 5cb17bc7 Add missing bundles for camel-amqp and camel-activemq (#272) No new revisions were added by this update. Summary of changes: components/camel-activemq/pom.xml| 6 -- components/camel-amqp/pom.xml| 4 features/src/main/feature/camel-features.xml | 17 + 3 files changed, 17 insertions(+), 10 deletions(-)
(camel-karaf) branch main updated: Add camel-splunk-hec wrapper (#266)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 0d7d5995 Add camel-splunk-hec wrapper (#266)
0d7d5995 is described below
commit 0d7d5995dc81cacb81873e61f30ba11b30f00ce6
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Thu May 2 14:41:37 2024 +0200
Add camel-splunk-hec wrapper (#266)
---
features/src/main/feature/camel-features.xml | 10 ++
1 file changed, 10 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index d98602c7..ffea0f36 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -2046,6 +2046,16 @@
mvn:joda-time/joda-time/${jodatime2-version}
mvn:org.apache.camel.karaf/camel-splunk/${project.version}
+
+camel-core
+jackson
+http-client
+mvn:commons-validator/commons-validator/${commons-validator-version}
+mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}
+mvn:commons-collections/commons-collections/${commons-collections-version}
+mvn:commons-digester/commons-digester/2.1
+
mvn:org.apache.camel.karaf/camel-splunk-hec/${project.version}
+
camel-core
spring
(camel-karaf) branch main updated: Add camel-google-sheets wrapper (#265)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 31f6499f Add camel-google-sheets wrapper (#265)
31f6499f is described below
commit 31f6499f7f4c69176bcf7fcdd1b23e12f24c3900
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Thu May 2 14:41:24 2024 +0200
Add camel-google-sheets wrapper (#265)
---
features/src/main/feature/camel-features.xml | 18 ++
1 file changed, 18 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index fb260811..d98602c7 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -970,6 +970,24 @@
mvn:org.threeten/threetenbp/1.6.8
mvn:org.apache.camel.karaf/camel-google-pubsub/${project.version}
+
+camel-core
+camel-jackson
+guava
+http-client
+mvn:com.google.api-client/google-api-client/${google-api-client-version}
+wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
+wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
+wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}
+wrap:mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}
+wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}
+wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}
+wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}
+wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1
+wrap:mvn:io.opencensus/opencensus-api/0.31.1
+wrap:mvn:com.google.apis/google-api-services-sheets/${google-api-services-sheets-version}
+
mvn:org.apache.camel.karaf/camel-google-sheets/${project.version}
+
camel-core
mvn:org.apache.groovy/groovy/${groovy-version}
(camel-karaf) branch dependabot/maven/org.apache.maven.plugins-maven-antrun-plugin-3.1.0 deleted (was 2d6e83d2)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-antrun-plugin-3.1.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 2d6e83d2 Bump org.apache.maven.plugins:maven-antrun-plugin from 1.8 to 3.1.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: Bump org.apache.maven.plugins:maven-antrun-plugin from 1.8 to 3.1.0 (#259)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 0af233aa Bump org.apache.maven.plugins:maven-antrun-plugin from 1.8 to 3.1.0 (#259) 0af233aa is described below commit 0af233aac30b5561d224f4d1cc5dc7fdd971d76d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Apr 29 16:51:35 2024 +0200 Bump org.apache.maven.plugins:maven-antrun-plugin from 1.8 to 3.1.0 (#259) Bumps [org.apache.maven.plugins:maven-antrun-plugin](https://github.com/apache/maven-antrun-plugin) from 1.8 to 3.1.0. - [Commits](https://github.com/apache/maven-antrun-plugin/compare/maven-antrun-plugin-1.8...maven-antrun-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-antrun-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- components/camel-blueprint/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index ae83d7c7..ec08f8a7 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -308,7 +308,7 @@ org.apache.maven.plugins maven-antrun-plugin -1.8 +3.1.0 true
(camel-karaf) branch dependabot/maven/org.codehaus.mojo-jaxb2-maven-plugin-3.2.0 deleted (was f67f0397)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/org.codehaus.mojo-jaxb2-maven-plugin-3.2.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was f67f0397 Bump org.codehaus.mojo:jaxb2-maven-plugin from 3.1.0 to 3.2.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated (7a25371d -> 233688af)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from 7a25371d Bump org.apache.maven.plugins:maven-compiler-plugin (#262) add 233688af Bump spring.amqp.version from 3.1.2 to 3.1.4 (#261) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-karaf) branch dependabot/maven/spring.amqp.version-3.1.4 deleted (was ac494ab2)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/spring.amqp.version-3.1.4 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was ac494ab2 Bump spring.amqp.version from 3.1.2 to 3.1.4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.13.0 deleted (was 6b45281b)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.13.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 6b45281b Bump org.apache.maven.plugins:maven-compiler-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated (c7b553c0 -> 56f1ba67)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from c7b553c0 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.3 (#255) add 56f1ba67 Bump org.slf4j:slf4j-api from 2.0.10 to 2.0.13 (#263) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-karaf) branch dependabot/maven/cxf.version-4.0.4 deleted (was 17045fb7)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/cxf.version-4.0.4 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 17045fb7 Bump cxf.version from 4.0.3 to 4.0.4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated (c231428f -> bbb36ed4)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from c231428f Bump org.apache.maven.plugins:maven-dependency-plugin (#257) add bbb36ed4 Bump cxf.version from 4.0.3 to 4.0.4 (#256) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-karaf) branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.6.1 deleted (was 06ef7de5)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.6.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 06ef7de5 Bump org.apache.maven.plugins:maven-dependency-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated (b21d2c55 -> c231428f)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from b21d2c55 Bump org.codehaus.mojo:jaxb2-maven-plugin from 3.1.0 to 3.2.0 (#258) add c231428f Bump org.apache.maven.plugins:maven-dependency-plugin (#257) No new revisions were added by this update. Summary of changes: components/camel-blueprint/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(camel-karaf) branch main updated (233688af -> b21d2c55)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from 233688af Bump spring.amqp.version from 3.1.2 to 3.1.4 (#261) add b21d2c55 Bump org.codehaus.mojo:jaxb2-maven-plugin from 3.1.0 to 3.2.0 (#258) No new revisions were added by this update. Summary of changes: components/camel-blueprint/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-karaf) branch dependabot/maven/org.slf4j-slf4j-api-2.0.13 deleted (was d8c4a7f4)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/org.slf4j-slf4j-api-2.0.13 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was d8c4a7f4 Bump org.slf4j:slf4j-api from 2.0.10 to 2.0.13 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated (56f1ba67 -> 7a25371d)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from 56f1ba67 Bump org.slf4j:slf4j-api from 2.0.10 to 2.0.13 (#263) add 7a25371d Bump org.apache.maven.plugins:maven-compiler-plugin (#262) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-karaf) branch dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.5.3 deleted (was b9c14b03)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.5.3 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was b9c14b03 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.3 (#255)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new c7b553c0 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1
to 3.5.3 (#255)
c7b553c0 is described below
commit c7b553c053e29244c81d9aacbf5608366fa26169
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Apr 29 16:20:29 2024 +0200
Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.3 (#255)
Bumps
[org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin)
from 3.5.1 to 3.5.3.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
-
[Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.1...maven-shade-plugin-3.5.3)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ffac37ce..ec6fd0c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -557,7 +557,7 @@
version="${camel.osgi.version.range}"
org.apache.camel.*;${camel.osgi.import.camel.version},
-3.5.1
+3.5.3
5.1.9
3.11.0
1.3_1
(camel-karaf) branch dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.5.0 deleted (was a45352b1)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.5.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was a45352b1 Bump org.codehaus.mojo:build-helper-maven-plugin from 3.4.0 to 3.5.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: Bump org.codehaus.mojo:build-helper-maven-plugin from 3.4.0 to 3.5.0 (#254)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new d9344510 Bump org.codehaus.mojo:build-helper-maven-plugin from 3.4.0 to 3.5.0 (#254) d9344510 is described below commit d9344510b01009e3fad8b6a73b029f4227310951 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Apr 29 16:07:50 2024 +0200 Bump org.codehaus.mojo:build-helper-maven-plugin from 3.4.0 to 3.5.0 (#254) Bumps [org.codehaus.mojo:build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/3.4.0...3.5.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- features/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/pom.xml b/features/pom.xml index 112aaa2a..44f8bff3 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -96,7 +96,7 @@ org.codehaus.mojo build-helper-maven-plugin -3.4.0 +3.5.0 attach-artifact
(camel-karaf) branch main updated (7653b3a6 -> 2d1aa00b)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from 7653b3a6 Add distribution for CI add 2d1aa00b Bump karaf.version from 4.4.5 to 4.4.6 (#253) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-karaf) branch dependabot/maven/karaf.version-4.4.6 deleted (was 6fa13aca)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch dependabot/maven/karaf.version-4.4.6 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 6fa13aca Bump karaf.version from 4.4.5 to 4.4.6 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: Add distribution for CI
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 7653b3a6 Add distribution for CI 7653b3a6 is described below commit 7653b3a6106a24b5c3f0e7843dd20f860184884a Author: JB Onofré AuthorDate: Mon Apr 29 15:30:31 2024 +0200 Add distribution for CI --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3413718c..b924127f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,4 +37,5 @@ jobs: - uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - run: ./mvnw -V --no-transfer-progress clean install
(camel-karaf) branch main updated: Fix GH actions
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 3e7fc11e Fix GH actions
3e7fc11e is described below
commit 3e7fc11ed546e663cf777a725b994c0024f9a75c
Author: JB Onofré
AuthorDate: Mon Apr 29 15:27:53 2024 +0200
Fix GH actions
---
.github/workflows/{test-karaf-camel-main.yml => main.yml} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/test-karaf-camel-main.yml
b/.github/workflows/main.yml
similarity index 95%
rename from .github/workflows/test-karaf-camel-main.yml
rename to .github/workflows/main.yml
index a7b88e80..3413718c 100644
--- a/.github/workflows/test-karaf-camel-main.yml
+++ b/.github/workflows/main.yml
@@ -37,4 +37,4 @@ jobs:
- uses: actions/setup-java@v4
with:
java-version: 17
-run: ./mvnw -V --no-transfer-progress clean install
+ - run: ./mvnw -V --no-transfer-progress clean install
[camel-quarkus] branch main updated: Fix Spring integration test (#4788)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 567c89c735 Fix Spring integration test (#4788)
567c89c735 is described below
commit 567c89c735c233dfe95db263143b51442b5b238e
Author: JB Onofré
AuthorDate: Mon Apr 17 19:06:31 2023 +0200
Fix Spring integration test (#4788)
---
.../org/apache/camel/quarkus/support/spring/test/SpringSupportTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/extensions-support/spring/integration-test/src/test/java/org/apache/camel/quarkus/support/spring/test/SpringSupportTest.java
b/extensions-support/spring/integration-test/src/test/java/org/apache/camel/quarkus/support/spring/test/SpringSupportTest.java
index c14a16d814..7817655aff 100644
---
a/extensions-support/spring/integration-test/src/test/java/org/apache/camel/quarkus/support/spring/test/SpringSupportTest.java
+++
b/extensions-support/spring/integration-test/src/test/java/org/apache/camel/quarkus/support/spring/test/SpringSupportTest.java
@@ -61,7 +61,7 @@ public class SpringSupportTest {
public void verifySourcesJarManifest() throws Exception {
String[] springModules = new String[] { "beans", "context", "core" };
for (String module : springModules) {
-Path path = Paths.get("../" + module + "/target");
+Path path = Paths.get("../shade/" + module + "/target");
File file = path.toFile();
if (!file.exists()) {
throw new IllegalStateException("The sources JAR location does
not exist: " + file.getAbsolutePath());
[camel-karaf] branch camel-karaf-3.21.x deleted (was 886e72ca)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch camel-karaf-3.21.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 886e72ca Remove docs for components removed in v4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-karaf] branch camel-karaf-3.21.x created (now 886e72ca)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch camel-karaf-3.21.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at 886e72ca Remove docs for components removed in v4 No new revisions were added by this update.
[camel-karaf] branch master updated: Fix features verify
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new ac6691a Fix features verify
ac6691a is described below
commit ac6691af48c7db32bc10d029c5819d8665fe5e10
Author: jbonofre
AuthorDate: Tue Jan 12 12:44:23 2021 +0100
Fix features verify
---
platforms/karaf/features/src/main/resources/features.xml | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 07d1428..0892adf 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -19,9 +19,9 @@
-->
http://karaf.apache.org/xmlns/features/v1.5.0;
name='camel-${project.version}'>
mvn:org.apache.cxf.karaf/apache-cxf/[3,4)/xml/features
-
mvn:org.apache.jclouds.karaf/jclouds-karaf/[2,3)/xml/features
+
mvn:org.apache.jclouds.karaf/jclouds-karaf/[2.1,2.1]/xml/features
mvn:org.ops4j.pax.cdi/pax-cdi-features/[1,2)/xml/features
-
mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/${hibernate-validator-version}/xml/features
+
mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/[6.2,6.2]/xml/features
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}
@@ -619,7 +619,7 @@
camel-core
-hibernate-validator
+hibernate-validator
mvn:org.apache.camel/camel-bean-validator/${project.version}
@@ -738,7 +738,7 @@
camel-core
cxf-specs
-hibernate-validator
+hibernate-validator
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libphonenumber/${libphonenumber-bundle-version}
mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
@@ -1423,9 +1423,9 @@
camel-core
-jclouds
-jclouds-blobstore
-jclouds-compute
+jclouds
+jclouds-blobstore
+jclouds-compute
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}
mvn:org.apache.camel/camel-jclouds/${project.version}
[camel-karaf] branch master updated: [CAMEL-16010] Extend pax-logging import range in camel-paxlogging
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new bb9f5dc [CAMEL-16010] Extend pax-logging import range in camel-paxlogging bb9f5dc is described below commit bb9f5dc1c8706954468f831563acd95618165a4a Author: jbonofre AuthorDate: Sat Jan 9 16:10:58 2021 +0100 [CAMEL-16010] Extend pax-logging import range in camel-paxlogging --- components/camel-paxlogging/pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml index 9a491eb..c7a6fe2 100644 --- a/components/camel-paxlogging/pom.xml +++ b/components/camel-paxlogging/pom.xml @@ -32,6 +32,10 @@ Camel OSGi Pax Logging support + +org.ops4j.pax.logging*;version="[1,3)", +* +
[camel-karaf] branch master updated: [CAMEL-15529] Use range in inner repositories
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 79dfa35 [CAMEL-15529] Use range in inner repositories
79dfa35 is described below
commit 79dfa35ff299a779687eb85e7bc34785969cfe16
Author: jbonofre
AuthorDate: Mon Jan 11 13:59:30 2021 +0100
[CAMEL-15529] Use range in inner repositories
---
platforms/karaf/features/src/main/resources/features.xml | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 8efeca9..d9faa03 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -18,11 +18,10 @@
-->
http://karaf.apache.org/xmlns/features/v1.5.0;
name='camel-${project.version}'>
-
mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features
-
mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features
-
mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax-cdi-version}/xml/features
-
mvn:org.apache.karaf.features/spring-legacy/${karaf4-version}/xml/features
-
mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/${hibernate-validator-version}/xml/features
+
mvn:org.apache.cxf.karaf/apache-cxf/[3,4)/xml/features
+
mvn:org.apache.jclouds.karaf/jclouds-karaf/[2,3)/xml/features
+
mvn:org.ops4j.pax.cdi/pax-cdi-features/[1,2)/xml/features
+
mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/[6,7)/xml/features
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}
[camel-karaf] branch master updated: [CAMEL-15466] Use azure bundle version properties and released version
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 3442b97 [CAMEL-15466] Use azure bundle version properties and
released version
3442b97 is described below
commit 3442b974cf2adc0e161b52a7fe4a8186978c89b6
Author: jbonofre
AuthorDate: Sat Aug 29 18:35:07 2020 +0200
[CAMEL-15466] Use azure bundle version properties and released version
---
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
pom.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index eb1af30..aea250e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -616,9 +616,9 @@
mvn:org.apache.qpid/proton-j/${qpid-proton-j-version}
camel-azure-storage-blob
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core/${azure-core-bundle-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core-amqp/1.4.0_1-SNAPSHOT
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-messaging-eventhubs/5.1.2_1-SNAPSHOT
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-messaging-eventhubs-checkpointstore-blob/1.1.2_1-SNAPSHOT
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core-amqp/${azure-core-amqp-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-messaging-eventhubs/${azure-messaging-eventhubs-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-messaging-eventhubs-checkpointstore-blob/${azure-messaging-eventhubs-checkpointstore-blob-bundle-version}
mvn:org.apache.camel/camel-azure-eventhubs/${project.version}
diff --git a/pom.xml b/pom.xml
index 6768976..c7f99b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,9 @@
1.9.1_1
1.11.714_1
1.4.0_1
+
1.4.0_1
+
5.1.2_1
+
1.1.2_1
12.7.0_1
12.7.0_1
12.5.2_1
[camel-karaf] branch master updated: [CAMEL-15466] Add camel-azure-eventhubs feature
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 5f0e86a [CAMEL-15466] Add camel-azure-eventhubs feature
5f0e86a is described below
commit 5f0e86af1c32908aa7c744c52ac9fb76db8119a6
Author: jbonofre
AuthorDate: Fri Aug 28 21:30:13 2020 +0200
[CAMEL-15466] Add camel-azure-eventhubs feature
---
.../karaf/features/src/main/resources/features.xml | 21 +
1 file changed, 21 insertions(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index e7ac495..eb1af30 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -600,6 +600,27 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-queue/${azure-storage-queue-bundle-version}
mvn:org.apache.camel/camel-azure-storage-queue/${project.version}
+
+camel-core
+mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}
+mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}
+mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}
+mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}
+mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}
+mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}
+mvn:io.projectreactor/reactor-core/${reactor-version}
+mvn:commons-io/commons-io/${commons-io-version}
+mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}
+mvn:org.apache.qpid/proton-j/${qpid-proton-j-version}
+camel-azure-storage-blob
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core/${azure-core-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core-amqp/1.4.0_1-SNAPSHOT
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-messaging-eventhubs/5.1.2_1-SNAPSHOT
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-messaging-eventhubs-checkpointstore-blob/1.1.2_1-SNAPSHOT
+
mvn:org.apache.camel/camel-azure-eventhubs/${project.version}
+
camel-core
mvn:commons-codec/commons-codec/${commons-codec-version}
[camel-karaf] branch camel-karaf-3.4.x updated: [CAMEL-15461] Upgrade to jedis 3.3.0_2 bundle
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch camel-karaf-3.4.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/camel-karaf-3.4.x by this push: new 6674d82 [CAMEL-15461] Upgrade to jedis 3.3.0_2 bundle 6674d82 is described below commit 6674d82db6919da03a6ddae7760842ebb43b4425 Author: jbonofre AuthorDate: Sat Aug 29 14:36:11 2020 +0200 [CAMEL-15461] Upgrade to jedis 3.3.0_2 bundle (cherry picked from commit 4cdbb0106996f31332777b8c246c60eb5c9bff58) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a2b275..615daac 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ 2.3.0 2.3.1_1 2.0.6_1 -3.1.0_1 +3.3.0_2 9.4.20.v20190813 20030619_5 1.6.2
[camel-karaf] branch master updated: [CAMEL-15461] Upgrade to jedis 3.3.0_2 bundle
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new 4cdbb01 [CAMEL-15461] Upgrade to jedis 3.3.0_2 bundle 4cdbb01 is described below commit 4cdbb0106996f31332777b8c246c60eb5c9bff58 Author: jbonofre AuthorDate: Sat Aug 29 14:36:11 2020 +0200 [CAMEL-15461] Upgrade to jedis 3.3.0_2 bundle --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c62a7a0..6768976 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ 2.3.0 2.3.1_1 2.0.6_1 -3.1.0_1 +3.3.0_2 9.4.20.v20190813 20030619_5 1.6.2
[camel-karaf] branch camel-karaf-3.4.x updated: [CAMEL-15441] Upgrade to spring-data 2.3.2.RELEASE_2 bundles version
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch camel-karaf-3.4.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/camel-karaf-3.4.x by this push: new 1dc7143 [CAMEL-15441] Upgrade to spring-data 2.3.2.RELEASE_2 bundles version 1dc7143 is described below commit 1dc7143c23ca855e2e0a7c8b7133ffea2a5f4705 Author: jbonofre AuthorDate: Sat Aug 29 14:33:21 2020 +0200 [CAMEL-15441] Upgrade to spring-data 2.3.2.RELEASE_2 bundles version (cherry picked from commit 9cdfc024a2c46697f80579188810f0e962994d09) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0095287..9a2b275 100644 --- a/pom.xml +++ b/pom.xml @@ -233,9 +233,9 @@ 1.1.7.3 8.4.1_1 4.2.2.RELEASE_1 - 2.3.2.RELEASE_2-SNAPSHOT - 2.3.2.RELEASE_2-SNAPSHOT - 2.3.2.RELEASE_2-SNAPSHOT + 2.3.2.RELEASE_2 + 2.3.2.RELEASE_2 + 2.3.2.RELEASE_2 2.3.3.RELEASE_1 3.0.8.RELEASE_1 3.0.7.RELEASE_1
[camel-karaf] branch master updated: [CAMEL-15441] Upgrade to spring-data 2.3.2.RELEASE_2 bundles version
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new 9cdfc02 [CAMEL-15441] Upgrade to spring-data 2.3.2.RELEASE_2 bundles version 9cdfc02 is described below commit 9cdfc024a2c46697f80579188810f0e962994d09 Author: jbonofre AuthorDate: Sat Aug 29 14:33:21 2020 +0200 [CAMEL-15441] Upgrade to spring-data 2.3.2.RELEASE_2 bundles version --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 898c033..c62a7a0 100644 --- a/pom.xml +++ b/pom.xml @@ -235,9 +235,9 @@ 1.1.7.3 8.6.0_1 4.2.4.RELEASE_1 - 2.3.2.RELEASE_2-SNAPSHOT - 2.3.2.RELEASE_2-SNAPSHOT - 2.3.2.RELEASE_2-SNAPSHOT + 2.3.2.RELEASE_2 + 2.3.2.RELEASE_2 + 2.3.2.RELEASE_2 2.3.3.RELEASE_1 3.0.8.RELEASE_1 3.0.7.RELEASE_1
[camel-karaf] branch camel-karaf-3.4.x updated: [CAMEL-15440] Upgrade to released elasticsearch 7.7.0_2 bundle version
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch camel-karaf-3.4.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/camel-karaf-3.4.x by this push: new fdb25a1 [CAMEL-15440] Upgrade to released elasticsearch 7.7.0_2 bundle version fdb25a1 is described below commit fdb25a1954b82bc26faa2ed9d48ac78b28a58f1a Author: jbonofre AuthorDate: Sat Aug 29 14:31:06 2020 +0200 [CAMEL-15440] Upgrade to released elasticsearch 7.7.0_2 bundle version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e0d7a6..0095287 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ 1.0.0.Final 2.1.5_1 2.10.6 - 7.7.0_2-SNAPSHOT + 7.7.0_2 0.3.0 2.4.13_1 1.2.68_1
[camel-karaf] branch master updated: [CAMEL-15440] Use released elasticsearch 7.8.0_2 bundle version
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new b0fe21e [CAMEL-15440] Use released elasticsearch 7.8.0_2 bundle version b0fe21e is described below commit b0fe21e1a4615c65019776cd0cf24a92c17a68d2 Author: jbonofre AuthorDate: Sat Aug 29 14:28:24 2020 +0200 [CAMEL-15440] Use released elasticsearch 7.8.0_2 bundle version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 781dfb3..898c033 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 1.0.0.Final 2.1.5_1 2.10.6 - 7.8.0_2-SNAPSHOT + 7.8.0_2 0.3.0 2.4.13_1 1.2.73_1
[camel] branch master updated: Extend OSGi import version range for reactor in camel-azure-eventhubs component
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c1159c7 Extend OSGi import version range for reactor in
camel-azure-eventhubs component
c1159c7 is described below
commit c1159c7d7b81268e60237177dce4152e3e676214
Author: jbonofre
AuthorDate: Thu Aug 27 10:32:31 2020 +0200
Extend OSGi import version range for reactor in camel-azure-eventhubs
component
---
components/camel-azure-eventhubs/pom.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/components/camel-azure-eventhubs/pom.xml
b/components/camel-azure-eventhubs/pom.xml
index bd06e37..99d58a4 100644
--- a/components/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure-eventhubs/pom.xml
@@ -33,6 +33,12 @@
Camel Azure Event Hubs Component
+
+!org.apache.camel.component.azure.eventhubs*,
+reactor*;version="[3,4)",
+${camel.osgi.import.defaults},
+*
+
[camel-karaf] branch camel-karaf-3.4.x updated: [CAMEL-15441] Upgrade spring-data bundles to 2.3.x
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch camel-karaf-3.4.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/camel-karaf-3.4.x by this push: new 6966a04 [CAMEL-15441] Upgrade spring-data bundles to 2.3.x 6966a04 is described below commit 6966a044ab254edcb52788813807f7f68421a228 Author: jbonofre AuthorDate: Thu Aug 20 18:59:27 2020 +0200 [CAMEL-15441] Upgrade spring-data bundles to 2.3.x --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8ea1509..7e0d7a6 100644 --- a/pom.xml +++ b/pom.xml @@ -233,9 +233,9 @@ 1.1.7.3 8.4.1_1 4.2.2.RELEASE_1 - 2.2.4.RELEASE_1 - 2.2.4.RELEASE_1 - 2.2.4.RELEASE_1 + 2.3.2.RELEASE_2-SNAPSHOT + 2.3.2.RELEASE_2-SNAPSHOT + 2.3.2.RELEASE_2-SNAPSHOT 2.3.3.RELEASE_1 3.0.8.RELEASE_1 3.0.7.RELEASE_1
[camel-karaf] branch camel-karaf-3.4.x updated: [CAMEL-15440] Use unique elasticsearch bundle (no client anymore)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch camel-karaf-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/camel-karaf-3.4.x by this push:
new 2854072 [CAMEL-15440] Use unique elasticsearch bundle (no client
anymore)
2854072 is described below
commit 2854072c94fb176bac2bdfadbf1549375a863be7
Author: jbonofre
AuthorDate: Thu Aug 20 18:55:24 2020 +0200
[CAMEL-15440] Use unique elasticsearch bundle (no client anymore)
---
platforms/karaf/features/src/main/resources/features.xml | 1 -
pom.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index f6a5694..7b7a34e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -972,7 +972,6 @@
mvn:io.netty/netty-codec-http/${netty-version}
mvn:io.netty/netty-codec-dns/${netty-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch-rest-bundle-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch-client/${elasticsearch-rest-bundle-version}
mvn:org.apache.logging.log4j/log4j-core/${log4j2-version}
mvn:org.apache.logging.log4j/log4j-api/${log4j2-version}
mvn:org.apache.camel/camel-elasticsearch-rest/${project.version}
diff --git a/pom.xml b/pom.xml
index 7e301a4..8ea1509 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
1.0.0.Final
2.1.5_1
2.10.6
-
7.7.0_1
+
7.7.0_2-SNAPSHOT
0.3.0
2.4.13_1
1.2.68_1
[camel-karaf] branch master updated: [CAMEL-15441] Prepare spring-data 2.3.2.RELEASE_2 bundles update
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new f3d0088 [CAMEL-15441] Prepare spring-data 2.3.2.RELEASE_2 bundles update f3d0088 is described below commit f3d00889b53e61fa99b8bf953c770af144a02606 Author: jbonofre AuthorDate: Thu Aug 20 18:52:08 2020 +0200 [CAMEL-15441] Prepare spring-data 2.3.2.RELEASE_2 bundles update --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1896b11..0a65158 100644 --- a/pom.xml +++ b/pom.xml @@ -237,9 +237,9 @@ 1.1.7.3 8.5.1_1 4.2.4.RELEASE_1 - 2.2.4.RELEASE_1 - 2.2.4.RELEASE_1 - 2.2.4.RELEASE_1 + 2.3.2.RELEASE_2-SNAPSHOT + 2.3.2.RELEASE_2-SNAPSHOT + 2.3.2.RELEASE_2-SNAPSHOT 2.3.3.RELEASE_1 3.0.8.RELEASE_1 3.0.7.RELEASE_1
[camel-karaf] branch master updated: [CAMEL-15440] Use only elasticsearch bundle (no elasticsearch-client anymore) and prepare update to 7.8.0_2
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 18fc539 [CAMEL-15440] Use only elasticsearch bundle (no
elasticsearch-client anymore) and prepare update to 7.8.0_2
18fc539 is described below
commit 18fc5395badc378b7d61cf6fdccba255f4953b75
Author: jbonofre
AuthorDate: Thu Aug 20 18:50:28 2020 +0200
[CAMEL-15440] Use only elasticsearch bundle (no elasticsearch-client
anymore) and prepare update to 7.8.0_2
---
platforms/karaf/features/src/main/resources/features.xml | 1 -
pom.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 81a5535..caa14a4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -974,7 +974,6 @@
mvn:io.netty/netty-codec-http/${netty-version}
mvn:io.netty/netty-codec-dns/${netty-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch-rest-bundle-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch-client/${elasticsearch-rest-bundle-version}
mvn:org.apache.logging.log4j/log4j-core/${log4j2-version}
mvn:org.apache.logging.log4j/log4j-api/${log4j2-version}
mvn:org.apache.camel/camel-elasticsearch-rest/${project.version}
diff --git a/pom.xml b/pom.xml
index 5bfe21d..1896b11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
1.0.0.Final
2.1.5_1
2.10.6
-
7.8.0_1
+
7.8.0_2-SNAPSHOT
0.3.0
2.4.13_1
1.2.72_1
[camel-karaf] branch master updated: [CAMEL-14978] Create features for camel-azure-storage-blob and camel-azure-storage-queue components (#6)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 88340e3 [CAMEL-14978] Create features for camel-azure-storage-blob
and camel-azure-storage-queue components (#6)
88340e3 is described below
commit 88340e32fcd8c34844225b76f15ed3002077
Author: Jean-Baptiste Onofré
AuthorDate: Mon May 4 10:44:11 2020 +0200
[CAMEL-14978] Create features for camel-azure-storage-blob and
camel-azure-storage-queue components (#6)
---
docs/modules/ROOT/pages/components.adoc| 5 +++-
.../karaf/features/src/main/resources/features.xml | 34 ++
pom.xml| 4 +++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/pages/components.adoc
b/docs/modules/ROOT/pages/components.adoc
index 5899948..9d8f0e9 100644
--- a/docs/modules/ROOT/pages/components.adoc
+++ b/docs/modules/ROOT/pages/components.adoc
@@ -5,7 +5,7 @@ Apache Camel Karaf supports the following Camel artifacts as
Karaf features
== Camel Components
// components: START
-Number of Camel components: 207 in 207 JAR artifacts (1 deprecated)
+Number of Camel components: 208 in 208 JAR artifacts (1 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -95,6 +95,9 @@ Number of Camel components: 207 in 207 JAR artifacts (1
deprecated)
| xref:components::aws-translate-component.adoc[AWS Translate]
(camel-aws-translate) +
`aws-translate:label` | 3.0 | Translate texts using AWS Translate.
+| xref:components::azure-storage-blob-component.adoc[Azure Storage Blob
Service] (camel-azure-storage-blob) +
+`azure-storage-blob:containerName` | 3.3 | Store and retrieve blobs from Azure
Storage Blob Service using SDK v12.
+
| xref:components::bean-component.adoc[Bean] (camel-bean) +
`bean:beanName` | 1.0 | Invoke methods of Java beans stored in Camel registry.
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 5d4aead..02f83cd 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -560,6 +560,40 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage/${azure-storage-java-sdk-bundle-version}
mvn:org.apache.camel/camel-azure/${project.version}
+
+camel-core
+mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}
+mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}
+mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}
+mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}
+mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}
+mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}
+mvn:io.projectreactor/reactor-core/${reactor-version}
+mvn:commons-io/commons-io/${commons-io-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core/${azure-core-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-common/${azure-storage-common-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-blob/${azure-storage-blob-bundle-version}
+
mvn:org.apache.camel/camel-azure-storage-blob/${project.version}
+
+
+camel-core
+mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}
+mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}
+mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}
+mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}
+mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}
+mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}
+mvn:io.projectreactor/reactor-core/${reactor-version}
+mvn:commons-io/commons-io/${commons-io-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core/${azure-core-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-common/${azure-storage-common-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-queue/${azure-storage-queue-bundle-version}
+
mvn:org.apache.camel/camel-azure-storage-queue/${project.version}
+
camel-core
m
[camel] branch camel-2.x updated: [CAMEL-14156] Avoid NPE with endpoint is null in JmsBinding (#3328)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new b1b3158 [CAMEL-14156] Avoid NPE with endpoint is null in JmsBinding
(#3328)
b1b3158 is described below
commit b1b3158c3dfed8e40403fd81b11bb56dce5ad79f
Author: Jean-Baptiste Onofré
AuthorDate: Fri Nov 8 22:14:12 2019 +0100
[CAMEL-14156] Avoid NPE with endpoint is null in JmsBinding (#3328)
(cherry picked from commit 0d32cdd815fdcd5a09eb8f967fd1815be4937dee)
---
.../java/org/apache/camel/component/jms/JmsBinding.java | 2 +-
.../org/apache/camel/component/jms/JmsBindingTest.java| 15 +++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index 2d080f4..9e13928 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -376,7 +376,7 @@ public class JmsBinding {
public void appendJmsProperty(Message jmsMessage, Exchange exchange,
org.apache.camel.Message in,
String headerName, Object headerValue)
throws JMSException {
if (isStandardJMSHeader(headerName)) {
-if (headerName.equals("JMSCorrelationID") &&
!endpoint.isUseMessageIDAsCorrelationID()) {
+if (headerName.equals("JMSCorrelationID") && (endpoint == null ||
!endpoint.isUseMessageIDAsCorrelationID())) {
jmsMessage.setJMSCorrelationID(ExchangeHelper.convertToType(exchange,
String.class, headerValue));
} else if (headerName.equals("JMSReplyTo") && headerValue != null)
{
if (headerValue instanceof String) {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
index 4efeb3f..a109bda 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
@@ -22,6 +22,9 @@ import java.time.Instant;
import java.util.Date;
import org.apache.activemq.command.ActiveMQBlobMessage;
+import org.apache.activemq.command.ActiveMQTextMessage;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.DefaultExchange;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -54,6 +57,18 @@ public class JmsBindingTest {
}
@Test
+public void noEndpointTest() throws Exception {
+JmsBinding testBindingWithoutEndpoint = new JmsBinding();
+ActiveMQTextMessage message = new ActiveMQTextMessage();
+message.setText("test");
+DefaultCamelContext camelContext = new DefaultCamelContext();
+DefaultExchange exchange = new DefaultExchange(camelContext);
+exchange.getIn().setBody("test");
+exchange.getIn().setHeader("JMSCorrelationID", null);
+testBindingWithoutEndpoint.appendJmsProperties(message, exchange);
+}
+
+@Test
public void testExtractNullBodyFromJmsShouldReturnNull() throws Exception {
assertNull(jmsBindingUnderTest.extractBodyFromJms(null, new
ActiveMQBlobMessage()));
}
[1/2] git commit: [CAMEL-6983] Be sure to get the PaxLoggingEvent properties from the local thread
Updated Branches:
refs/heads/master 4f06ebaec - c1616bcfa
[CAMEL-6983] Be sure to get the PaxLoggingEvent properties from the local thread
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33f1fca0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33f1fca0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33f1fca0
Branch: refs/heads/master
Commit: 33f1fca0ce3895f6f21226c1e52fdb78a533acd7
Parents: 8fe106b
Author: Jean-Baptiste Onofré jbono...@apache.org
Authored: Tue Nov 19 18:17:34 2013 +0100
Committer: Jean-Baptiste Onofré jbono...@apache.org
Committed: Tue Nov 19 18:17:34 2013 +0100
--
.../org/apache/camel/component/paxlogging/PaxLoggingConsumer.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/33f1fca0/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
--
diff --git
a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
index 7e9b44d..51eb2dc 100644
---
a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
+++
b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
@@ -53,6 +53,8 @@ public class PaxLoggingConsumer extends DefaultConsumer
implements PaxAppender {
}
public void doAppend(final PaxLoggingEvent paxLoggingEvent) {
+// in order to force the copy of properties (especially the MDC
ones) in the local thread
+paxLoggingEvent.getProperties();
executor.execute(new Runnable() {
public void run() {
sendExchange(paxLoggingEvent);
git commit: [CAMEL-6983] Copy the properties from the PaxLoggingEvent from the local thread
Updated Branches:
refs/heads/camel-2.12.x 88e0a4af0 - d89e76f81
[CAMEL-6983] Copy the properties from the PaxLoggingEvent from the local thread
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d89e76f8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d89e76f8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d89e76f8
Branch: refs/heads/camel-2.12.x
Commit: d89e76f816acef449610291629759ae86fb7a602
Parents: 88e0a4a
Author: Jean-Baptiste Onofré jbono...@apache.org
Authored: Tue Nov 19 19:00:40 2013 +0100
Committer: Jean-Baptiste Onofré jbono...@apache.org
Committed: Tue Nov 19 19:00:40 2013 +0100
--
.../org/apache/camel/component/paxlogging/PaxLoggingConsumer.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d89e76f8/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
--
diff --git
a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
index 7e9b44d..d6e5835 100644
---
a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
+++
b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
@@ -53,6 +53,8 @@ public class PaxLoggingConsumer extends DefaultConsumer
implements PaxAppender {
}
public void doAppend(final PaxLoggingEvent paxLoggingEvent) {
+// in order to force the copy of the properties (especially the MDC
ones) from the local thread
+paxLoggingEvent.getProperties();
executor.execute(new Runnable() {
public void run() {
sendExchange(paxLoggingEvent);
git commit: [CAMEL-6983] Copy the properties from the PaxLoggingEvent from the local thread
Updated Branches:
refs/heads/camel-2.11.x 5d3f0836b - 3c6b6c578
[CAMEL-6983] Copy the properties from the PaxLoggingEvent from the local thread
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c6b6c57
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c6b6c57
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c6b6c57
Branch: refs/heads/camel-2.11.x
Commit: 3c6b6c57880aa8e7142af684b71faeea83318935
Parents: 5d3f083
Author: Jean-Baptiste Onofré jbono...@apache.org
Authored: Tue Nov 19 19:00:40 2013 +0100
Committer: Jean-Baptiste Onofré jbono...@apache.org
Committed: Tue Nov 19 19:09:44 2013 +0100
--
.../org/apache/camel/component/paxlogging/PaxLoggingConsumer.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3c6b6c57/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
--
diff --git
a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
index 3352007..a0d8cb1 100644
---
a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
+++
b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
@@ -53,6 +53,8 @@ public class PaxLoggingConsumer extends DefaultConsumer
implements PaxAppender {
}
public void doAppend(final PaxLoggingEvent paxLoggingEvent) {
+// in order to force the copy of the properties (especially the MDC
ones) from the local thread
+paxLoggingEvent.getProperties();
executor.execute(new Runnable() {
public void run() {
sendExchange(paxLoggingEvent);
git commit: [CAMEL-6983] Copy the properties from the PaxLoggingEvent from the local thread
Updated Branches:
refs/heads/camel-2.10.x eab28f18a - d6ccae162
[CAMEL-6983] Copy the properties from the PaxLoggingEvent from the local thread
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d6ccae16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d6ccae16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d6ccae16
Branch: refs/heads/camel-2.10.x
Commit: d6ccae1622eb47981520fb586b900bc7f302aff6
Parents: eab28f1
Author: Jean-Baptiste Onofré jbono...@apache.org
Authored: Tue Nov 19 19:00:40 2013 +0100
Committer: Jean-Baptiste Onofré jbono...@apache.org
Committed: Tue Nov 19 19:24:58 2013 +0100
--
.../org/apache/camel/component/paxlogging/PaxLoggingConsumer.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d6ccae16/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
--
diff --git
a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
index 0385628..2095276 100644
---
a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
+++
b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
@@ -52,6 +52,8 @@ public class PaxLoggingConsumer extends DefaultConsumer
implements PaxAppender {
}
public void doAppend(final PaxLoggingEvent paxLoggingEvent) {
+// in order to force the copy of the properties (especially the MDC
ones) from the local thread
+paxLoggingEvent.getProperties();
executor.execute(new Runnable() {
public void run() {
sendExchange(paxLoggingEvent);
git commit: [CAMEL-6497] Upgrade to commons-logging 1.1.3
Updated Branches: refs/heads/master 7e53a3c58 - 0868bfd17 [CAMEL-6497] Upgrade to commons-logging 1.1.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0868bfd1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0868bfd1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0868bfd1 Branch: refs/heads/master Commit: 0868bfd17ac601d21e76a11c1ea531078aa15298 Parents: 7e53a3c Author: Jean-Baptiste Onofré jbono...@apache.org Authored: Fri Jun 28 08:11:25 2013 +0200 Committer: Jean-Baptiste Onofré jbono...@apache.org Committed: Fri Jun 28 08:11:25 2013 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/0868bfd1/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index cf5dc0b..b4c0f49 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -95,7 +95,7 @@ commons-lang-version2.6/commons-lang-version commons-lang-version-xmljson2.5/commons-lang-version-xmljson commons-lang3-version3.1/commons-lang3-version -commons-logging-version1.1.2/commons-logging-version +commons-logging-version1.1.3/commons-logging-version commons-math-version2.2/commons-math-version !-- commons-net 3.2 has a bug so keep using 3.1, see NET-492 -- commons-net-version3.1/commons-net-version
git commit: [CAMEL-6495] Upgrade to Hazelcast 2.6
Updated Branches: refs/heads/master b0a6db144 - 981c7929d [CAMEL-6495] Upgrade to Hazelcast 2.6 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/981c7929 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/981c7929 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/981c7929 Branch: refs/heads/master Commit: 981c7929da81286599bf9ebe8f3b8ea0dc6d9f38 Parents: b0a6db1 Author: Jean-Baptiste Onofré jbono...@apache.org Authored: Thu Jun 27 21:25:08 2013 +0200 Committer: Jean-Baptiste Onofré jbono...@apache.org Committed: Thu Jun 27 21:25:08 2013 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/981c7929/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 69dbecb..cf5dc0b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -167,7 +167,7 @@ hawtbuf-version1.9/hawtbuf-version hawtdb-version1.6/hawtdb-version hawtdispatch-version1.17/hawtdispatch-version -hazelcast-version2.5/hazelcast-version +hazelcast-version2.6/hazelcast-version hbase-version0.94.3/hbase-version hbase-bundle-version0.94.3_1/hbase-bundle-version hibernate-validator-version4.3.1.Final/hibernate-validator-version
git commit: [CAMEL-6495] Upgrade to Hazelcast 2.6
Updated Branches: refs/heads/camel-2.11.x c3d948aaa - 4aa818361 [CAMEL-6495] Upgrade to Hazelcast 2.6 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4aa81836 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4aa81836 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4aa81836 Branch: refs/heads/camel-2.11.x Commit: 4aa818361b8f825f3f38f114ba214b7e9a164048 Parents: c3d948a Author: Jean-Baptiste Onofré jbono...@apache.org Authored: Thu Jun 27 21:27:05 2013 +0200 Committer: Jean-Baptiste Onofré jbono...@apache.org Committed: Thu Jun 27 21:27:05 2013 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4aa81836/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 187aad6..a29d9ca 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -166,7 +166,7 @@ hawtbuf-version1.9/hawtbuf-version hawtdb-version1.6/hawtdb-version hawtdispatch-version1.13/hawtdispatch-version -hazelcast-version2.5/hazelcast-version +hazelcast-version2.6/hazelcast-version hbase-version0.94.3/hbase-version hbase-bundle-version0.94.3_1/hbase-bundle-version hibernate-validator-bundle-version4.1.0.Final_3/hibernate-validator-bundle-version
svn commit: r1240679 - in /camel/trunk: components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java parent/pom.xml
Author: jbonofre
Date: Sun Feb 5 08:35:10 2012
New Revision: 1240679
URL: http://svn.apache.org/viewvc?rev=1240679view=rev
Log:
[CAMEL-4977] Upgrade to Krati 0.4.3
Modified:
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
camel/trunk/parent/pom.xml
Modified:
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java?rev=1240679r1=1240678r2=1240679view=diff
==
---
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
(original)
+++
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
Sun Feb 5 08:35:10 2012
@@ -20,11 +20,7 @@ import java.io.File;
import krati.core.StoreConfig;
import krati.core.segment.SegmentFactory;
import krati.io.Serializer;
-import krati.sos.SerializableObjectStore;
-import krati.store.DataSet;
-import krati.store.DataStore;
-import krati.store.DynamicDataSet;
-import krati.store.DynamicDataStore;
+import krati.store.*;
import krati.util.HashFunction;
import org.apache.camel.RuntimeCamelException;
@@ -35,7 +31,7 @@ public final class KratiHelper {
}
/**
- * Creates a {@link krati.sos.SerializableObjectStore} with the given
parameters.
+ * Creates a {@link krati.store.SerializableObjectStore} with the given
parameters.
*
* @param pathThe directory which the store will use.
* @param initialCapacity
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1240679r1=1240678r2=1240679view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Feb 5 08:35:10 2012
@@ -116,7 +116,7 @@
juel-version2.1.2/juel-version
junit-version4.8.1/junit-version
karaf-version2.2.5/karaf-version
-krati-version0.4.1/krati-version
+krati-version0.4.3/krati-version
log4j-version1.2.16/log4j-version
lucene-version3.0.3/lucene-version
mina-version1.1.7/mina-version
svn commit: r1240681 - in /camel/branches/camel-2.9.x: components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java parent/pom.xml
Author: jbonofre
Date: Sun Feb 5 08:36:45 2012
New Revision: 1240681
URL: http://svn.apache.org/viewvc?rev=1240681view=rev
Log:
[CAMEL-4977] Upgrade to Krati 0.4.3
Modified:
camel/branches/camel-2.9.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
camel/branches/camel-2.9.x/parent/pom.xml
Modified:
camel/branches/camel-2.9.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java?rev=1240681r1=1240680r2=1240681view=diff
==
---
camel/branches/camel-2.9.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
Sun Feb 5 08:36:45 2012
@@ -20,11 +20,7 @@ import java.io.File;
import krati.core.StoreConfig;
import krati.core.segment.SegmentFactory;
import krati.io.Serializer;
-import krati.sos.SerializableObjectStore;
-import krati.store.DataSet;
-import krati.store.DataStore;
-import krati.store.DynamicDataSet;
-import krati.store.DynamicDataStore;
+import krati.store.*;
import krati.util.HashFunction;
import org.apache.camel.RuntimeCamelException;
import org.slf4j.Logger;
@@ -39,7 +35,7 @@ public final class KratiHelper {
}
/**
- * Creates a {@link krati.sos.SerializableObjectStore} with the given
parameters.
+ * Creates a {@link krati.store.SerializableObjectStore} with the given
parameters.
*
* @param pathThe directory which the store will use.
* @param initialCapacity
Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1240681r1=1240680r2=1240681view=diff
==
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Sun Feb 5 08:36:45 2012
@@ -113,7 +113,7 @@
juel-version2.1.2/juel-version
junit-version4.8.1/junit-version
karaf-version2.2.5/karaf-version
-krati-version0.4.1/krati-version
+krati-version0.4.3/krati-version
log4j-version1.2.16/log4j-version
lucene-version3.0.3/lucene-version
mina-version1.1.7/mina-version
svn commit: r1240769 - /camel/trunk/parent/pom.xml
Author: jbonofre Date: Sun Feb 5 17:55:45 2012 New Revision: 1240769 URL: http://svn.apache.org/viewvc?rev=1240769view=rev Log: [CAMEL-4979] Upgrade to hsqldb 2.2.8 Modified: camel/trunk/parent/pom.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1240769r1=1240768r2=1240769view=diff == --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Sun Feb 5 17:55:45 2012 @@ -90,7 +90,7 @@ hazelcast-version1.9.4.6/hazelcast-version hibernate-version3.2.6.ga/hibernate-version hibernate-entitymanager-version3.2.1.ga/hibernate-entitymanager-version -hsqldb-version2.2.6/hsqldb-version +hsqldb-version2.2.8/hsqldb-version httpunit-version1.6.2/httpunit-version httpcore4-version4.1.2/httpcore4-version httpclient4-version4.1.2/httpclient4-version
svn commit: r1240771 - /camel/branches/camel-2.9.x/parent/pom.xml
Author: jbonofre Date: Sun Feb 5 17:57:03 2012 New Revision: 1240771 URL: http://svn.apache.org/viewvc?rev=1240771view=rev Log: [CAMEL-4979] Upgrade to hsqldb 2.2.8 Modified: camel/branches/camel-2.9.x/parent/pom.xml Modified: camel/branches/camel-2.9.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1240771r1=1240770r2=1240771view=diff == --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Sun Feb 5 17:57:03 2012 @@ -86,7 +86,7 @@ hazelcast-version1.9.4.6/hazelcast-version hibernate-version3.2.6.ga/hibernate-version hibernate-entitymanager-version3.2.1.ga/hibernate-entitymanager-version -hsqldb-version2.2.6/hsqldb-version +hsqldb-version2.2.8/hsqldb-version httpunit-version1.6.2/httpunit-version httpcore4-version4.1.2/httpcore4-version httpclient4-version4.1.2/httpclient4-version
svn commit: r1240792 - /camel/trunk/parent/pom.xml
Author: jbonofre Date: Sun Feb 5 20:03:19 2012 New Revision: 1240792 URL: http://svn.apache.org/viewvc?rev=1240792view=rev Log: [CAMEL-4981] Upgrade to jruby 1.6.6 Modified: camel/trunk/parent/pom.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1240792r1=1240791r2=1240792view=diff == --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Sun Feb 5 20:03:19 2012 @@ -111,7 +111,7 @@ jettison-version1.3/jettison-version jexcelapi-version2.4.2/jexcelapi-version jibx-version1.2.3/jibx-version -jruby-version1.6.5/jruby-version +jruby-version1.6.6/jruby-version jsmpp-version2.1.0_3/jsmpp-version jsch-version0.1.44-1/jsch-version juel-version2.1.2/juel-version
svn commit: r1240793 - /camel/branches/camel-2.9.x/parent/pom.xml
Author: jbonofre Date: Sun Feb 5 20:04:03 2012 New Revision: 1240793 URL: http://svn.apache.org/viewvc?rev=1240793view=rev Log: [CAMEL-4981] Upgrade to jruby 1.6.6 Modified: camel/branches/camel-2.9.x/parent/pom.xml Modified: camel/branches/camel-2.9.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1240793r1=1240792r2=1240793view=diff == --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Sun Feb 5 20:04:03 2012 @@ -107,7 +107,7 @@ jettison-version1.3/jettison-version jexcelapi-version2.4.2/jexcelapi-version jibx-version1.2.3/jibx-version -jruby-version1.6.5/jruby-version +jruby-version1.6.6/jruby-version jsmpp-version2.1.0_3/jsmpp-version jsch-version0.1.44-1/jsch-version juel-version2.1.2/juel-version
svn commit: r1240144 - /camel/trunk/parent/pom.xml
Author: jbonofre
Date: Fri Feb 3 12:51:45 2012
New Revision: 1240144
URL: http://svn.apache.org/viewvc?rev=1240144view=rev
Log:
[CAMEL-4972] Remove h2database dependency
Modified:
camel/trunk/parent/pom.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1240144r1=1240143r2=1240144view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Feb 3 12:51:45 2012
@@ -79,7 +79,6 @@
groovy-version1.8.5/groovy-version
gson-version2.1/gson-version
guiceyfruit-version2.0/guiceyfruit-version
-h2-version1.3.161/h2-version
hadoop-version1.0.0/hadoop-version
hamcrest-version1.1/hamcrest-version
hapi-version1.2/hapi-version
@@ -1388,11 +1387,6 @@
artifactIdhsqldb/artifactId
version${hsqldb-version}/version
/dependency
- dependency
-groupIdcom.h2database/groupId
-artifactIdh2/artifactId
-version${h2-version}/version
- /dependency
!-- optional SNMP4J --
dependency
svn commit: r1240146 - /camel/branches/camel-2.9.x/parent/pom.xml
Author: jbonofre
Date: Fri Feb 3 12:57:09 2012
New Revision: 1240146
URL: http://svn.apache.org/viewvc?rev=1240146view=rev
Log:
[CAMEL-4972] Remove h2database dependency
Modified:
camel/branches/camel-2.9.x/parent/pom.xml
Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1240146r1=1240145r2=1240146view=diff
==
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Fri Feb 3 12:57:09 2012
@@ -78,7 +78,6 @@
geronimo-servlet-spec-version1.1.2/geronimo-servlet-spec-version
groovy-version1.8.5/groovy-version
guiceyfruit-version2.0/guiceyfruit-version
-h2-version1.3.161/h2-version
hadoop-version0.20.203.0/hadoop-version
hamcrest-version1.1/hamcrest-version
hapi-version1.2/hapi-version
@@ -1372,11 +1371,6 @@
artifactIdhsqldb/artifactId
version${hsqldb-version}/version
/dependency
- dependency
-groupIdcom.h2database/groupId
-artifactIdh2/artifactId
-version${h2-version}/version
- /dependency
!-- optional SNMP4J --
dependency
svn commit: r1240248 - /camel/branches/camel-2.8.x/parent/pom.xml
Author: jbonofre Date: Fri Feb 3 17:04:36 2012 New Revision: 1240248 URL: http://svn.apache.org/viewvc?rev=1240248view=rev Log: [CAMEL-4975] Update to h2database 1.3.163 Modified: camel/branches/camel-2.8.x/parent/pom.xml Modified: camel/branches/camel-2.8.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1240248r1=1240247r2=1240248view=diff == --- camel/branches/camel-2.8.x/parent/pom.xml (original) +++ camel/branches/camel-2.8.x/parent/pom.xml Fri Feb 3 17:04:36 2012 @@ -79,7 +79,7 @@ geronimo-servlet-spec-version1.1.2/geronimo-servlet-spec-version groovy-version1.8.5/groovy-version guiceyfruit-version2.0/guiceyfruit-version -h2-version1.2.144/h2-version +h2-version1.3.163/h2-version hadoop-version0.20.203.0/hadoop-version hamcrest-version1.1/hamcrest-version hapi-version1.2/hapi-version
svn commit: r1239507 - /camel/trunk/camel-core/pom.xml
Author: jbonofre Date: Thu Feb 2 09:37:02 2012 New Revision: 1239507 URL: http://svn.apache.org/viewvc?rev=1239507view=rev Log: [CAMEL-4280] Fix OSGi version used in core Modified: camel/trunk/camel-core/pom.xml Modified: camel/trunk/camel-core/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1239507r1=1239506r2=1239507view=diff == --- camel/trunk/camel-core/pom.xml (original) +++ camel/trunk/camel-core/pom.xml Thu Feb 2 09:37:02 2012 @@ -72,7 +72,6 @@ dependency groupIdorg.osgi/groupId artifactIdorg.osgi.core/artifactId -version4.1.0/version scopeprovided/scope optionaltrue/optional /dependency
svn commit: r1239702 - /camel/branches/camel-2.9.x/camel-core/pom.xml
Author: jbonofre Date: Thu Feb 2 16:17:43 2012 New Revision: 1239702 URL: http://svn.apache.org/viewvc?rev=1239702view=rev Log: [CAMEL-4280] Cleanup OSGi version in core Modified: camel/branches/camel-2.9.x/camel-core/pom.xml Modified: camel/branches/camel-2.9.x/camel-core/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/pom.xml?rev=1239702r1=1239701r2=1239702view=diff == --- camel/branches/camel-2.9.x/camel-core/pom.xml (original) +++ camel/branches/camel-2.9.x/camel-core/pom.xml Thu Feb 2 16:17:43 2012 @@ -72,7 +72,6 @@ dependency groupIdorg.osgi/groupId artifactIdorg.osgi.core/artifactId -version4.1.0/version scopeprovided/scope optionaltrue/optional /dependency
svn commit: r1239705 - /camel/branches/camel-2.8.x/camel-core/pom.xml
Author: jbonofre Date: Thu Feb 2 16:19:38 2012 New Revision: 1239705 URL: http://svn.apache.org/viewvc?rev=1239705view=rev Log: [CAMEL-4280] Cleanup OSGi version in core Modified: camel/branches/camel-2.8.x/camel-core/pom.xml Modified: camel/branches/camel-2.8.x/camel-core/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/pom.xml?rev=1239705r1=1239704r2=1239705view=diff == --- camel/branches/camel-2.8.x/camel-core/pom.xml (original) +++ camel/branches/camel-2.8.x/camel-core/pom.xml Thu Feb 2 16:19:38 2012 @@ -104,7 +104,6 @@ dependency groupIdorg.osgi/groupId artifactIdorg.osgi.core/artifactId -version4.1.0/version scopeprovided/scope optionaltrue/optional /dependency
svn commit: r1224683 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Mon Dec 26 06:51:55 2011
New Revision: 1224683
URL: http://svn.apache.org/viewvc?rev=1224683view=rev
Log:
Revert xml-specs-api dependency in the features and let the user handle that
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1224683r1=1224682r2=1224683view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Dec 26 06:51:55 2011
@@ -154,7 +154,6 @@
bundlemvn:org.apache.camel/camel-apns/${project.version}/bundle
/feature--
feature name='camel-atom' version='${project.version}' resolver='(obr)'
start-level='50'
-feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
bundle
dependency='true'mvn:javax.mail/mail/${javax-mail-version}/bundle
bundle
dependency='true'mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}/bundle
@@ -287,7 +286,6 @@
bundlemvn:org.apache.camel/camel-hawtdb/${project.version}/bundle
/feature
feature name='camel-hdfs' version='${project.version}' resolver='(obr)'
start-level='50'
-feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
featurewar/feature
bundle
dependency='true'mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}/bundle
@@ -379,7 +377,6 @@
bundlemvn:org.apache.camel/camel-jing/${project.version}/bundle
/feature
feature name='camel-jibx' version='${project.version}' resolver='(obr)'
start-level='50'
-feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-jibx/${project.version}/bundle
bundle dependency='true'mvn:org.jibx/jibx-run/${jibx-version}/bundle
@@ -602,7 +599,6 @@
bundlemvn:org.apache.camel/camel-snmp/${project.version}/bundle
/feature
feature name='camel-soap' version='${project.version}' resolver='(obr)'
start-level='50'
-feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-jaxb/feature
bundle
dependency='true'mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}/bundle
bundle
dependency='true'mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}/bundle
@@ -713,7 +709,6 @@
bundlemvn:org.apache.camel/camel-xmpp/${project.version}/bundle
/feature
feature name='camel-xstream' version='${project.version}' resolver='(obr)'
start-level='50'
-feature version='${servicemix-specs-version}'xml-specs-api/feature
bundle
dependency='true'mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}/bundle
feature version='${project.version}'camel-core/feature
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}/bundle
svn commit: r1222709 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Fri Dec 23 15:56:36 2011
New Revision: 1222709
URL: http://svn.apache.org/viewvc?rev=1222709view=rev
Log:
[CAMEL-4818] camel-hdfs and camel-soap reference xml-specs-api feature
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1222709r1=1222708r2=1222709view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Dec 23 15:56:36 2011
@@ -282,6 +282,7 @@
bundlemvn:org.apache.camel/camel-hawtdb/${project.version}/bundle
/feature
feature name='camel-hdfs' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
featurewar/feature
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}/bundle
@@ -595,6 +596,7 @@
bundlemvn:org.apache.camel/camel-snmp/${project.version}/bundle
/feature
feature name='camel-soap' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-jaxb/feature
bundle
dependency=truemvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}/bundle
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}/bundle
svn commit: r1222723 - /camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Fri Dec 23 16:20:23 2011
New Revision: 1222723
URL: http://svn.apache.org/viewvc?rev=1222723view=rev
Log:
[CAMEL-4818] camel-hdfs and camel-soap now reference xml-specs-api
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1222723r1=1222722r2=1222723view=diff
==
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Fri Dec 23 16:20:23 2011
@@ -282,6 +282,7 @@
bundlemvn:org.apache.camel/camel-hawtdb/${project.version}/bundle
/feature
feature name='camel-hdfs' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
featurewar/feature
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}/bundle
@@ -585,6 +586,7 @@
bundlemvn:org.apache.camel/camel-snmp/${project.version}/bundle
/feature
feature name='camel-soap' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-jaxb/feature
bundle
dependency=truemvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}/bundle
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}/bundle
svn commit: r1222765 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Fri Dec 23 17:35:22 2011
New Revision: 1222765
URL: http://svn.apache.org/viewvc?rev=1222765view=rev
Log:
[CAMEL-4815] camel-atom feature references the xml-specs-api feature
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1222765r1=1222764r2=1222765view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Dec 23 17:35:22 2011
@@ -150,6 +150,7 @@
bundlemvn:org.apache.camel/camel-apns/${project.version}/bundle
/feature--
feature name='camel-atom' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
bundle
dependency=truemvn:javax.mail/mail/${javax-mail-version}/bundle
bundle
dependency=truemvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}/bundle
svn commit: r1222769 - /camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Fri Dec 23 17:57:13 2011
New Revision: 1222769
URL: http://svn.apache.org/viewvc?rev=1222769view=rev
Log:
[CAMEL-4815] camel-atom references xml-specs-api feature
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1222769r1=1222768r2=1222769view=diff
==
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Fri Dec 23 17:57:13 2011
@@ -149,6 +149,7 @@
bundlemvn:org.apache.camel/camel-apns/${project.version}/bundle
/feature --
feature name='camel-atom' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
bundle
dependency=truemvn:javax.mail/mail/${javax-mail-version}/bundle
bundle
dependency=truemvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}/bundle
svn commit: r1222821 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Fri Dec 23 20:00:51 2011
New Revision: 1222821
URL: http://svn.apache.org/viewvc?rev=1222821view=rev
Log:
[CAMEL-4819] camel-jibx and camel-xstream reference xml-specs-api feature
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1222821r1=1222820r2=1222821view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Dec 23 20:00:51 2011
@@ -375,6 +375,7 @@
bundlemvn:org.apache.camel/camel-jing/${project.version}/bundle
/feature
feature name='camel-jibx' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-jibx/${project.version}/bundle
bundle dependency=truemvn:org.jibx/jibx-run/${jibx-version}/bundle
@@ -708,6 +709,7 @@
bundlemvn:org.apache.camel/camel-xmpp/${project.version}/bundle
/feature
feature name='camel-xstream' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
bundle
dependency=truemvn:org.codehaus.jettison/jettison/${jettison-bundle-version}/bundle
feature version='${project.version}'camel-core/feature
bundle
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}/bundle
svn commit: r1222825 - /camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Fri Dec 23 20:17:14 2011
New Revision: 1222825
URL: http://svn.apache.org/viewvc?rev=1222825view=rev
Log:
[CAMEL-4819] camel-jibx and camel-xstream features reference the xml-specs-api
feature
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1222825r1=1222824r2=1222825view=diff
==
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Fri Dec 23 20:17:14 2011
@@ -368,6 +368,7 @@
bundlemvn:org.apache.camel/camel-jing/${project.version}/bundle
/feature
feature name='camel-jibx' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-jibx/${project.version}/bundle
bundle dependency=truemvn:org.jibx/jibx-run/${jibx-version}/bundle
@@ -687,6 +688,7 @@
bundlemvn:org.apache.camel/camel-xmpp/${project.version}/bundle
/feature
feature name='camel-xstream' version='${project.version}' resolver='(obr)'
start-level='50'
+feature version='${servicemix-specs-version}'xml-specs-api/feature
bundle
dependency=truemvn:org.codehaus.jettison/jettison/${jettison-bundle-version}/bundle
feature version='${project.version}'camel-core/feature
bundle
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}/bundle
svn commit: r1222924 - /camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Sat Dec 24 06:55:55 2011
New Revision: 1222924
URL: http://svn.apache.org/viewvc?rev=1222924view=rev
Log:
[CAMEL-4828] Add woodstox bundles in the xml-specs-api feature
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1222924r1=1222923r2=1222924view=diff
==
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Sat Dec 24 06:55:55 2011
@@ -17,13 +17,16 @@
limitations under the License.
--
features name='camel-${project.version}'
+
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
+
feature name=xml-specs-api version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/bundle
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}/bundle
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}/bundle
+bundle
dependency=truemvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}/bundle
+bundle
dependency=truemvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-core-bundle-version}/bundle
/feature
-
feature name='camel' version='${project.version}' resolver='(obr)'
start-level='50'
feature version='${project.version}'camel-core/feature
feature version='${project.version}'camel-spring/feature
@@ -695,8 +698,6 @@
bundle
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}/bundle
bundle
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}/bundle
bundle
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}/bundle
-bundle
dependency=truemvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}/bundle
-bundle
dependency=truemvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-core-bundle-version}/bundle
bundle
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}/bundle
bundlemvn:org.apache.camel/camel-xstream/${project.version}/bundle
/feature
svn commit: r1222079 [1/2] - in /camel/trunk: components/camel-cxf/src/main/resources/META-INF/ components/camel-spring-integration/src/main/resources/META-INF/ components/camel-spring-security/src/ma
Author: jbonofre
Date: Thu Dec 22 07:30:16 2011
New Revision: 1222079
URL: http://svn.apache.org/viewvc?rev=1222079view=rev
Log:
[CAMEL-4783] Replace ${pom.version} (deprecated) by ${project.version}
Modified:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas
camel/trunk/examples/camel-example-aggregate/src/main/resources/features.xml
camel/trunk/examples/camel-example-cafe/src/main/resources/features.xml
camel/trunk/examples/camel-example-cxf/src/main/resources/features.xml
camel/trunk/examples/camel-example-docs/src/main/resources/features.xml
camel/trunk/examples/camel-example-etl/src/main/resources/features.xml
camel/trunk/examples/camel-example-guice-jms/src/main/resources/features.xml
camel/trunk/examples/camel-example-jms-file/src/main/resources/features.xml
camel/trunk/examples/camel-example-loan-broker/src/main/resources/features.xml
camel/trunk/examples/camel-example-management/src/main/resources/features.xml
camel/trunk/examples/camel-example-osgi-rmi/src/main/resources/features.xml
camel/trunk/examples/camel-example-osgi/src/main/resources/features.xml
camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/features.xml
camel/trunk/examples/camel-example-route-throttling/src/main/resources/features.xml
camel/trunk/examples/camel-example-spring-javaconfig/src/main/resources/features.xml
camel/trunk/examples/camel-example-spring-jms/src/main/resources/features.xml
camel/trunk/examples/camel-example-spring-xquery/src/main/resources/features.xml
camel/trunk/examples/camel-example-spring/src/main/resources/features.xml
camel/trunk/examples/camel-example-tracer/src/main/resources/features.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=1222079r1=1222078r2=1222079view=diff
==
--- camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
(original)
+++ camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
Thu Dec 22 07:30:16 2011
@@ -39,4 +39,4 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.8.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.8.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.8.3.xsd=schema/cxfEndpoint.xsd
-http\://camel.apache.org/schema/cxf/camel-cxf-${pom.version}.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
Modified:
camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas?rev=1222079r1=1222078r2=1222079view=diff
==
---
camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
Thu Dec 22 07:30:16 2011
@@ -36,4 +36,4 @@ http\://camel.apache.org/schema/spring/i
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.8.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.8.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.8.3.xsd=schema/camel-spring-integration.xsd
-http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${pom.version}.xsd=schema/camel-spring-integration.xsd
\ No newline at end of file
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
\ No newline at end of file
Modified:
camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas?rev=1222079r1=1222078r2=1222079view=diff
==
---
camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
Thu Dec 22 07:30:16 2011
svn commit: r1214732 - in /camel/branches/camel-2.8.x: parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/bundles.properties platforms/karaf/features/src/main/
Author: jbonofre
Date: Thu Dec 15 12:42:09 2011
New Revision: 1214732
URL: http://svn.apache.org/viewvc?rev=1214732view=rev
Log:
[CAMEL-4777] Features now uses jetty or war features in place of referencing
geronimo-servlet, geronimo-jsp, geronimo-el
Modified:
camel/branches/camel-2.8.x/parent/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1214732r1=1214731r2=1214732view=diff
==
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Thu Dec 15 12:42:09 2011
@@ -75,7 +75,6 @@
geronimo-j2ee-management-spec-version1.1/geronimo-j2ee-management-spec-version
geronimo-jms-spec-version1.1.1/geronimo-jms-spec-version
geronimo-jpa-spec-version1.1.1/geronimo-jpa-spec-version
-geronimo-jsp-spec-version1.0.1/geronimo-jsp-spec-version
geronimo-jta-spec-version1.1.1/geronimo-jta-spec-version
geronimo-servlet-spec-version1.1.2/geronimo-servlet-spec-version
groovy-version1.8.4/groovy-version
@@ -1024,11 +1023,6 @@
/dependency
dependency
groupIdorg.apache.geronimo.specs/groupId
-artifactIdgeronimo-jsp_2.1_spec/artifactId
-version${geronimo-jsp-spec-version}/version
- /dependency
- dependency
-groupIdorg.apache.geronimo.specs/groupId
artifactIdgeronimo-jta_1.1_spec/artifactId
version${geronimo-jta-spec-version}/version
/dependency
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1214732r1=1214731r2=1214732view=diff
==
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Thu Dec 15
12:42:09 2011
@@ -45,7 +45,7 @@
cometd-java-server-bundle-version2.3.1_1/cometd-java-server-bundle-version
commons-beanutils-bundle-version1.7.0_3/commons-beanutils-bundle-version
commons-csv-version1.0-r706899_3/commons-csv-version
- commons-codec-version${commons-code}/commons-codec-version
+ commons-codec-version${commons-codec}/commons-codec-version
commons-codec-bundle-version1.3_3/commons-codec-bundle-version
commons-configuration-version1.6/commons-configuration-version
commons-daemon-version1.0.5/commons-daemon-version
@@ -66,7 +66,6 @@
flatpack-bundle-version3.2.0_2/flatpack-bundle-version
freemarker-bundle-version2.3.18_1/freemarker-bundle-version
geronimo-el-version1.0.1/geronimo-el-version
- geronimo-jsp-version1.0.1/geronimo-jsp-version
geronimo-ws-metadata-spec-version1.1.3/geronimo-ws-metadata-spec-version
gernimo-annotation-spec-version1.1.1/gernimo-annotation-spec-version
gernimo-jaxws22-spec-version1.1/gernimo-jaxws22-spec-version
@@ -110,7 +109,6 @@
oscache-bundle-version2.4_5/oscache-bundle-version
qpid-bundle-version0.12_1/qpid-bundle-version
quickfix-bundle-version1.5.1_1/quickfix-bundle-version
- pax.web.version0.7.2/pax.web.version
quartz-bundle-version1.8.3_2/quartz-bundle-version
protobuf-java-bundle-version2.3.0_1/protobuf-java-bundle-version
regexp-bundle-version1.3_2/regexp-bundle-version
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties?rev=1214732r1=1214731r2=1214732view=diff
==
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties
Thu Dec 15 12:42:09 2011
@@ -28,10 +28,6 @@ org.apache.servicemix.specs/org.apache.s
org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}/jar
org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/jar
-#Apache Geronimo specs
-org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}/jar
-org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}/jar
-
#Apache ServiceMix bundles
org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}/jar
svn commit: r1214739 - /camel/trunk/platforms/karaf/features/pom.xml
Author: jbonofre
Date: Thu Dec 15 13:08:55 2011
New Revision: 1214739
URL: http://svn.apache.org/viewvc?rev=1214739view=rev
Log:
[CAMEL-4777] Fix codec version in the features and cleanup pax-web version (no
more required)
Modified:
camel/trunk/platforms/karaf/features/pom.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1214739r1=1214738r2=1214739view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Dec 15 13:08:55 2011
@@ -45,7 +45,7 @@
cometd-java-server-bundle-version2.3.1_1/cometd-java-server-bundle-version
commons-beanutils-bundle-version1.7.0_3/commons-beanutils-bundle-version
commons-csv-version1.0-r706899_3/commons-csv-version
- commons-codec-version${commons-code}/commons-codec-version
+ commons-codec-version${commons-codec}/commons-codec-version
commons-codec-bundle-version1.3_3/commons-codec-bundle-version
commons-configuration-version1.6/commons-configuration-version
commons-daemon-version1.0.5/commons-daemon-version
@@ -102,7 +102,6 @@
opensaml-version2.4.1_1/opensaml-version
oscache-bundle-version2.4_5/oscache-bundle-version
protobuf-java-bundle-version2.3.0_1/protobuf-java-bundle-version
- pax-web-version0.7.2/pax-web-version
quartz-bundle-version1.8.5_1/quartz-bundle-version
qpid-bundle-version0.12_1/qpid-bundle-version
quickfix-bundle-version1.5.1_1/quickfix-bundle-version
svn commit: r1214428 - in /camel/trunk: parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/bundles.properties
Author: jbonofre
Date: Wed Dec 14 19:53:21 2011
New Revision: 1214428
URL: http://svn.apache.org/viewvc?rev=1214428view=rev
Log:
[CAMEL-4777] Remove the geronimo-jsp reference as it's not explicitly used
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1214428r1=1214427r2=1214428view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Dec 14 19:53:21 2011
@@ -74,7 +74,6 @@
geronimo-jms-spec-version1.1.1/geronimo-jms-spec-version
geronimo-jpa-spec-version1.1.1/geronimo-jpa-spec-version
geronimo-jpa2-spec-version1.1/geronimo-jpa2-spec-version
-geronimo-jsp-spec-version1.0.1/geronimo-jsp-spec-version
geronimo-jta-spec-version1.1.1/geronimo-jta-spec-version
geronimo-servlet-spec-version1.1.2/geronimo-servlet-spec-version
groovy-version1.8.4/groovy-version
@@ -1056,11 +1055,6 @@
/dependency
dependency
groupIdorg.apache.geronimo.specs/groupId
-artifactIdgeronimo-jsp_2.1_spec/artifactId
-version${geronimo-jsp-spec-version}/version
- /dependency
- dependency
-groupIdorg.apache.geronimo.specs/groupId
artifactIdgeronimo-jta_1.1_spec/artifactId
version${geronimo-jta-spec-version}/version
/dependency
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1214428r1=1214427r2=1214428view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Dec 14 19:53:21 2011
@@ -65,7 +65,6 @@
felix-framework-version2.0.5/felix-framework-version
freemarker-bundle-version2.3.18_1/freemarker-bundle-version
geronimo-el-version1.0.1/geronimo-el-version
- geronimo-jsp-version1.0.1/geronimo-jsp-version
geronimo-ws-metadata-spec-version1.1.3/geronimo-ws-metadata-spec-version
gernimo-annotation-spec-version1.1.1/gernimo-annotation-spec-version
gernimo-jaxws22-spec-version1.1/gernimo-jaxws22-spec-version
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties?rev=1214428r1=1214427r2=1214428view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
Wed Dec 14 19:53:21 2011
@@ -28,10 +28,6 @@ org.apache.servicemix.specs/org.apache.s
org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}/jar
org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/jar
-#Apache Geronimo specs
-org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}/jar
-org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}/jar
-
#Apache ServiceMix bundles
org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}/jar
svn commit: r1211313 - in /camel/trunk/platforms/karaf/commands/src/main: java/org/apache/camel/karaf/commands/ resources/OSGI-INF/blueprint/
Author: jbonofre Date: Wed Dec 7 07:24:16 2011 New Revision: 1211313 URL: http://svn.apache.org/viewvc?rev=1211313view=rev Log: [CAMEL-4746] Use the Karaf command format in Camel commands Added: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/InfoContextCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ListContextsCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextStart.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/StartContextCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextStop.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/StopContextCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/InfoRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ListRoutesCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ResumeRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteShow.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ShowRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/StartRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/StopRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java - copied, changed from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/SuspendRouteCommand.java Removed: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/InfoContextCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/InfoRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ListContextsCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ListRoutesCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ResumeRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ShowRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/StartContextCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/StartRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/StopContextCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/StopRouteCommand.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/SuspendRouteCommand.java Modified: camel/trunk/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml Copied: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java (from r1211308, camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/InfoContextCommand.java) URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java?p2=camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.javap1=camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/InfoContextCommand.javar1=1211308r2=1211313rev=1211313view=diff
svn commit: r1207903 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Tue Nov 29 15:14:09 2011
New Revision: 1207903
URL: http://svn.apache.org/viewvc?rev=1207903view=rev
Log:
[CAMEL-4707] Remove the namespace definition in the features XML to avoid unit
tests failure
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1207903r1=1207902r2=1207903view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Nov 29 15:14:09 2011
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-features name='camel-${pom.version}'
xmlns='http://karaf.apache.org/xmlns/features/v1.0.0'
+features name='camel-${pom.version}'
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
repositorymvn:org.jclouds.karaf/jclouds-karaf/${jclouds-feature-version}/xml/features/repository
feature name=xml-specs-api version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'
svn commit: r1207910 - /camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Tue Nov 29 15:30:05 2011
New Revision: 1207910
URL: http://svn.apache.org/viewvc?rev=1207910view=rev
Log:
[CAMEL-4707] To avoid unit tests failure, remove the namespace in the features
XML
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1207910r1=1207909r2=1207910view=diff
==
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Tue Nov 29 15:30:05 2011
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-features name='camel-${pom.version}'
xmlns='http://karaf.apache.org/xmlns/features/v1.0.0'
+features name='camel-${pom.version}'
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
feature name=xml-specs-api version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/bundle
svn commit: r1205740 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Thu Nov 24 07:11:39 2011
New Revision: 1205740
URL: http://svn.apache.org/viewvc?rev=1205740view=rev
Log:
[CAMEL-4707] Define the namespace in the Karaf features XML
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1205740r1=1205739r2=1205740view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Nov 24 07:11:39 2011
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-features name='camel-${pom.version}'
+features name='camel-${pom.version}'
xmlns=http://karaf.apache.org/xmlns/features/v1.0.0;
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
repositorymvn:org.jclouds.karaf/jclouds-karaf/${jclouds-feature-version}/xml/features/repository
feature name=xml-specs-api version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'
svn commit: r1205743 - /camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Thu Nov 24 07:20:59 2011
New Revision: 1205743
URL: http://svn.apache.org/viewvc?rev=1205743view=rev
Log:
[CAMEL-4707] Add namespace in the Karaf features XML
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1205743r1=1205742r2=1205743view=diff
==
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Thu Nov 24 07:20:59 2011
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-features name='camel-${pom.version}'
+features name='camel-${pom.version}'
xmlns='http://karaf.apache.org/xmlns/features/v1.0.0'
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
feature name=xml-specs-api version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'
bundle
dependency=truemvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/bundle
svn commit: r1205744 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: jbonofre
Date: Thu Nov 24 07:22:23 2011
New Revision: 1205744
URL: http://svn.apache.org/viewvc?rev=1205744view=rev
Log:
[CAMEL-4707] Fix typo: use simple quote instead of double quote
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1205744r1=1205743r2=1205744view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Nov 24 07:22:23 2011
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-features name='camel-${pom.version}'
xmlns=http://karaf.apache.org/xmlns/features/v1.0.0;
+features name='camel-${pom.version}'
xmlns='http://karaf.apache.org/xmlns/features/v1.0.0'
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
repositorymvn:org.jclouds.karaf/jclouds-karaf/${jclouds-feature-version}/xml/features/repository
feature name=xml-specs-api version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'
svn commit: r1189139 - in /camel/trunk: components/camel-quickfix/ components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/ components/camel-quickfix/src/test/java/org/apache/came
Author: jbonofre
Date: Wed Oct 26 11:40:49 2011
New Revision: 1189139
URL: http://svn.apache.org/viewvc?rev=1189139view=rev
Log:
[CAMEL-4585] Upgrade to Quickfix/J 1.5.1
Modified:
camel/trunk/components/camel-quickfix/pom.xml
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
Modified: camel/trunk/components/camel-quickfix/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/pom.xml?rev=1189139r1=1189138r2=1189139view=diff
==
--- camel/trunk/components/camel-quickfix/pom.xml (original)
+++ camel/trunk/components/camel-quickfix/pom.xml Wed Oct 26 11:40:49 2011
@@ -38,9 +38,9 @@
repositories
repository
-idfusesource.m2/id
-nameFusesource Dependency Repository/name
-urlhttp://repo.fusesource.com/maven2-all/url
+idsmx.m2/id
+nameServiceMix M2 Repository/name
+urlhttp://svn.apache.org/repos/asf/servicemix/m2-repo/url
/repository
/repositories
Modified:
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java?rev=1189139r1=1189138r2=1189139view=diff
==
---
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
(original)
+++
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
Wed Oct 26 11:40:49 2011
@@ -195,13 +195,13 @@ public class QuickfixjEngine {
if (acceptor != null) {
acceptor.start();
if (jmxExporter != null) {
-jmxExporter.export(acceptor);
+jmxExporter.register(acceptor);
}
}
if (initiator != null) {
initiator.start();
if (jmxExporter != null) {
-jmxExporter.export(initiator);
+jmxExporter.register(initiator);
}
}
started = true;
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java?rev=1189139r1=1189138r2=1189139view=diff
==
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
Wed Oct 26 11:40:49 2011
@@ -363,6 +363,7 @@ public class QuickfixjEngineTest {
}
@Test
+@Ignore(The unit test works but we have a collision with the
enableJmxForInitiator one)
public void enableJmxForAcceptor() throws Exception {
settings.setBool(QuickfixjEngine.SETTING_USE_JMX, true);
settings.setString(sessionID, SessionFactory.SETTING_CONNECTION_TYPE,
SessionFactory.ACCEPTOR_CONNECTION_TYPE);
@@ -372,6 +373,7 @@ public class QuickfixjEngineTest {
quickfixjEngine = new QuickfixjEngine(quickfix:test,
settingsFile.getName(), false);
quickfixjEngine.start();
+
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
SetObjectName n = mbeanServer.queryNames(new
ObjectName(org.quickfixj:type=Connector,role=Acceptor,*), null);
assertFalse(QFJ mbean not registered, n.isEmpty());
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java?rev=1189139r1=1189138r2=1189139view=diff
==
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
Wed Oct 26 11:40:49 2011
@@ -199,7 +199,7 @@ public class TradeExecutor {
if (provider != null
svn commit: r1185026 - /camel/trunk/parent/pom.xml
Author: jbonofre Date: Mon Oct 17 07:12:06 2011 New Revision: 1185026 URL: http://svn.apache.org/viewvc?rev=1185026view=rev Log: [CAMEL-4550] Upgrade to Karaf 2.2.4 Modified: camel/trunk/parent/pom.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1185026r1=1185025r2=1185026view=diff == --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Mon Oct 17 07:12:06 2011 @@ -113,7 +113,7 @@ jsch-version0.1.44-1/jsch-version juel-version2.1.2/juel-version junit-version4.8.1/junit-version -karaf-version2.2.4-SNAPSHOT/karaf-version +karaf-version2.2.4/karaf-version log4j-version1.2.16/log4j-version lucene-version3.0.3/lucene-version mina-version1.1.7/mina-version
svn commit: r1182244 - /camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Author: jbonofre
Date: Wed Oct 12 07:47:47 2011
New Revision: 1182244
URL: http://svn.apache.org/viewvc?rev=1182244view=rev
Log:
[CAMEL-4533] Check if connection is not null before rollback to avoid NPE
Modified:
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Modified:
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java?rev=1182244r1=1182243r2=1182244view=diff
==
---
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
(original)
+++
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Wed Oct 12 07:47:47 2011
@@ -98,7 +98,8 @@ public class JdbcProducer extends Defaul
conn.commit();
} catch (Exception e) {
try {
-conn.rollback();
+if (conn != null)
+conn.rollback();
} catch (SQLException sqle) {
LOG.warn(Error on jdbc component rollback: + sqle, sqle);
}
svn commit: r1182245 - /camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Author: jbonofre
Date: Wed Oct 12 07:48:21 2011
New Revision: 1182245
URL: http://svn.apache.org/viewvc?rev=1182245view=rev
Log:
[CAMEL-4533] Test the connection before performing rollback to avoid NPE
Modified:
camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Modified:
camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java?rev=1182245r1=1182244r2=1182245view=diff
==
---
camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Wed Oct 12 07:48:21 2011
@@ -98,7 +98,8 @@ public class JdbcProducer extends Defaul
conn.commit();
} catch (Exception e) {
try {
-conn.rollback();
+if (conn != null)
+conn.rollback();
} catch (SQLException sqle) {
LOG.warn(Error on jdbc component rollback: + sqle, sqle);
}
