(camel-karaf) branch main updated: Ref #472: Repair camel-olingo2 integration test (#474)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 68d6ae14 Ref #472: Repair camel-olingo2 integration test (#474)
68d6ae14 is described below
commit 68d6ae148662b368cf5163997f469686e67f5c41
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jul 31 09:28:48 2024 +0200
Ref #472: Repair camel-olingo2 integration test (#474)
---
tests/features/camel-olingo2/pom.xml | 26 +++
.../main/resources/OSGI-INF/blueprint/route.xml| 5 +-
.../karaf/camel/itest/CamelOlingo2ITest.java | 13 +-
.../apache/karaf/camel/itest/Olingo2Server.java| 177 +
.../karaf/camel/itest/etag-enabled-service.xml | 45 ++
tests/features/pom.xml | 3 +-
6 files changed, 261 insertions(+), 8 deletions(-)
diff --git a/tests/features/camel-olingo2/pom.xml
b/tests/features/camel-olingo2/pom.xml
index 2a10b84b..2dafea8f 100644
--- a/tests/features/camel-olingo2/pom.xml
+++ b/tests/features/camel-olingo2/pom.xml
@@ -28,4 +28,30 @@
camel-olingo2-test
Apache Camel :: Karaf :: Tests :: Features :: Olingo2
+
+
+com.squareup.okhttp3
+mockwebserver
+${squareup-okhttp-version}
+test
+
+
+org.apache.olingo
+olingo-odata2-api
+${olingo2-version}
+test
+
+
+jakarta.ws.rs
+jakarta.ws.rs-api
+${jakarta-ws-rs-api-version}
+
+
+org.apache.olingo
+olingo-odata2-core
+${olingo2-version}
+test
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-olingo2/src/main/resources/OSGI-INF/blueprint/route.xml
b/tests/features/camel-olingo2/src/main/resources/OSGI-INF/blueprint/route.xml
index 9b120840..e161e029 100644
---
a/tests/features/camel-olingo2/src/main/resources/OSGI-INF/blueprint/route.xml
+++
b/tests/features/camel-olingo2/src/main/resources/OSGI-INF/blueprint/route.xml
@@ -17,14 +17,13 @@
-->
http://www.osgi.org/xmlns/blueprint/v1.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0;
xsi:schemaLocation="
http://www.osgi.org/xmlns/blueprint/v1.0.0
https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
http://camel.apache.org/schema/blueprint
http://camel.apache.org/schema/blueprint/camel-blueprint.xsd;>
http://camel.apache.org/schema/blueprint;>
-http://services.odata.org/V2/Northwind/Northwind.svc"/>
+http://localhost:{{olingo.port}}/"/>
OK-Consumer
@@ -34,7 +33,7 @@
-http://services.odata.org/V2/Northwind/Northwind.svc"/>
+http://localhost:{{olingo.port}}/"/>
OK-Producer
diff --git
a/tests/features/camel-olingo2/src/test/java/org/apache/karaf/camel/itest/CamelOlingo2ITest.java
b/tests/features/camel-olingo2/src/test/java/org/apache/karaf/camel/itest/CamelOlingo2ITest.java
index 528f9afb..ec58fb44 100644
---
a/tests/features/camel-olingo2/src/test/java/org/apache/karaf/camel/itest/CamelOlingo2ITest.java
+++
b/tests/features/camel-olingo2/src/test/java/org/apache/karaf/camel/itest/CamelOlingo2ITest.java
@@ -16,15 +16,15 @@ package org.apache.karaf.camel.itest;
import org.apache.camel.component.mock.MockEndpoint;
import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest;
import org.apache.karaf.camel.itests.CamelKarafTestHint;
+import org.apache.karaf.camel.itests.PaxExamWithExternalResource;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-@CamelKarafTestHint(isBlueprintTest = true)
-@RunWith(PaxExam.class)
+@CamelKarafTestHint(isBlueprintTest = true, externalResourceProvider =
CamelOlingo2ITest.ExternalResourceProviders.class)
+@RunWith(PaxExamWithExternalResource.class)
@ExamReactorStrategy(PerClass.class)
public class CamelOlingo2ITest extends
AbstractCamelSingleFeatureResultMockBasedRouteITest {
@@ -38,4 +38,11 @@ public class CamelOlingo2ITest extends
AbstractCamelSingleFeatureResultMockBased
assertMockEndpointsSatisfied();
}
+public static final class ExternalResourceProviders {
+
+public static Olingo2Server createMockServer() {
+return new Olingo2Server();
+}
+}
+
}
\ No newline at end of fil
(camel-karaf) branch main updated: Ref #470: Add camel-consul integration test (#471)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 013f5d23 Ref #470: Add camel-consul integration test (#471)
013f5d23 is described below
commit 013f5d23982ebe478c65b5c9ca0ae05db2d17863
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jul 31 09:27:45 2024 +0200
Ref #470: Add camel-consul integration test (#471)
---
features/src/main/feature/camel-features.xml | 11
pom.xml| 9 +--
tests/features/camel-consul/pom.xml| 52
.../karaf/camel/test/CamelConsulRouteSupplier.java | 69 ++
.../apache/karaf/camel/itest/CamelConsulITest.java | 61 +++
tests/features/pom.xml | 1 +
6 files changed, 199 insertions(+), 4 deletions(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 5cada3a7..59087f61 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -818,7 +818,18 @@
camel-core
+jackson
+guava
wrap:mvn:org.kiwiproject/consul-client/${consul-client-version}
+wrap:mvn:com.squareup.okhttp3/okhttp/${consul-okhttp3-version}
+wrap:mvn:org.jetbrains.kotlin/kotlin-stdlib/${consul-kotlin-version}
+wrap:mvn:com.squareup.retrofit2/retrofit/${auto-detect-version}
+wrap:mvn:com.squareup.retrofit2/converter-jackson/${auto-detect-version}
+wrap:mvn:com.squareup.okio/okio/${consul-okio-version}
+wrap:mvn:com.squareup.okio/okio-jvm/${consul-okio-version}
+mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2-version}
+mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-version}
+mvn:org.apache.commons/commons-lang3/${commons-lang3-version}
mvn:org.apache.camel.karaf/camel-consul/${project.version}
diff --git a/pom.xml b/pom.xml
index 02a6e30c..c960782c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -534,11 +534,13 @@
1.10.3
1.49.1
1.13.0
-1.19.5
-
+
1.19.5
5.18.5
12.25.1
12.26.1
+1.8.21
+4.12.0
+3.6.0
1.2
32.1.3-jre
1.3_1
@@ -557,8 +559,7 @@
3.0.2
11.0.21
4.4.6
-0.0.25.Final
-
+
0.0.25.Final
7.0.0
2.5.0-b42
1.4.1
diff --git a/tests/features/camel-consul/pom.xml
b/tests/features/camel-consul/pom.xml
new file mode 100644
index ..fbd89110
--- /dev/null
+++ b/tests/features/camel-consul/pom.xml
@@ -0,0 +1,52 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-consul-test
+Apache Camel :: Karaf :: Tests :: Features :: Consul
+
+
+
+org.apache.camel
+camel-consul
+${camel-version}
+
+
+com.orbitz.consul
+consul-client
+${consul-client-version}
+test
+
+
+org.testcontainers
+testcontainers
+${testcontainers-version}
+test
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java
b/tests/features/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java
new file mode 100644
index ..ae658cd6
--- /dev/null
+++
b/tests/features/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java
@@ -0,0 +1,69 @@
+/*
+ * 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
+ * limit
(camel-karaf) branch main updated: Ref #468: Add camel-cometd integration test (#469)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 dc57a0a4 Ref #468: Add camel-cometd integration test (#469)
dc57a0a4 is described below
commit dc57a0a44291bb440ba225340a088163f7e09388
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jul 31 09:26:29 2024 +0200
Ref #468: Add camel-cometd integration test (#469)
---
features/src/main/feature/camel-features.xml |2 +
tests/features/camel-cometd/pom.xml| 81 +
.../main/resources/OSGI-INF/blueprint/route.xml| 43 +
.../apache/karaf/camel/itest/CamelCometdITest.java | 69 +
.../src/test/resources/webapp/authenticated.html | 65 +
.../src/test/resources/webapp/dojo/dojo/dojo.js| 30 +
.../test/resources/webapp/dojo/dojo/io/iframe.js | 250 ++
.../test/resources/webapp/dojo/dojo/io/script.js | 135 ++
.../src/test/resources/webapp/dojo/dojox/cometd.js | 115 +
.../webapp/dojo/dojox/cometd.js.uncompressed.js| 16 +
.../test/resources/webapp/dojo/dojox/cometd.xd.js | 16 +
.../webapp/dojo/dojox/cometd.xd.js.uncompressed.js | 16 +
.../test/resources/webapp/dojo/dojox/cometd/ack.js | 27 +
.../resources/webapp/dojo/dojox/cometd/reload.js | 34 +
.../webapp/dojo/dojox/cometd/timestamp.js | 26 +
.../resources/webapp/dojo/dojox/cometd/timesync.js | 26 +
.../src/test/resources/webapp/dojo/org/cometd.js | 2427
.../src/test/resources/webapp/index.html | 49 +
.../src/test/resources/webapp/inout.html | 58 +
tests/features/pom.xml |1 +
20 files changed, 3486 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index df294df1..5cada3a7 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -808,10 +808,12 @@
mvn:org.eclipse.jetty.ee10/jetty-ee10-servlets/${jetty-version}
mvn:org.cometd.java/cometd-java-server-common/${cometd-java-server-version}
mvn:org.cometd.java/cometd-java-server-http-jakarta/${cometd-java-server-version}
+mvn:org.cometd.java/cometd-java-server-websocket-jetty/${cometd-java-server-version}
mvn:org.cometd.java/cometd-java-common/${cometd-java-server-version}
mvn:org.cometd.java/cometd-java-api-server/${cometd-java-server-version}
mvn:org.cometd.java/cometd-java-api-common/${cometd-java-server-version}
mvn:org.cometd.java/cometd-java-api-client/${cometd-java-server-version}
+mvn:org.eclipse.jetty/jetty-util-ajax/${jetty-version}
mvn:org.apache.camel.karaf/camel-cometd/${project.version}
diff --git a/tests/features/camel-cometd/pom.xml
b/tests/features/camel-cometd/pom.xml
new file mode 100644
index ..397d35db
--- /dev/null
+++ b/tests/features/camel-cometd/pom.xml
@@ -0,0 +1,81 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-cometd-test
+Apache Camel :: Karaf :: Tests :: Features :: Cometd
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+true
+true
+
+
+
+
org.apache.karaf.camel.test;version=${project.version}
+
+
+!org.apache.karaf.camel.test,
+org.cometd.server.http,
+org.eclipse.jetty.ee10.servlet,
+
org.apache.camel*;${camel-osgi-import-camel-version},
+*
+
+
+ camel-integration-test
+
+
+
+
+
+cleanVersions
+generate-sources
+
+cleanVersions
+
+
+
+
${project.version}
+
+
+
+
+bundle
+package
+
+
(camel) branch CAMEL-20199/remove-synchronized-blocks updated (7bcb91665a1 -> 9a5ebf6bc8d)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-20199/remove-synchronized-blocks in repository https://gitbox.apache.org/repos/asf/camel.git discard 7bcb91665a1 CAMEL-20199: camel-core - Remove synchronized blocks add 58de5691d90 CAMEL-21020: remove obsolete swagger integration tests (#14944) add 963941dc151 Regen SBOM from commit 58de5691d90136f95c225b1a89404e211f677849 (#14945) add d9f292d5a14 camel-langchain4j-chat - Capitalise component title: langChain4j -> LangChain4j add 187f5553dff chore(deps): Bump langchain4j-version from 0.32.0 to 0.33.0 (#14943) add 23da1eb4809 [CAMEL-21016] camel-jbang: Add support for multiple --exclude, --repository add 3d835efb281 Regen following up d9f292d add a453c8b8367 chore(deps): Bump io.netty:netty-bom from 4.1.111.Final to 4.1.112.Final (#14947) add bb14bcaa598 Use 'per' and not 'pr.' (#14959) add 516477b6c34 Add a method to ResultErrorHelper to avoid the usage of deprecated method (#14958) add f3d758608bf chore(deps): Bump com.braintreepayments.gateway:braintree-java (#14955) add c7b5df344e5 chore(deps): Bump org.apache.zookeeper:zookeeper from 3.9.1 to 3.9.2 (#14951) add 9cd4b2e71aa chore(deps): Bump org.opensearch:opensearch-testcontainers (#14957) add a28e1abd738 chore(deps): Bump com.google.apis:google-api-services-sheets (#14952) add 5181216dfbc chore(deps): Bump com.googlecode.libphonenumber:libphonenumber (#14948) add 7091026db92 chore(deps): Bump jakarta.el:jakarta.el-api from 6.0.0 to 6.0.1 (#14956) add 8ed8b835750 chore(deps): Bump org.apache.kafka:kafka-clients from 3.7.1 to 3.8.0 (#14954) add c4cf5b93246 CAMEL-21021 - Camel-AWS-Secrets-Manager: Give the ability of refreshing the context on Secrets update by using Eventbridge service instead of pure Cloudtrail add d105fa7046a CAMEL-21021 - Camel-AWS-Secrets-Manager: Give the ability of refreshing the context on Secrets update by using Eventbridge service instead of pure Cloudtrail add 07a3349ef45 CAMEL-21021 - Camel-AWS-Secrets-Manager: Give the ability of refreshing the context on Secrets update by using Eventbridge service instead of pure Cloudtrail add 8da56b330a0 CAMEL-21021 - Camel-AWS-Secrets-Manager: Give the ability of refreshing the context on Secrets update by using Eventbridge service instead of pure Cloudtrail add ace427ccb18 chore(deps): Bump org.wiremock:wiremock from 3.9.0 to 3.9.1 (#14953) add 92f64eb8f18 CAMEL-21024 - Camel-AWS-Secrets-Manager: Eventbridge/SQS notifications documentation add 1e242194995 CAMEL-21024 - Camel-AWS-Secrets-Manager: Eventbridge/SQS notifications documentation add 50640317003 CAMEL-21024 - Camel-AWS-Secrets-Manager: Eventbridge/SQS notifications documentation add 44cf73355a7 Replace j.u.Stack with j.u.ArrayDequeue (#14963) add 0e0f7c758f1 chore(deps): Bump activemq-artemis-version from 2.35.0 to 2.36.0 (#14967) add af6ce952a72 chore(deps): Bump aws-java-sdk2-version from 2.26.25 to 2.26.26 (#14965) add 80a0fba5072 CAMEL-21026: added a type converter for byte-array to PDF add a12892fc32c chore(deps): Bump com.microsoft.azure:msal4j from 1.16.1 to 1.16.2 (#14968) add 1432192c6ca CAMEL-21031: add support for polling more than 10 messages from AWS SQS server (#14926) new 9a5ebf6bc8d CAMEL-20199: camel-core - Remove synchronized blocks This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7bcb91665a1) \ N -- N -- N refs/heads/CAMEL-20199/remove-synchronized-blocks (9a5ebf6bc8d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-sbom/camel-sbom.json | 9712 camel-sbom/camel-sbom.xml | 7193 --- .../apache/camel/catalog/components/aws2-sqs.json | 194 +- .../apache/camel/catalog/components/ironmq.json|4 +- .../camel/catalog/components/langchain4j-chat.json |2 +- .../main/camel-main-configuration-metadata.json|2 + .../camel/parser/helper/XmlLineNumberParser.java |6 +- .../langchain4
(camel) branch CAMEL-20199/remove-synchronized-blocks created (now 7bcb91665a1)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-20199/remove-synchronized-blocks in repository https://gitbox.apache.org/repos/asf/camel.git at 7bcb91665a1 CAMEL-20199: camel-core - Remove synchronized blocks This branch includes the following new commits: new 7bcb91665a1 CAMEL-20199: camel-core - Remove synchronized blocks The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-karaf) branch main updated: Skip camel-olingo2 test (#473)
This is an automated email from the ASF dual-hosted git repository. nfilotto 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 ac81dd61 Skip camel-olingo2 test (#473) ac81dd61 is described below commit ac81dd61df6d306a132eebd9457687fdb85dbc2b Author: François de Parscau <116000379+f2p...@users.noreply.github.com> AuthorDate: Tue Jul 30 14:05:40 2024 +0200 Skip camel-olingo2 test (#473) --- tests/features/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/features/pom.xml b/tests/features/pom.xml index 50435e92..3e144cb0 100644 --- a/tests/features/pom.xml +++ b/tests/features/pom.xml @@ -84,7 +84,8 @@ camel-leveldb camel-netty-http camel-mail -camel-olingo2 + + camel-paho-mqtt5 camel-quartz camel-saxon
(camel-karaf) branch main updated: Ref #463: Add couchdb integration test (#464)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 612144a5 Ref #463: Add couchdb integration test (#464)
612144a5 is described below
commit 612144a514d81a431a51c7a46f1dab69219c665a
Author: Stefan Tataru
AuthorDate: Fri Jul 26 09:56:19 2024 +0200
Ref #463: Add couchdb integration test (#464)
---
features/src/main/feature/camel-features.xml | 11 ++-
tests/features/camel-couchdb/pom.xml | 56 +++
.../camel/test/CamelCouchdbRouteSupplier.java | 62
.../karaf/camel/itest/CamelCouchdbITest.java | 104 +
tests/features/pom.xml | 1 +
5 files changed, 233 insertions(+), 1 deletion(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index bbc5baf3..df294df1 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -831,8 +831,17 @@
camel-core
http-client
wrap:mvn:com.ibm.cloud/cloudant/${cloudant-version}
+wrap:mvn:com.ibm.cloud/cloudant-common/${cloudant-version}
wrap:mvn:com.ibm.cloud/sdk-core/${auto-detect-version}
-mvn:com.google.code.gson/gson/${auto-detect-version}
+
+wrap:mvn:com.google.code.gson/gson/${gson-version}$overwrite=mergeExport-Package=com.google.gson*;version=${gson-version}
+wrap:mvn:com.squareup.okio/okio/${squareup-okio-version}
+
+wrap:mvn:com.squareup.okhttp3/okhttp/${squareup-okhttp-version}$Bundle-SymbolicName=com.squareup.okhttp3.okhttp
+wrap:mvn:com.squareup.okhttp3/okhttp-urlconnection/${squareup-okhttp-version}$Fragment-Host=com.squareup.okhttp3.okhttp;bundle-version=${squareup-okhttp-version}
+mvn:org.apache.commons/commons-lang3/${commons-lang3-version}
mvn:org.apache.camel.karaf/camel-couchdb/${project.version}
diff --git a/tests/features/camel-couchdb/pom.xml
b/tests/features/camel-couchdb/pom.xml
new file mode 100644
index ..f0e3f9dc
--- /dev/null
+++ b/tests/features/camel-couchdb/pom.xml
@@ -0,0 +1,56 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-couchdb-test
+Apache Camel :: Karaf :: Tests :: Features :: Couchdb
+
+
+
+org.apache.camel
+camel-couchdb
+${camel-version}
+provided
+
+
+
+com.google.code.gson
+gson
+${gson-version}
+test
+
+
+
+org.testcontainers
+testcontainers
+${testcontainers-version}
+test
+
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java
b/tests/features/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java
new file mode 100644
index ..1bf5f01a
--- /dev/null
+++
b/tests/features/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.couchdb.CouchDbConstants;
+import org.apache.camel.component.couchdb.CouchDbOperations;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-c
(camel-karaf) branch main updated: Ref #465: Add disruptor integration test (#466)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 0a77d8cb Ref #465: Add disruptor integration test (#466)
0a77d8cb is described below
commit 0a77d8cbcc82b6bb61f4ff799dceec7d384c7d69
Author: Stefan Tataru
AuthorDate: Wed Jul 24 19:07:43 2024 +0200
Ref #465: Add disruptor integration test (#466)
---
tests/features/camel-disruptor/pom.xml | 32 +
.../camel/test/CamelDisruptorRouteSupplier.java| 49 ++
.../camel/test/CamelDisruptorvmRouteSupplier.java | 49 ++
.../karaf/camel/itest/CamelDisruptorTest.java | 75 ++
tests/features/pom.xml | 1 +
5 files changed, 206 insertions(+)
diff --git a/tests/features/camel-disruptor/pom.xml
b/tests/features/camel-disruptor/pom.xml
new file mode 100644
index ..a32db8ec
--- /dev/null
+++ b/tests/features/camel-disruptor/pom.xml
@@ -0,0 +1,32 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-disruptor-test
+Apache Camel :: Karaf :: Tests :: Features :: Disruptor
+
\ No newline at end of file
diff --git
a/tests/features/camel-disruptor/src/main/java/org/apache/karaf/camel/test/CamelDisruptorRouteSupplier.java
b/tests/features/camel-disruptor/src/main/java/org/apache/karaf/camel/test/CamelDisruptorRouteSupplier.java
new file mode 100644
index ..a3c1c7a8
--- /dev/null
+++
b/tests/features/camel-disruptor/src/main/java/org/apache/karaf/camel/test/CamelDisruptorRouteSupplier.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-disruptor-test",
+immediate = true,
+service = CamelDisruptorRouteSupplier.class
+)
+public class CamelDisruptorRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+return builder -> builder.from("disruptor:next")
+.log("Received from disruptor next: ${body}")
+.setBody(constant("OK"));
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+producerRoute.setBody(constant("Hello Disruptor"))
+.log("Will send to disruptor next: ${body}")
+// send it to the disruptor that is async
+.to("disruptor:next")
+.log("Sent to disruptor next: ${body}");
+}
+}
\ No newline at end of file
diff --git
a/tests/features/camel-disruptor/src/main/java/org/apache/karaf/camel/test/CamelDisruptorvmRouteSupplier.java
b/tests/features/camel-disruptor/src/main/java/org/apache/karaf/camel/test/CamelDisruptorvmRouteSupplier.java
new file mode 100644
index ..4edfc78b
--- /dev/null
+++
b/tests/features/camel-disruptor/src/main/java/org/apache/karaf/camel/test/CamelDisruptorvmRouteSupplier.java
@@ -0,0 +1,49 @@
+/*
+ * 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 &q
(camel-karaf) branch main updated (b9c0b96a -> 91189668)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from b9c0b96a Ref #455: Repair camel-azure-storage-blob dependencies (#460)
add 91189668 Ref #461: Add camel-coap integration test (#462)
No new revisions were added by this update.
Summary of changes:
features/src/main/feature/camel-features.xml | 2 +-
.../features/camel-coap}/pom.xml | 6 +++---
.../karaf/camel/test/CamelCoapRouteSupplier.java | 19 ++-
.../org/apache/karaf/camel/itest/CamelCoapITest.java} | 6 +++---
tests/features/pom.xml| 1 +
5 files changed, 14 insertions(+), 20 deletions(-)
copy
{tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources
=> tests/features/camel-coap}/pom.xml (87%)
copy
tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java
=>
tests/features/camel-coap/src/main/java/org/apache/karaf/camel/test/CamelCoapRouteSupplier.java
(79%)
copy
tests/features/{camel-as2/src/test/java/org/apache/karaf/camel/itest/CamelAs2ITest.java
=> camel-coap/src/test/java/org/apache/karaf/camel/itest/CamelCoapITest.java}
(86%)
(camel-karaf) branch main updated: Ref #455: Repair camel-azure-storage-blob dependencies (#460)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 b9c0b96a Ref #455: Repair camel-azure-storage-blob dependencies (#460)
b9c0b96a is described below
commit b9c0b96a215c4e37a8528bef8085cff6217d3fb2
Author: Stefan Tataru
AuthorDate: Wed Jul 24 17:53:03 2024 +0200
Ref #455: Repair camel-azure-storage-blob dependencies (#460)
---
features/src/main/feature/camel-features.xml | 31
pom.xml | 1 +
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 3b82d3b5..34febd20 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -193,16 +193,28 @@
mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}
+azure-msal4j
jackson
mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}
mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}
wrap:mvn:com.azure/azure-core/${azure-core-version}$${spi-consumer}Import-Package=*;resolution:=optional,com.fasterxml.jackson.dataformat.xml.deser;resolution:=optional,com.fasterxml.jackson.dataformat.xml.ser;resolution:=optional
-wrap:mvn:com.azure/azure-identity/${azure-identity-version}
-mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}
+wrap:mvn:com.azure/azure-identity/${azure-identity-version}$Import-Package=com.sun.jna,*;resolution:=optional
mvn:io.projectreactor/reactor-core/${auto-detect-version}
+mvn:net.java.dev.jna/jna/${auto-detect-version}
+mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}
wrap:mvn:com.azure/azure-xml/${auto-detect-version}
wrap:mvn:com.azure/azure-json/${auto-detect-version}
+
+mvn:com.nimbusds/content-type/${auto-detect-version}
+mvn:com.nimbusds/lang-tag/${auto-detect-version}
+mvn:com.nimbusds/nimbus-jose-jwt/${nimbus-jose-jwt}
+mvn:com.nimbusds/oauth2-oidc-sdk/${auto-detect-version}
+mvn:net.minidev/accessors-smart/${json-smart-version}
+mvn:net.minidev/json-smart/${json-smart-version}
+wrap:mvn:com.github.stephenc.jcip/jcip-annotations/${auto-detect-version}
+wrap:mvn:com.microsoft.azure/msal4j/${msal4j-version}$overwrite=mergeImport-Package=com.sun.net.httpserver;resolution:=optional,*
+
azure
wrap:mvn:com.azure/azure-storage-common/${azure-storage-common-version}
@@ -605,7 +617,7 @@
camel-core
azure-eventhubs
-wrap:mvn:com.azure/azure-storage-blob/${auto-detect-version}
+wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}
mvn:org.apache.camel.karaf/camel-azure-eventhubs/${project.version}
@@ -619,7 +631,7 @@
jackson
azure-eventhubs
wrap:mvn:com.azure/azure-security-keyvault-secrets/${auto-detect-version}
-wrap:mvn:com.azure/azure-storage-blob/${auto-detect-version}
+wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}
mvn:org.apache.camel.karaf/camel-azure-key-vault/${project.version}
@@ -638,7 +650,7 @@
camel-core
azure-storage
netty
-wrap:mvn:com.azure/azure-storage-blob/${auto-detect-version}
+wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}
wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}
wrap:mvn:com.azure/azure-core-http-netty/${auto-detect-version}
mvn:io.netty/netty-codec-http/${netty-version}
@@ -1919,16 +1931,9 @@
mvn:org.apache.camel.karaf/camel-mail/${project.version}
+azure-msal4j
camel-mail
jackson
-wrap:mvn:com.microsoft.azure/msal4j/${msal4j-version}$overwrite=mergeImport-Package=com.sun.net.httpserver;resolution:=optional,*
-mvn:com.nimbusds/content-type/${auto-detect-version}
-mvn:com.nimbusds/nimbus-jose-jwt/${nimbus-jose-jwt}
-wrap:mvn:com.github.stephenc.jcip/jcip-annotations/${auto-detect-version}
-mvn:com.nimbusds/oauth2-oidc-sdk/${auto-detect-version}
-mvn:com.nimbusds/lang-tag/${auto-detect-version}
-mvn:net.minidev/json-smart/${json-smart-version}
-mvn:net.minidev/accessors-smart/${json-smart-version}
mvn:org.ow2.asm/asm/${auto-detect-version}
mvn:org.apache.camel.karaf/camel-mail-microsoft-oauth/${project.version}
diff --git a/pom.xml b/pom.xml
index 0b5571cd..02a6e30c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -538,6 +538,7
(camel-karaf) branch main updated: Ref #453: Add crypto integration test (#454)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 c29e757b Ref #453: Add crypto integration test (#454)
c29e757b is described below
commit c29e757b4fd8c8a81f0e9053d3181c314bcac7c2
Author: Stefan Tataru
AuthorDate: Mon Jul 22 09:05:50 2024 +0200
Ref #453: Add crypto integration test (#454)
---
tests/features/camel-crypto/pom.xml| 42 ++
.../karaf/camel/test/CamelCryptoRouteSupplier.java | 67 ++
.../apache/karaf/camel/itest/CamelCryptoITest.java | 60 +++
tests/features/pom.xml | 1 +
4 files changed, 170 insertions(+)
diff --git a/tests/features/camel-crypto/pom.xml
b/tests/features/camel-crypto/pom.xml
new file mode 100644
index ..1c4c9506
--- /dev/null
+++ b/tests/features/camel-crypto/pom.xml
@@ -0,0 +1,42 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-crypto-test
+Apache Camel :: Karaf :: Tests :: Features :: Crypto
+
+
+
+org.apache.camel
+camel-crypto
+${camel-version}
+provided
+
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java
b/tests/features/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java
new file mode 100644
index ..fadf8a97
--- /dev/null
+++
b/tests/features/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.crypto.DigitalSignatureConstants;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-crypto-test",
+immediate = true,
+service = CamelCryptoRouteSupplier.class
+)
+public class CamelCryptoRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+KeyPair keys = getKeyPair();
+
+producerRoute.log("Will sign: ${body}")
+.setHeader(DigitalSignatureConstants.SIGNATURE_PRIVATE_KEY,
constant(keys.getPrivate()))
+.to("crypto:sign:bobsPizzaSignature")
+.log("Signature:
${header.%s}".formatted(DigitalSignatureConstants.SIGNATURE))
+.log("Will verify:
${header.%s}".formatted(DigitalSignatureConstants.SIGNATURE))
+.setHeader(DigitalSignatureConstants.SIGNATURE_PUBLIC_KEY_OR_CERT,
constant(keys.getPublic()))
+.to("crypto:verify:bobsPizzaSignature?clearHeaders=false")
+.log("Verified: ${body}")
+.toF("mock:%s", getResultMockName());
+}
+
+private KeyPair getKeyPair() {
+try {
+KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+keyGen.initialize(512, new SecureRandom());
+return keyGen.generateKeyPair();
+} catch (NoSuchAlgorithmException e) {
+throw n
(camel-karaf) branch main updated: Ref #439: Add camel-leveldb integration test (#440)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 b9692f08 Ref #439: Add camel-leveldb integration test (#440)
b9692f08 is described below
commit b9692f085afa8908118257e52cc213440ce705f2
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Fri Jul 19 18:02:38 2024 +0200
Ref #439: Add camel-leveldb integration test (#440)
---
components/camel-leveldb/pom.xml | 2 +
features/src/main/feature/camel-features.xml | 1 +
tests/features/camel-leveldb/pom.xml | 40 +++
.../camel/test/CamelLeveldbRouteSupplier.java | 82 ++
.../karaf/camel/itest/CamelLeveldbITest.java | 37 ++
tests/features/pom.xml | 1 +
6 files changed, 163 insertions(+)
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 0859b117..f4ddbd2f 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -37,6 +37,8 @@
org.apache.camel*;version=${camel-version}
+org.iq80.leveldb.impl;resolution:=optional,
+org.fusesource.leveldbjni;resolution:=optional,
*
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 00143462..3b82d3b5 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1884,6 +1884,7 @@
camel-core
jackson
+wrap:mvn:org.iq80.leveldb/leveldb/${leveldb-version}
mvn:org.fusesource.leveldbjni/leveldbjni-all/${leveldbjni-version}
mvn:org.apache.camel.karaf/camel-leveldb/${project.version}
diff --git a/tests/features/camel-leveldb/pom.xml
b/tests/features/camel-leveldb/pom.xml
new file mode 100644
index ..608a7bca
--- /dev/null
+++ b/tests/features/camel-leveldb/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-leveldb-test
+Apache Camel :: Karaf :: Tests :: Features :: LevelDB
+
+
+
+org.apache.camel
+camel-leveldb
+${camel-version}
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java
b/tests/features/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java
new file mode 100644
index ..298b5566
--- /dev/null
+++
b/tests/features/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+import static org.apache.camel.builder.Builder.header;
+
+import org.apache.camel.AggregationStrategy;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.leveldb.LevelDBAggregationRepository;
+import org.apache.camel.component.leveldb.serializer.JacksonLevelDBSerializer;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-leveldb-test",
+immediate = true,
+service = CamelLeveldbRouteSupplier.class
+)
+public class CamelLeveldbRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+static class StringAggregationStrategy implements AggregationStrategy {
+
+@Override
+
(camel-karaf) branch main updated: Ref #428: Repair camel-azure-storage-blob integration test (#447)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 8ea23370 Ref #428: Repair camel-azure-storage-blob integration test
(#447)
8ea23370 is described below
commit 8ea233707f74f903643bbdbf5da4873153b56ff7
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Fri Jul 19 16:26:28 2024 +0200
Ref #428: Repair camel-azure-storage-blob integration test (#447)
---
features/src/main/feature/camel-features.xml | 4 ++--
.../java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java | 2 +-
tests/features/pom.xml| 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index e7e2746d..00143462 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -194,8 +194,9 @@
jackson
+mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}
mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}
-wrap:mvn:com.azure/azure-core/${azure-core-version}$${spi-consumer}
+wrap:mvn:com.azure/azure-core/${azure-core-version}$${spi-consumer}Import-Package=*;resolution:=optional,com.fasterxml.jackson.dataformat.xml.deser;resolution:=optional,com.fasterxml.jackson.dataformat.xml.ser;resolution:=optional
wrap:mvn:com.azure/azure-identity/${azure-identity-version}
mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}
mvn:io.projectreactor/reactor-core/${auto-detect-version}
@@ -637,7 +638,6 @@
camel-core
azure-storage
netty
-mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}
wrap:mvn:com.azure/azure-storage-blob/${auto-detect-version}
wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}
wrap:mvn:com.azure/azure-core-http-netty/${auto-detect-version}
diff --git
a/tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
b/tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
index ba30ec62..8d0eb16f 100644
---
a/tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
+++
b/tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
@@ -52,7 +52,7 @@ public class CamelAzureStorageBlobITest extends
AbstractCamelSingleFeatureResult
public static GenericContainerResource
createAzureStorageBlobContainer() {
-AzuriteContainer azuriteContainer = new
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.29.0");
+AzuriteContainer azuriteContainer = new
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.31.0");
return new GenericContainerResource<>(azuriteContainer, resource
-> {
resource.setProperty("azure.host", azuriteContainer.getHost());
diff --git a/tests/features/pom.xml b/tests/features/pom.xml
index 83a40c79..b38f5da0 100644
--- a/tests/features/pom.xml
+++ b/tests/features/pom.xml
@@ -50,8 +50,7 @@
camel-aws2-sns
camel-aws2-sqs
camel-aws2-sts
-
-
+camel-azure-storage-blob
camel-barcode
camel-base64
camel-bean-validator
(camel-karaf) branch main updated: Ref #448: Add camel-csv integration test (#449)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 3afaee26 Ref #448: Add camel-csv integration test (#449)
3afaee26 is described below
commit 3afaee26b26dd64578b0a23379989c8d7292a624
Author: Stefan Tataru
AuthorDate: Fri Jul 19 15:51:24 2024 +0200
Ref #448: Add camel-csv integration test (#449)
---
tests/features/camel-csv/pom.xml | 41 +
.../karaf/camel/test/CamelCsvRouteSupplier.java| 55 +
.../apache/karaf/camel/itest/CamelCsvITest.java| 71 ++
tests/features/pom.xml | 1 +
4 files changed, 168 insertions(+)
diff --git a/tests/features/camel-csv/pom.xml b/tests/features/camel-csv/pom.xml
new file mode 100644
index ..eb8a71c2
--- /dev/null
+++ b/tests/features/camel-csv/pom.xml
@@ -0,0 +1,41 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-csv-test
+Apache Camel :: Karaf :: Tests :: Features :: CSV
+
+
+
+org.apache.camel
+camel-core
+${camel-version}
+provided
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java
b/tests/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java
new file mode 100644
index ..62f4de90
--- /dev/null
+++
b/tests/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.dataformat.CsvDataFormat;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-csv-test",
+immediate = true,
+service = CamelCsvRouteSupplier.class
+)
+public class CamelCsvRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+CsvDataFormat csv = new CsvDataFormat();
+csv.setDelimiter(",");
+csv.setRecordSeparator("\n");
+csv.setSkipHeaderRecord("false");
+csv.setTrim("false");
+csv.setUseMaps("false");
+csv.setQuoteDisabled("true");
+
+producerRoute.log("Will unmarshal: ${body}")
+.unmarshal(csv)
+.log("Unmarshal: ${body}")
+.toF("mock:%s", getResultMockName())
+.log("Will marshal: ${body}")
+.marshal(csv)
+.log("Marshal: ${body}")
+.toF("mock:%s", getResultMockName());
+}
+}
\ No newline at end of file
diff --git
a/tests/features/camel-csv/src/test/java/org/apache/karaf/camel/itest/CamelCsvITest.java
b/tests/features/camel-csv/src/test/java/org/apache/karaf/camel/itest/CamelCsvITest.java
new file mode 100644
index ..c9681221
--- /dev/null
+++
b/tests/features/camel-csv/src/test/java/org/apache/karaf/camel/itest/CamelCsvITest.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed 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 cop
(camel-karaf) branch main updated: Ref #445: Fix atom and flatpack integration tests (#446)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 bcce34db Ref #445: Fix atom and flatpack integration tests (#446)
bcce34db is described below
commit bcce34dbb0a1fa912e8a68da4ea89b0a97af3251
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Fri Jul 19 15:50:23 2024 +0200
Ref #445: Fix atom and flatpack integration tests (#446)
---
.../itests/CamelSingleFeatureResultMockBasedRoute.java | 2 +-
.../org/apache/karaf/camel/itest/CamelAtomITest.java | 16 +---
.../karaf/camel/test/CamelFlatpackRouteSupplier.java | 2 ++
.../org/apache/karaf/camel/itest/CamelFlatpackITest.java | 13 +++--
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
index cfbffd82..29acd3ee 100644
---
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
+++
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
@@ -29,4 +29,4 @@ public interface CamelSingleFeatureResultMockBasedRoute
extends CamelSingleFeatu
default void assertMockEndpointsSatisfied() throws InterruptedException {
MockEndpoint.assertIsSatisfied(getContext());
}
-}
\ No newline at end of file
+}
diff --git
a/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
b/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
index 1ad01eb1..54d536e6 100644
---
a/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
+++
b/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest;
-import org.apache.karaf.camel.itests.CamelKarafTestHint;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@@ -37,6 +36,13 @@ public class CamelAtomITest extends
AbstractCamelSingleFeatureResultMockBasedRou
@Override
public void configureMock(MockEndpoint mock) {
mock.expectedMessageCount(7);
+}
+
+@Test
+public void testResultMock() throws Exception {
+assertMockEndpointsSatisfied();
+MockEndpoint mock = getMockEndpoint();
+assertNotNull(mock);
List list = mock.getReceivedExchanges();
String[] expectedTitles = {
"Speaking at the Irish Java Technology Conference on Thursday
and Friday",
@@ -53,14 +59,10 @@ public class CamelAtomITest extends
AbstractCamelSingleFeatureResultMockBasedRou
String expectedTitle = expectedTitles[counter];
String title = entry.getTitle().get();
-assertEquals(expectedTitle, title, "Title of message " + counter);
+assertEquals("Title of message " + counter, expectedTitle, title);
counter++;
}
-}
-
-@Test
-public void testResultMock() throws Exception {
-assertMockEndpointsSatisfied();
+assertEquals(expectedTitles.length, counter);
}
}
\ No newline at end of file
diff --git
a/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
b/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
index 0174a9a6..7114bbc8 100644
---
a/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
+++
b/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
@@ -15,6 +15,7 @@
*/
package org.apache.karaf.camel.test;
+import java.util.Map;
import java.util.function.Function;
import org.apache.camel.builder.RouteBuilder;
@@ -34,6 +35,7 @@ public class CamelFlatpackRouteSupplier extends
AbstractCamelSingleFeatureResult
return builder ->
builder.fromF("flatpack:delim:file:%s/test-classes/INVENTORY-Delimited.pzmap.xml",
System.getProperty("project.target"))
+.convertBodyTo(Map.class)
.log("received message ${body}");
}
diff --git
a/tests/features/camel-flatpack/src/test/java/org/apache/karaf/camel/itest/CamelFlatpackITest.java
b/tes
(camel-karaf) branch main updated: Ref #442: Add dns integration test (#443)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 58e426a3 Ref #442: Add dns integration test (#443)
58e426a3 is described below
commit 58e426a32b817b45e4f20d0597734ea501b75391
Author: Stefan Tataru
AuthorDate: Fri Jul 19 13:29:48 2024 +0200
Ref #442: Add dns integration test (#443)
---
.../CamelSingleFeatureResultMockBasedRoute.java| 8 ++-
tests/features/camel-dns/pom.xml | 42 +++
.../karaf/camel/test/CamelDnsRouteSupplier.java| 56 +++
.../apache/karaf/camel/itest/CamelDnsITest.java| 63 ++
tests/features/pom.xml | 1 +
5 files changed, 168 insertions(+), 2 deletions(-)
diff --git
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
index c36e4b9b..cfbffd82 100644
---
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
+++
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/CamelSingleFeatureResultMockBasedRoute.java
@@ -6,7 +6,7 @@ import org.apache.camel.component.mock.MockEndpoint;
public interface CamelSingleFeatureResultMockBasedRoute extends
CamelSingleFeatureRoute {
default void setupMock() {
-MockEndpoint endpoint =
getContext().getEndpoint("mock:%s".formatted(getTestComponentName()),
MockEndpoint.class);
+MockEndpoint endpoint = getMockEndpoint();
endpoint.setFailFast(false);
configureMock(endpoint);
}
@@ -18,6 +18,10 @@ public interface CamelSingleFeatureResultMockBasedRoute
extends CamelSingleFeatu
}
}
+default MockEndpoint getMockEndpoint() {
+return
getContext().getEndpoint("mock:%s".formatted(getTestComponentName()),
MockEndpoint.class);
+}
+
default void configureMock(MockEndpoint mock) {
mock.expectedMinimumMessageCount(1);
}
@@ -25,4 +29,4 @@ public interface CamelSingleFeatureResultMockBasedRoute
extends CamelSingleFeatu
default void assertMockEndpointsSatisfied() throws InterruptedException {
MockEndpoint.assertIsSatisfied(getContext());
}
-}
+}
\ No newline at end of file
diff --git a/tests/features/camel-dns/pom.xml b/tests/features/camel-dns/pom.xml
new file mode 100644
index ..e96d44ee
--- /dev/null
+++ b/tests/features/camel-dns/pom.xml
@@ -0,0 +1,42 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-dns-test
+Apache Camel :: Karaf :: Tests :: Features :: DNS
+
+
+
+dnsjava
+dnsjava
+${dnsjava-version}
+test
+
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-dns/src/main/java/org/apache/karaf/camel/test/CamelDnsRouteSupplier.java
b/tests/features/camel-dns/src/main/java/org/apache/karaf/camel/test/CamelDnsRouteSupplier.java
new file mode 100644
index ..ba55db04
--- /dev/null
+++
b/tests/features/camel-dns/src/main/java/org/apache/karaf/camel/test/CamelDnsRouteSupplier.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-dns-test",
+
(camel-karaf) branch 438/remove-itest deleted (was b8351909)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 438/remove-itest in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was b8351909 Ref #438: Remove integration test of camel-docker 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 #438: Remove integration test of camel-docker (#444)
This is an automated email from the ASF dual-hosted git repository. nfilotto 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 39fa1d65 Ref #438: Remove integration test of camel-docker (#444) 39fa1d65 is described below commit 39fa1d65f1734359027c39d62d20dab22815ee8a Author: Nicolas Filotto AuthorDate: Thu Jul 18 15:37:22 2024 +0200 Ref #438: Remove integration test of camel-docker (#444) --- tests/features/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/features/pom.xml b/tests/features/pom.xml index 3dacc348..a16bdffa 100644 --- a/tests/features/pom.xml +++ b/tests/features/pom.xml @@ -59,7 +59,8 @@ camel-caffeine camel-cbor camel-core -camel-docker + + camel-drill camel-ehcache camel-elasticsearch
(camel-karaf) branch 438/remove-itest created (now b8351909)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 438/remove-itest in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at b8351909 Ref #438: Remove integration test of camel-docker This branch includes the following new commits: new b8351909 Ref #438: Remove integration test of camel-docker The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-karaf) 01/01: Ref #438: Remove integration test of camel-docker
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch 438/remove-itest in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit b835190973eb2bd0270e9cbe2230e8a7c207ff3b Author: Nicolas Filotto AuthorDate: Thu Jul 18 14:47:14 2024 +0200 Ref #438: Remove integration test of camel-docker --- tests/features/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/features/pom.xml b/tests/features/pom.xml index 3dacc348..a16bdffa 100644 --- a/tests/features/pom.xml +++ b/tests/features/pom.xml @@ -59,7 +59,8 @@ camel-caffeine camel-cbor camel-core -camel-docker + + camel-drill camel-ehcache camel-elasticsearch
(camel-karaf) branch main updated: Ref #436: Add camel-flatpack integration test (#437)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 54782f32 Ref #436: Add camel-flatpack integration test (#437)
54782f32 is described below
commit 54782f32d92b4001ea34f6c93aca05d1e9d365f7
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jul 17 15:28:52 2024 +0200
Ref #436: Add camel-flatpack integration test (#437)
---
tests/features/camel-flatpack/pom.xml | 32 ++
.../camel/test/CamelFlatpackRouteSupplier.java | 46 ++
.../karaf/camel/itest/CamelFlatpackITest.java | 70 ++
.../test/resources/INVENTORY-Delimited.pzmap.xml | 27 +
tests/features/pom.xml | 1 +
5 files changed, 176 insertions(+)
diff --git a/tests/features/camel-flatpack/pom.xml
b/tests/features/camel-flatpack/pom.xml
new file mode 100644
index ..15cf698c
--- /dev/null
+++ b/tests/features/camel-flatpack/pom.xml
@@ -0,0 +1,32 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-flatpack-test
+Apache Camel :: Karaf :: Tests :: Features :: Flatpack
+
\ No newline at end of file
diff --git
a/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
b/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
new file mode 100644
index ..0174a9a6
--- /dev/null
+++
b/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-flatpack-test",
+immediate = true,
+service = CamelFlatpackRouteSupplier.class
+)
+public class CamelFlatpackRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+return builder ->
+
builder.fromF("flatpack:delim:file:%s/test-classes/INVENTORY-Delimited.pzmap.xml",
+System.getProperty("project.target"))
+.log("received message ${body}");
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+
producerRoute.toF("flatpack:delim:file:%s/test-classes/INVENTORY-Delimited.pzmap.xml",
+System.getProperty("project.target"));
+}
+}
+
diff --git
a/tests/features/camel-flatpack/src/test/java/org/apache/karaf/camel/itest/CamelFlatpackITest.java
b/tests/features/camel-flatpack/src/test/java/org/apache/karaf/camel/itest/CamelFlatpackITest.java
new file mode 100644
index ..b6b7fd6e
--- /dev/null
+++
b/tests/features/camel-flatpack/src/test/java/org/apache/karaf/camel/itest/CamelFlatpackITest.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed 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 exp
(camel-karaf) branch main updated: Ref #434: Add camel-bean-validator integration test (#435)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 aec78912 Ref #434: Add camel-bean-validator integration test (#435)
aec78912 is described below
commit aec789129339fd85eaae3ba3979dec400946810d
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jul 17 15:27:54 2024 +0200
Ref #434: Add camel-bean-validator integration test (#435)
---
components/camel-bean-validator/pom.xml| 38 +++-
.../component/bean/validator/osgi/Activator.java | 41 ++
.../OsgiValidationProviderResolverFactory.java | 32 ++
features/src/main/feature/camel-features.xml | 11 +++--
pom.xml| 1 +
tests/features/camel-bean-validator/pom.xml| 40 +
.../test/CamelBeanValidatorRouteSupplier.java | 50 ++
.../karaf/camel/itest/CamelBeanValidatorITest.java | 37
tests/features/pom.xml | 1 +
9 files changed, 246 insertions(+), 5 deletions(-)
diff --git a/components/camel-bean-validator/pom.xml
b/components/camel-bean-validator/pom.xml
index 24f366c1..62f87895 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -34,11 +34,15 @@
-org.apache.camel*;version=${camel-version}
+org.apache.camel.component.bean.validator*;version=${camel-version}
+
+!org.apache.camel.component.bean.validator,
+
org.apache.camel.*;${camel-osgi-import-camel-version},
*
+
org.apache.camel.component.bean.validator.osgi.Activator
@@ -53,10 +57,42 @@
+
+jakarta.validation
+jakarta.validation-api
+${jakarta-validation-api-version}
+provided
+
+
+org.apache.camel
+camel-api
+${camel-version}
+provided
+
+
+
+org.osgi
+osgi.core
+provided
+true
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+
+recompile
+process-classes
+
+compile
+
+
+
+
org.apache.maven.plugins
maven-shade-plugin
diff --git
a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/osgi/Activator.java
b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/osgi/Activator.java
new file mode 100644
index ..b6fecd4d
--- /dev/null
+++
b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/osgi/Activator.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.camel.component.bean.validator.osgi;
+
+import
org.apache.camel.component.bean.validator.ValidationProviderResolverFactory;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+public class Activator implements BundleActivator {
+private ServiceRegistration registration;
+
+@Override
+public void start(BundleContext context) throws Exception {
+Object factory = new OsgiValidationProviderResolverFactory();
+registration =
context.registerService(ValidationProviderResolverFactory.class.getName(),
factory, null);
+}
+
+@Override
+public void stop(BundleContext context) throws Exception {
+// release the reference
+if (registration != null) {
+context.ungetService
(camel-karaf) branch main updated: Ref #432: Add docker integration test (#433)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 f1cf4d2f Ref #432: Add docker integration test (#433)
f1cf4d2f is described below
commit f1cf4d2f0546c41d65068f258e30d93ce9415d8c
Author: Stefan Tataru
AuthorDate: Wed Jul 17 10:24:34 2024 +0200
Ref #432: Add docker integration test (#433)
---
features/src/main/feature/camel-features.xml | 11 +++-
tests/features/camel-docker/pom.xml| 42 +
.../karaf/camel/test/CamelDockerRouteSupplier.java | 60 +++
.../apache/karaf/camel/itest/CamelDockerITest.java | 69 ++
tests/features/pom.xml | 1 +
5 files changed, 182 insertions(+), 1 deletion(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 579c452b..fa05ec69 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -146,6 +146,7 @@
mvn:io.netty/netty-buffer/${netty-version}
mvn:io.netty/netty-common/${netty-version}
mvn:io.netty/netty-codec/${netty-version}
+mvn:io.netty/netty-codec-http/${netty-version}
mvn:io.netty/netty-handler/${netty-version}
mvn:io.netty/netty-resolver/${netty-version}
mvn:io.netty/netty-transport/${netty-version}
@@ -952,8 +953,16 @@
camel-core
+guava
+jackson
+netty
+
+wrap:mvn:com.github.docker-java/docker-java/${docker-java-version}$Fragment-Host=com.github.docker-java.docker-java-core;bundle-version=${docker-java-version}
wrap:mvn:com.github.docker-java/docker-java-api/${docker-java-version}
-wrap:mvn:com.github.docker-java/docker-java-core/${docker-java-version}
+wrap:mvn:com.github.docker-java/docker-java-core/${docker-java-version}$Bundle-SymbolicName=com.github.docker-java.docker-java-core
+wrap:mvn:com.github.docker-java/docker-java-transport/${docker-java-version}
wrap:mvn:com.github.docker-java/docker-java-transport-jersey/${docker-java-version}
wrap:mvn:com.github.docker-java/docker-java-transport-netty/${docker-java-version}
mvn:org.apache.commons/commons-lang3/${commons-lang3-version}
diff --git a/tests/features/camel-docker/pom.xml
b/tests/features/camel-docker/pom.xml
new file mode 100644
index ..4d7ee572
--- /dev/null
+++ b/tests/features/camel-docker/pom.xml
@@ -0,0 +1,42 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.7.0-SNAPSHOT
+
+
+camel-docker-test
+Apache Camel :: Karaf :: Tests :: Features :: Docker
+
+
+
+org.testcontainers
+testcontainers
+${testcontainers-version}
+test
+
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-docker/src/main/java/org/apache/karaf/camel/test/CamelDockerRouteSupplier.java
b/tests/features/camel-docker/src/main/java/org/apache/karaf/camel/test/CamelDockerRouteSupplier.java
new file mode 100644
index ..df34cd17
--- /dev/null
+++
b/tests/features/camel-docker/src/main/java/org/apache/karaf/camel/test/CamelDockerRouteSupplier.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-docker-test",
+immediate = true,
+service
(camel-karaf) branch upgrade-to-camel-4.7 deleted (was 87032cad)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch upgrade-to-camel-4.7 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 87032cad Ref #419: Force the locale to predict the decimal format 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) 02/02: Ref #419: Force the locale to predict the decimal format
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 64b3741cf3ef30771cd4452f884aef0b16fd06d8
Author: Nicolas Filotto
AuthorDate: Sat Jul 13 11:48:55 2024 +0200
Ref #419: Force the locale to predict the decimal format
---
.../main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
b/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
index ffed028f..642bfb6c 100644
---
a/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
+++
b/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
@@ -39,6 +39,7 @@ public class CamelBindyRouteSupplier extends
AbstractCamelSingleFeatureResultMoc
protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
BindyCsvDataFormat camelDataFormat = new
BindyCsvDataFormat(Order.class);
+camelDataFormat.setLocale("en");
producerRoute.process(ex -> ex.getIn().setBody(CSV))
.unmarshal(camelDataFormat)
(camel-karaf) branch main updated (1eb2668b -> 64b3741c)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from 1eb2668b Ref #426: Add camel-cbor integration test (#427)
new f496fad8 Upgrade to Camel 4.7
new 64b3741c Ref #419: Force the locale to predict the decimal format
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-activemq/pom.xml | 2 +-
components/{camel-amqp => camel-activemq6}/pom.xml | 11 +-
components/camel-ai/camel-chatscript/pom.xml | 2 +-
components/camel-ai/camel-djl/pom.xml | 2 +-
components/camel-ai/camel-langchain4j-chat/pom.xml | 2 +-
.../pom.xml| 10 +-
.../camel-ai/camel-langchain4j-embeddings/pom.xml | 2 +-
components/{ => camel-ai}/camel-milvus/pom.xml | 6 +-
components/{ => camel-ai}/camel-pinecone/pom.xml | 6 +-
components/{ => camel-ai}/camel-qdrant/pom.xml | 6 +-
components/camel-ai/pom.xml| 6 +-
components/camel-amqp/pom.xml | 2 +-
components/camel-arangodb/pom.xml | 2 +-
components/camel-as2/pom.xml | 2 +-
components/camel-asn1/pom.xml | 2 +-
components/camel-asterisk/pom.xml | 2 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
components/camel-atom/pom.xml | 2 +-
components/camel-attachments/pom.xml | 2 +-
.../camel-avro-rpc/camel-avro-rpc-jetty/pom.xml| 2 +-
components/camel-avro-rpc/camel-avro-rpc/pom.xml | 2 +-
components/camel-avro-rpc/pom.xml | 2 +-
components/camel-avro/pom.xml | 2 +-
components/camel-aws/camel-aws-bedrock/pom.xml | 2 +-
components/camel-aws/camel-aws-cloudtrail/pom.xml | 2 +-
components/camel-aws/camel-aws-config/pom.xml | 2 +-
.../camel-aws/camel-aws-secrets-manager/pom.xml| 2 +-
components/camel-aws/camel-aws-xray/pom.xml| 2 +-
components/camel-aws/camel-aws2-athena/pom.xml | 2 +-
components/camel-aws/camel-aws2-cw/pom.xml | 2 +-
components/camel-aws/camel-aws2-ddb/pom.xml| 2 +-
components/camel-aws/camel-aws2-ec2/pom.xml| 2 +-
components/camel-aws/camel-aws2-ecs/pom.xml| 2 +-
components/camel-aws/camel-aws2-eks/pom.xml| 2 +-
.../camel-aws/camel-aws2-eventbridge/pom.xml | 2 +-
components/camel-aws/camel-aws2-iam/pom.xml| 2 +-
components/camel-aws/camel-aws2-kinesis/pom.xml| 2 +-
components/camel-aws/camel-aws2-kms/pom.xml| 2 +-
components/camel-aws/camel-aws2-lambda/pom.xml | 2 +-
components/camel-aws/camel-aws2-mq/pom.xml | 2 +-
components/camel-aws/camel-aws2-msk/pom.xml| 2 +-
components/camel-aws/camel-aws2-redshift/pom.xml | 2 +-
components/camel-aws/camel-aws2-s3/pom.xml | 2 +-
components/camel-aws/camel-aws2-ses/pom.xml| 2 +-
components/camel-aws/camel-aws2-sns/pom.xml| 2 +-
components/camel-aws/camel-aws2-sqs/pom.xml| 2 +-
.../camel-aws/camel-aws2-step-functions/pom.xml| 2 +-
components/camel-aws/camel-aws2-sts/pom.xml| 2 +-
components/camel-aws/camel-aws2-timestream/pom.xml | 2 +-
components/camel-aws/camel-aws2-translate/pom.xml | 2 +-
components/camel-aws/pom.xml | 2 +-
.../camel-azure/camel-azure-cosmosdb/pom.xml | 2 +-
.../camel-azure/camel-azure-eventhubs/pom.xml | 2 +-
components/camel-azure/camel-azure-files/pom.xml | 2 +-
.../camel-azure/camel-azure-key-vault/pom.xml | 2 +-
.../camel-azure-schema-registry/pom.xml| 2 +-
.../camel-azure/camel-azure-servicebus/pom.xml | 2 +-
.../camel-azure/camel-azure-storage-blob/pom.xml | 2 +-
.../camel-azure-storage-datalake/pom.xml | 2 +-
.../camel-azure/camel-azure-storage-queue/pom.xml | 2 +-
components/camel-azure/pom.xml | 2 +-
components/camel-barcode/pom.xml | 2 +-
components/camel-base64/pom.xml| 2 +-
components/camel-bean-validator/pom.xml| 2 +-
components/camel-bean/pom.xml | 2 +-
components/camel-beanio/pom.xml| 2 +-
components/camel-bindy/pom.xml | 2 +-
components/camel-blueprint/pom.xml | 3 +-
components/camel-bonita/pom.xml| 2 +-
components/camel-box/pom.xml | 2 +-
components/camel-braintree/pom.xml | 2 +-
(camel-karaf) branch upgrade-to-camel-4.7 updated (bbaacd21 -> 87032cad)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch upgrade-to-camel-4.7 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from bbaacd21 Upgrade to Camel 4.7 add 87032cad Ref #419: Force the locale to predict the decimal format No new revisions were added by this update. Summary of changes: .../main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java | 1 + 1 file changed, 1 insertion(+)
(camel-karaf) branch upgrade-to-camel-4.7 updated (18941906 -> bbaacd21)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch upgrade-to-camel-4.7
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
discard 18941906 Upgrade to Camel 4.7
add 1de3ddee Ref #419: Add camel-bindy integration test (#420)
add 94664f57 Ref #421: Add camel-drill integration test (#422)
add 3ca71fad Ref #424: Add camel-caffeine integration test (#425)
add 1eb2668b Ref #426: Add camel-cbor integration test (#427)
add bbaacd21 Upgrade to Camel 4.7
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (18941906)
\
N -- N -- N refs/heads/upgrade-to-camel-4.7 (bbaacd21)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
features/pom.xml | 2 +-
features/src/main/feature/camel-features.xml | 4 +-
tests/features/{camel-avro => camel-bindy}/pom.xml | 8 +-
.../karaf/camel/test/CamelBindyRouteSupplier.java} | 27 ++--
.../java/org/apache/karaf/camel/test/Order.java| 168 +
.../apache/karaf/camel/itest/CamelBindyITest.java} | 7 +-
.../{camel-barcode => camel-caffeine}/pom.xml | 6 +-
.../camel/test/CamelCaffeineRouteSupplier.java}| 28 ++--
.../karaf/camel/itest/CamelCaffeineITest.java} | 8 +-
tests/features/{camel-atom => camel-cbor}/pom.xml | 6 +-
.../karaf/camel/test/CamelCborRouteSupplier.java} | 33 ++--
.../apache/karaf/camel/itest/CamelCborITest.java} | 13 +-
tests/features/{camel-mail => camel-drill}/pom.xml | 4 +-
.../karaf/camel/test/CamelDrillRouteSupplier.java} | 25 ++-
.../apache/karaf/camel/itest/CamelDrillITest.java} | 38 +++--
tests/features/pom.xml | 7 +-
.../camel-karaf-test-feature-archetype/README.md | 2 +-
.../META-INF/maven/archetype-metadata.xml | 2 +-
18 files changed, 290 insertions(+), 98 deletions(-)
copy tests/features/{camel-avro => camel-bindy}/pom.xml (89%)
copy
tests/features/{camel-velocity/src/main/java/org/apache/karaf/camel/test/CamelVelocityRouteSupplier.java
=>
camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java}
(67%)
create mode 100644
tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/Order.java
copy
tests/features/{camel-jetty/src/test/java/org/apache/karaf/camel/itest/CamelJettyITest.java
=>
camel-bindy/src/test/java/org/apache/karaf/camel/itest/CamelBindyITest.java}
(83%)
copy tests/features/{camel-barcode => camel-caffeine}/pom.xml (88%)
copy
tests/features/{camel-velocity/src/main/java/org/apache/karaf/camel/test/CamelVelocityRouteSupplier.java
=>
camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java}
(65%)
copy
tests/features/{camel-fastjson/src/test/java/org/apache/karaf/camel/itest/CamelFastjsonITest.java
=>
camel-caffeine/src/test/java/org/apache/karaf/camel/itest/CamelCaffeineITest.java}
(81%)
copy tests/features/{camel-atom => camel-cbor}/pom.xml (89%)
copy
tests/features/{camel-velocity/src/main/java/org/apache/karaf/camel/test/CamelVelocityRouteSupplier.java
=>
camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java}
(70%)
copy
tests/features/{camel-gson/src/test/java/org/apache/karaf/camel/itest/CamelGsonITest.java
=> camel-cbor/src/test/java/org/apache/karaf/camel/itest/CamelCborITest.java}
(78%)
copy tests/features/{camel-mail => camel-drill}/pom.xml (92%)
copy
tests/features/{camel-velocity/src/main/java/org/apache/karaf/camel/test/CamelVelocityRouteSupplier.java
=>
camel-drill/src/main/java/org/apache/karaf/camel/test/CamelDrillRouteSupplier.java}
(66%)
copy
tests/features/{camel-kafka/src/test/java/org/apache/karaf/camel/itest/CamelKafkaITest.java
=>
camel-drill/src/test/java/org/apache/karaf/camel/itest/CamelDrillITest.java}
(54%)
(camel-karaf) branch main updated: Ref #426: Add camel-cbor integration test (#427)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 1eb2668b Ref #426: Add camel-cbor integration test (#427)
1eb2668b is described below
commit 1eb2668be8cbb86e52d6c46c1131e8187f8b5a16
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Sat Jul 13 10:17:06 2024 +0200
Ref #426: Add camel-cbor integration test (#427)
---
tests/features/camel-cbor/pom.xml | 40
.../karaf/camel/test/CamelCborRouteSupplier.java | 56 ++
.../apache/karaf/camel/itest/CamelCborITest.java | 46 ++
tests/features/pom.xml | 1 +
4 files changed, 143 insertions(+)
diff --git a/tests/features/camel-cbor/pom.xml
b/tests/features/camel-cbor/pom.xml
new file mode 100644
index ..5fd476f6
--- /dev/null
+++ b/tests/features/camel-cbor/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-cbor-test
+Apache Camel :: Karaf :: Tests :: Features :: CBOR
+
+
+
+org.apache.camel
+camel-cbor
+${camel-version}
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java
b/tests/features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java
new file mode 100644
index ..5dd7345c
--- /dev/null
+++
b/tests/features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.cbor.CBORDataFormat;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-cbor-test",
+immediate = true,
+service = CamelCborRouteSupplier.class
+)
+public class CamelCborRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+CBORDataFormat format = new CBORDataFormat();
+format.useMap();
+
+Map in = new HashMap<>();
+in.put("name", "OK");
+
+producerRoute.setBody(constant(in))
+.marshal(format)
+.log("marshalled ${body}")
+.unmarshal(format)
+.toF("mock:%s", getResultMockName());
+}
+}
+
diff --git
a/tests/features/camel-cbor/src/test/java/org/apache/karaf/camel/itest/CamelCborITest.java
b/tests/features/camel-cbor/src/test/java/org/apache/karaf/camel/itest/CamelCborITest.java
new file mode 100644
index ..b693a0eb
--- /dev/null
+++
b/tests/features/camel-cbor/src/test/java/org/apache/karaf/camel/itest/CamelCborITest.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed 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
(camel-karaf) branch main updated: Ref #424: Add camel-caffeine integration test (#425)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 3ca71fad Ref #424: Add camel-caffeine integration test (#425)
3ca71fad is described below
commit 3ca71fada100a5b9bcf724c0a44ad8f31334c455
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Sat Jul 13 10:15:59 2024 +0200
Ref #424: Add camel-caffeine integration test (#425)
---
tests/features/camel-caffeine/pom.xml | 40 +
.../camel/test/CamelCaffeineRouteSupplier.java | 51 ++
.../karaf/camel/itest/CamelCaffeineITest.java | 40 +
tests/features/pom.xml | 1 +
4 files changed, 132 insertions(+)
diff --git a/tests/features/camel-caffeine/pom.xml
b/tests/features/camel-caffeine/pom.xml
new file mode 100644
index ..3eab4871
--- /dev/null
+++ b/tests/features/camel-caffeine/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-caffeine-test
+Apache Camel :: Karaf :: Tests :: Features :: Caffeine
+
+
+
+org.apache.camel
+camel-caffeine
+${camel-version}
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java
b/tests/features/camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java
new file mode 100644
index ..22066ce3
--- /dev/null
+++
b/tests/features/camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.caffeine.CaffeineConstants;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-caffeine-test",
+immediate = true,
+service = CamelCaffeineRouteSupplier.class
+)
+public class CamelCaffeineRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+producerRoute.setBody(constant("OK"))
+.setHeader(CaffeineConstants.ACTION,
constant(CaffeineConstants.ACTION_PUT))
+.setHeader(CaffeineConstants.KEY, constant("cachekey"))
+.to("caffeine-cache://testcache?statsEnabled=true")
+.setHeader(CaffeineConstants.ACTION,
constant(CaffeineConstants.ACTION_GET))
+.setHeader(CaffeineConstants.KEY, constant("cachekey"))
+.to("caffeine-cache://testcache?statsEnabled=true")
+.log("received: ${body}")
+.toF("mock:%s", getResultMockName());
+}
+}
+
diff --git
a/tests/features/camel-caffeine/src/test/java/org/apache/karaf/camel/itest/CamelCaffeineITest.java
b/tests/features/camel-caffeine/src/test/java/org/apache/karaf/camel/itest/CamelCaffeineITest.java
new file mode 100644
index ..2db5c6f3
--- /dev/null
+++
b/tests/features/camel-caffeine/src/test/java/org/apache/karaf/camel/itest/CamelCaffeineITest.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+
(camel-karaf) branch main updated: Ref #421: Add camel-drill integration test (#422)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 94664f57 Ref #421: Add camel-drill integration test (#422)
94664f57 is described below
commit 94664f5756d7becff39931a2638342d12384e68c
Author: Stefan Tataru
AuthorDate: Sat Jul 13 10:14:17 2024 +0200
Ref #421: Add camel-drill integration test (#422)
---
features/src/main/feature/camel-features.xml | 4 +-
tests/features/camel-drill/pom.xml | 42 +
.../karaf/camel/test/CamelDrillRouteSupplier.java | 48 +++
.../apache/karaf/camel/itest/CamelDrillITest.java | 68 ++
tests/features/pom.xml | 1 +
5 files changed, 162 insertions(+), 1 deletion(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index f42e432c..bd5cce3a 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -941,7 +941,9 @@
camel-core
spring-jdbc
-wrap:mvn:org.apache.drill.exec/drill-jdbc-all/${apache-drill-version}$Export-Package=org.apache.drill.jdbc.*;version=${apache-drill-version}
+
+wrap:mvn:org.apache.drill.exec/drill-jdbc-all/${apache-drill-version}$Export-Package=org.apache.drill.jdbc.*;version=${apache-drill-version}SPI-Provider=java.sql.Driver
mvn:org.apache.camel.karaf/camel-drill/${project.version}
diff --git a/tests/features/camel-drill/pom.xml
b/tests/features/camel-drill/pom.xml
new file mode 100644
index ..7d3c328e
--- /dev/null
+++ b/tests/features/camel-drill/pom.xml
@@ -0,0 +1,42 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-drill-test
+Apache Camel :: Karaf :: Tests :: Features :: Drill
+
+
+
+org.testcontainers
+testcontainers
+${testcontainers-version}
+test
+
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-drill/src/main/java/org/apache/karaf/camel/test/CamelDrillRouteSupplier.java
b/tests/features/camel-drill/src/main/java/org/apache/karaf/camel/test/CamelDrillRouteSupplier.java
new file mode 100644
index ..3bfddb29
--- /dev/null
+++
b/tests/features/camel-drill/src/main/java/org/apache/karaf/camel/test/CamelDrillRouteSupplier.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-drill-test",
+immediate = true,
+service = CamelRouteSupplier.class
+)
+public class CamelDrillRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+private final static String SELECT_QUERY = "select * from
cp.`employee.json` limit 3";
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+producerRoute.setHeader("DrillHost",
builder.constant(System.getProperty("drill.host")))
+.setHeader("DrillPort",
builder.constant(System.getProperty("drill.port")))
+.setHeader("CamelDrillQuery", builder.constant(SELECT_QUERY))
+
.toD("drill://${header.DrillHost}?port=${header.DrillPort}=DRILLBIT")
+
(camel-karaf) branch main updated: Ref #419: Add camel-bindy integration test (#420)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 1de3ddee Ref #419: Add camel-bindy integration test (#420)
1de3ddee is described below
commit 1de3ddee73d7282109c2b44d4b07e3e4f840b3f1
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Sat Jul 13 10:13:13 2024 +0200
Ref #419: Add camel-bindy integration test (#420)
---
tests/features/camel-bindy/pom.xml | 40 +
.../karaf/camel/test/CamelBindyRouteSupplier.java | 52 +++
.../java/org/apache/karaf/camel/test/Order.java| 168 +
.../apache/karaf/camel/itest/CamelBindyITest.java | 39 +
tests/features/pom.xml | 1 +
5 files changed, 300 insertions(+)
diff --git a/tests/features/camel-bindy/pom.xml
b/tests/features/camel-bindy/pom.xml
new file mode 100644
index ..9e1aae95
--- /dev/null
+++ b/tests/features/camel-bindy/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-bindy-test
+Apache Camel :: Karaf :: Tests :: Features :: Bindy
+
+
+
+org.apache.camel
+camel-bindy
+${camel-version}
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
b/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
new file mode 100644
index ..ffed028f
--- /dev/null
+++
b/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-bindy-test",
+immediate = true,
+service = CamelBindyRouteSupplier.class
+)
+public class CamelBindyRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+public static final String CSV =
"1,B2,Keira,Knightley,ISIN,XX23456789,BUY,Share,400.25,EUR,14-01-2009,17-02-2011
23:21:59\r\n";
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+
+BindyCsvDataFormat camelDataFormat = new
BindyCsvDataFormat(Order.class);
+
+producerRoute.process(ex -> ex.getIn().setBody(CSV))
+.unmarshal(camelDataFormat)
+.marshal(camelDataFormat)
+.log("Decoded: ${body}")
+.toF("mock:%s", getResultMockName());
+}
+
+
+}
+
diff --git
a/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/Order.java
b/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/Order.java
new file mode 100644
index ..409352b6
--- /dev/null
+++
b/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/Order.java
@@ -0,0 +1,168 @@
+/*
+ * 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
(camel-karaf) branch upgrade-to-camel-4.7 created (now 18941906)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch upgrade-to-camel-4.7 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at 18941906 Upgrade to Camel 4.7 This branch includes the following new commits: new 18941906 Upgrade to Camel 4.7 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-karaf) branch main updated: Ref #416: Add camel-base64 integration test (#417)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 0c00ee49 Ref #416: Add camel-base64 integration test (#417)
0c00ee49 is described below
commit 0c00ee499f4dfdd43f8269bab1480f0588ff65d0
Author: Stefan Tataru
AuthorDate: Wed Jul 10 18:07:52 2024 +0200
Ref #416: Add camel-base64 integration test (#417)
---
.../itests/AbstractCamelRouteWithBundleITest.java | 9 +++--
tests/features/camel-base64/pom.xml| 30 ++
.../karaf/camel/test/CamelBase64RouteSupplier.java | 46 ++
.../apache/karaf/camel/itest/CamelBase64ITest.java | 42
tests/features/pom.xml | 1 +
5 files changed, 125 insertions(+), 3 deletions(-)
diff --git
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java
index 96da477c..1f0c7a62 100644
---
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java
+++
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java
@@ -17,13 +17,15 @@
package org.apache.karaf.camel.itests;
+import static org.ops4j.pax.exam.OptionUtils.combine;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.List;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
-import static org.ops4j.pax.exam.OptionUtils.combine;
-
public abstract class AbstractCamelRouteWithBundleITest extends
AbstractCamelRouteITest {
@@ -41,7 +43,8 @@ public abstract class AbstractCamelRouteWithBundleITest
extends AbstractCamelRou
throw new IllegalArgumentException("The system property
project.version must be set to the version of the " +
"test bundle to install or the method getTestBundleVersion
must be overridden to provide the version");
}
-installBundle("file://%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion), true);
+Path bundlePath = Paths.get("%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion));
+installBundle(bundlePath.toUri().toString(), true);
assertBundleInstalledAndRunning(testBundleName);
return List.of(testBundleName);
}
diff --git a/tests/features/camel-base64/pom.xml
b/tests/features/camel-base64/pom.xml
new file mode 100644
index ..9bfbb6a7
--- /dev/null
+++ b/tests/features/camel-base64/pom.xml
@@ -0,0 +1,30 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-base64-test
+Apache Camel :: Karaf :: Tests :: Features :: Base64
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-base64/src/main/java/org/apache/karaf/camel/test/CamelBase64RouteSupplier.java
b/tests/features/camel-base64/src/main/java/org/apache/karaf/camel/test/CamelBase64RouteSupplier.java
new file mode 100644
index ..afead82f
--- /dev/null
+++
b/tests/features/camel-base64/src/main/java/org/apache/karaf/camel/test/CamelBase64RouteSupplier.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(name = "karaf-camel-base64-test", immediate = true,
(camel-karaf) branch main updated: Ref #412: Add camel-avro integration-test (#413)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 a6789425 Ref #412: Add camel-avro integration-test (#413)
a6789425 is described below
commit a6789425a4630118f838c10e9a7144091ce15716
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jul 10 09:53:53 2024 +0200
Ref #412: Add camel-avro integration-test (#413)
---
tests/features/camel-avro/pom.xml | 42 ++
.../karaf/camel/test/CamelAvroRouteSupplier.java | 56
.../java/org/apache/karaf/camel/test/Value.java| 153 +
.../apache/karaf/camel/itest/CamelAvroITest.java | 37 +
tests/features/pom.xml | 1 +
5 files changed, 289 insertions(+)
diff --git a/tests/features/camel-avro/pom.xml
b/tests/features/camel-avro/pom.xml
new file mode 100644
index ..4bac7a15
--- /dev/null
+++ b/tests/features/camel-avro/pom.xml
@@ -0,0 +1,42 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-avro-test
+Apache Camel :: Karaf :: Tests :: Features :: Avro
+
+
+
+org.apache.camel
+camel-avro
+${camel-version}
+
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java
b/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java
new file mode 100644
index ..533e8f5c
--- /dev/null
+++
b/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.io.IOException;
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.dataformat.avro.AvroDataFormat;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
+@Component(
+name = "karaf-camel-avro-test",
+immediate = true,
+service = CamelAvroRouteSupplier.class
+)
+public class CamelAvroRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+try (AvroDataFormat adf = new AvroDataFormat(Value.SCHEMA$)) {
+Value input = Value.newBuilder().setValue("OK").build();
+return builder -> builder.from("timer://testTimer?repeatCount=1")
+.setBody(constant(input))
+.marshal(adf)
+.unmarshal(adf)
+.log("received message ${body}");
+} catch (IOException e) {
+throw new IllegalStateException(e);
+}
+}
+
+@Override
+protected boolean producerEnabled() {
+return false;
+}
+}
+
diff --git
a/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/Value.java
b/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/Value.java
new file mode 100644
index ..cb771477
--- /dev/null
+++
b/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/Value.java
@@ -0,0 +1,153 @@
+/*
+ * 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
+ * (t
(camel-karaf) branch main updated: Ref #414: Add camel-barcode integration test (#415)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 a01f9413 Ref #414: Add camel-barcode integration test (#415)
a01f9413 is described below
commit a01f94132fb3be859694e5f5a4334300d53d4386
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Tue Jul 9 18:48:48 2024 +0200
Ref #414: Add camel-barcode integration test (#415)
---
tests/features/camel-barcode/pom.xml | 40 ++
.../camel/test/CamelBarcodeRouteSupplier.java | 88 ++
.../karaf/camel/itest/CamelBarcodeITest.java | 55 ++
tests/features/pom.xml | 1 +
4 files changed, 184 insertions(+)
diff --git a/tests/features/camel-barcode/pom.xml
b/tests/features/camel-barcode/pom.xml
new file mode 100644
index ..885d5243
--- /dev/null
+++ b/tests/features/camel-barcode/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-barcode-test
+Apache Camel :: Karaf :: Tests :: Features :: Barcode
+
+
+
+org.apache.camel
+camel-barcode
+${camel-version}
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
b/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
new file mode 100644
index ..a87153e8
--- /dev/null
+++
b/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Path;
+import java.util.function.Function;
+
+import javax.imageio.ImageIO;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.dataformat.barcode.BarcodeDataFormat;
+import org.apache.camel.dataformat.barcode.BarcodeImageType;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.spi.DataFormat;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+
+@Component(
+name = "karaf-camel-barcode-test",
+immediate = true,
+service = CamelBarcodeRouteSupplier.class
+)
+public class CamelBarcodeRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+
+try (DataFormat code1 = new BarcodeDataFormat(200, 200,
BarcodeImageType.PNG, BarcodeFormat.CODE_39)) {
+return builder -> builder.from("timer://testTimer?repeatCount=1")
+.setBody(constant("OK"))
+.marshal(code1)
+.process(new Processor() {
+@Override
+public void process(Exchange exchange) throws
Exception {
+InputStream bis =
exchange.getIn().getBody(InputStream.class);
+BinaryBitmap bitmap =
+
(camel-karaf) branch main updated: Ref #408: Add maven archetype for integration tests (#409)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 d1c094d6 Ref #408: Add maven archetype for integration tests (#409)
d1c094d6 is described below
commit d1c094d6e932cf2c6dcedcd52d6fc38deee7f4cd
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Tue Jul 9 17:28:21 2024 +0200
Ref #408: Add maven archetype for integration tests (#409)
---
.../camel-karaf-test-feature-archetype/README.md | 17 +++
.../pom.xml| 33 +++--
.../META-INF/maven/archetype-metadata.xml | 43 +
.../main/resources/archetype-resources}/pom.xml| 27 ---
.../test/Camel__featureName__RouteSupplier.java| 54 ++
.../test/java/itest/Camel__featureName__ITest.java | 46 ++
tooling/pom.xml| 1 +
7 files changed, 189 insertions(+), 32 deletions(-)
diff --git a/tooling/camel-karaf-test-feature-archetype/README.md
b/tooling/camel-karaf-test-feature-archetype/README.md
new file mode 100644
index ..6a57aa05
--- /dev/null
+++ b/tooling/camel-karaf-test-feature-archetype/README.md
@@ -0,0 +1,17 @@
+# Apache Camel Karaf Integration Test Archetype
+
+### Introduction
+
+This archetype is to initialize a maven project to write an integration test
for a Camel Karaf feature using the
+framework provided by `org.apache.camel.karaf:camel-integration-test`.
+
+### Usage
+
+This tool is using maven archetype:generate plugin, for instance, to
+initialize an integration test for the component camel-atom, go to
`camel-karaf/tests/features/`, then run
+
+```shell
+mvn archetype:generate -DfeatureName=Atom
-DarchetypeGroupId=org.apache.camel.karaf
-DarchetypeArtifactId=camel-karaf-test-feature-archetype
-DarchetypeVersion=4.6.0-SNAPSHOT
+```
+
+Then rename the directory `camel-atom-test` to `camel-atom`, adapt the file
`pom.xml`, and finally fill in the supplier class and integration test.
diff --git a/tooling/pom.xml
b/tooling/camel-karaf-test-feature-archetype/pom.xml
similarity index 54%
copy from tooling/pom.xml
copy to tooling/camel-karaf-test-feature-archetype/pom.xml
index 23fc96d6..4c88b111 100644
--- a/tooling/pom.xml
+++ b/tooling/camel-karaf-test-feature-archetype/pom.xml
@@ -1,3 +1,4 @@
+
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
-
org.apache.camel.karaf
-camel-karaf
+tooling
4.6.0-SNAPSHOT
-
-tooling
-pom
-Apache Camel :: Karaf :: Tooling
+
+camel-karaf-test-feature-archetype
+Apache Camel :: Karaf :: Tooling :: Integration Test Archetype
-3.9.8
+3.2.1
-
-camel-karaf-feature-maven-plugin
-camel-karaf-maven-plugin-integration-test
-camel-upgrade
-
-
+
+
+
+org.apache.maven.archetype
+archetype-packaging
+${maven-archetype-version}
+
+
+
+
\ No newline at end of file
diff --git
a/tooling/camel-karaf-test-feature-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index ..586b703b
--- /dev/null
+++
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,43 @@
+
+
+http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0;>
+
+
+
+${featureName.toLowerCase()}
+
+
+org.apache.karaf.camel
+
+
+camel-${featureNameLower}-test
+
+
+4.6.0-SNAPSHOT
+
+
+
+
+src/main/java
+
+
+src/test/java
+
+
+
\ No newline at end of file
diff --git a/tooling/pom.xml
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 56%
copy from tooling/pom.xml
copy to
tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/pom.xml
index 23fc96d6..470dc6a2 100644
--- a/tooling/pom.xml
+++
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,4 +1,6 @@
+
-http://maven.apache.org/P
(camel-karaf) branch main updated: Ref #410: Add camel-atom integration-test (#411)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 efdad808 Ref #410: Add camel-atom integration-test (#411)
efdad808 is described below
commit efdad808a1db2a2d7d938ed00584cb0417f18acd
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Tue Jul 9 16:28:48 2024 +0200
Ref #410: Add camel-atom integration-test (#411)
---
tests/features/camel-atom/pom.xml | 40 +++
.../karaf/camel/test/CamelAtomRouteSupplier.java | 43 +++
.../apache/karaf/camel/itest/CamelAtomITest.java | 66 +
.../camel-atom/src/test/resources/data/feed.atom | 316 +
tests/features/pom.xml | 3 +-
5 files changed, 467 insertions(+), 1 deletion(-)
diff --git a/tests/features/camel-atom/pom.xml
b/tests/features/camel-atom/pom.xml
new file mode 100644
index ..05562c0c
--- /dev/null
+++ b/tests/features/camel-atom/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-atom-test
+Apache Camel :: Karaf :: Tests :: Features :: Atom
+
+
+
+org.apache.camel
+camel-atom
+${camel-version}
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
b/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
new file mode 100644
index ..c146c7d2
--- /dev/null
+++
b/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-atom-test",
+immediate = true,
+service = CamelAtomRouteSupplier.class
+)
+public class CamelAtomRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+return builder ->
+
builder.fromF("atom://file:%s/test-classes/data/feed.atom?delay=500",
System.getProperty("project.target"))
+.log("received message ${body}");
+}
+
+protected boolean producerEnabled() {
+return false;
+}
+}
+
diff --git
a/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
b/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
new file mode 100644
index ..1ad01eb1
--- /dev/null
+++
b/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed 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.
+ */
+package org.apache.karaf.camel.itest;
+
+import static org.junit.Assert.assertEquals;
+import static
(camel-karaf) branch main updated: Ref #406: Add camel-as2 integration test and fix feature (#407)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 1c380ffd Ref #406: Add camel-as2 integration test and fix feature
(#407)
1c380ffd is described below
commit 1c380ffd65aa5b4232eeae84d5b3ce4f109cde4d
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Mon Jul 8 14:06:45 2024 +0200
Ref #406: Add camel-as2 integration test and fix feature (#407)
---
features/src/main/feature/camel-features.xml | 1 +
tests/features/camel-as2/pom.xml | 46
.../karaf/camel/test/CamelAs2RouteSupplier.java| 126 +
.../apache/karaf/camel/itest/CamelAs2ITest.java| 48
tests/features/pom.xml | 1 +
5 files changed, 222 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 3ad1f8c1..f42e432c 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -343,6 +343,7 @@
camel-core
http-client
bouncycastle
+wrap:mvn:org.apache.httpcomponents.core5/httpcore5-h2/${httpclient-version}
wrap:mvn:org.bouncycastle/bcutil-jdk18on/${bouncycastle-version}$overwrite=mergeExport-Package=org.bouncycastle.*;version=${bouncycastle-version}
mvn:org.apache.velocity/velocity-engine-core/${velocity-version}
diff --git a/tests/features/camel-as2/pom.xml b/tests/features/camel-as2/pom.xml
new file mode 100644
index ..c4a1e49a
--- /dev/null
+++ b/tests/features/camel-as2/pom.xml
@@ -0,0 +1,46 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-as2-test
+Apache Camel :: Karaf :: Tests :: Features :: AS2
+
+
+
+org.apache.camel
+camel-as2-api
+${camel-version}
+
+
+org.apache.camel
+camel-as2
+${camel-version}
+
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-as2/src/main/java/org/apache/karaf/camel/test/CamelAs2RouteSupplier.java
b/tests/features/camel-as2/src/main/java/org/apache/karaf/camel/test/CamelAs2RouteSupplier.java
new file mode 100644
index ..8e862cf5
--- /dev/null
+++
b/tests/features/camel-as2/src/main/java/org/apache/karaf/camel/test/CamelAs2RouteSupplier.java
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.nio.charset.StandardCharsets;
+import java.util.function.Function;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.as2.AS2Component;
+import org.apache.camel.component.as2.AS2Configuration;
+import org.apache.camel.component.as2.api.AS2MediaType;
+import org.apache.camel.component.as2.api.AS2MessageStructure;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.hc.core5.http.ContentType;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
+@Component(
+name = "karaf-camel-as2-test",
+immediate = true,
+service = CamelRouteSupplier.class
+)
+public class CamelAs2RouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+private static final String REQUEST_URI = "/";
+private static final String SUBJECT = "Test Case";
+private static final String AS2_NAME = "878051556";
+private static final String FROM =
(camel-karaf) branch main updated: Add camel-asn1 integration test (#405)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 22868ffa Add camel-asn1 integration test (#405)
22868ffa is described below
commit 22868ffafd4efb55825a80d5c7e5b27d82d88f31
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Thu Jul 4 17:57:42 2024 +0200
Add camel-asn1 integration test (#405)
---
tests/features/camel-asn1/pom.xml | 33
.../karaf/camel/test/CamelAsn1RouteSupplier.java | 49 +
.../apache/karaf/camel/itest/CamelAsn1ITest.java | 60 +
.../src/test/resources/asn1_data/SMS_SINGLE.tt | Bin 0 -> 229 bytes
tests/features/pom.xml | 1 +
5 files changed, 143 insertions(+)
diff --git a/tests/features/camel-asn1/pom.xml
b/tests/features/camel-asn1/pom.xml
new file mode 100644
index ..f6624295
--- /dev/null
+++ b/tests/features/camel-asn1/pom.xml
@@ -0,0 +1,33 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-asn1-test
+Apache Camel :: Karaf :: Tests :: Features :: ASN1
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-asn1/src/main/java/org/apache/karaf/camel/test/CamelAsn1RouteSupplier.java
b/tests/features/camel-asn1/src/main/java/org/apache/karaf/camel/test/CamelAsn1RouteSupplier.java
new file mode 100644
index ..c005276a
--- /dev/null
+++
b/tests/features/camel-asn1/src/main/java/org/apache/karaf/camel/test/CamelAsn1RouteSupplier.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.dataformat.ASN1DataFormat;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
+@Component(
+name = "karaf-camel-asn1-test",
+immediate = true,
+service = CamelRouteSupplier.class
+)
+public class CamelAsn1RouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+final ASN1DataFormat asn1 = new ASN1DataFormat();
+return builder ->
+
builder.fromF("file:%s/test-classes/asn1_data?fileName=SMS_SINGLE.tt=true",
+System.getProperty("project.target"))
+.unmarshal(asn1).marshal(asn1);
+}
+
+@Override
+protected boolean producerEnabled() {
+return false;
+}
+}
+
diff --git
a/tests/features/camel-asn1/src/test/java/org/apache/karaf/camel/itest/CamelAsn1ITest.java
b/tests/features/camel-asn1/src/test/java/org/apache/karaf/camel/itest/CamelAsn1ITest.java
new file mode 100644
index ..b3741981
--- /dev/null
+++
b/tests/features/camel-asn1/src/test/java/org/apache/karaf/camel/itest/CamelAsn1ITest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed 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.
+ */
+package or
(camel) branch essobedo/fix-rce-in-comment-action-v2-4.4 deleted (was e5bd4740172)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch essobedo/fix-rce-in-comment-action-v2-4.4 in repository https://gitbox.apache.org/repos/asf/camel.git was e5bd4740172 chore(ci): Fix vulnerability by using directly referenced action 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) branch essobedo/fix-rce-in-comment-action-v2-4.0 deleted (was 91166e9e70a)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch essobedo/fix-rce-in-comment-action-v2-4.0 in repository https://gitbox.apache.org/repos/asf/camel.git was 91166e9e70a chore(ci): Fix vulnerability by using directly referenced action 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) branch camel-4.0.x updated: chore(ci): Fix vulnerability by using directly referenced action (#14727)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 9da62eca93d chore(ci): Fix vulnerability by using directly referenced
action (#14727)
9da62eca93d is described below
commit 9da62eca93d2751b70b7e76eabb2b6c49b9e09bd
Author: Nicolas Filotto
AuthorDate: Thu Jul 4 17:36:16 2024 +0200
chore(ci): Fix vulnerability by using directly referenced action (#14727)
---
.github/actions/component-test/action.yaml | 4 ++--
.github/actions/create-or-update-comment | 1 -
.github/workflows/pr-comment.yml | 2 +-
.gitmodules| 3 ---
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.github/actions/component-test/action.yaml
b/.github/actions/component-test/action.yaml
index 7257029e2cf..0e2f4f7b3ba 100644
--- a/.github/actions/component-test/action.yaml
+++ b/.github/actions/component-test/action.yaml
@@ -65,7 +65,7 @@ runs:
path: tests.log
- name: Success comment
if: success()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
@@ -75,7 +75,7 @@ runs:
**Result** :white_check_mark: The tests passed successfully
- name: Failure comment
if: failure()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
diff --git a/.github/actions/create-or-update-comment
b/.github/actions/create-or-update-comment
deleted file mode 16
index cf8251698e3..000
--- a/.github/actions/create-or-update-comment
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cf8251698e3d53de4e69e4fd13cfd7abb2c230fd
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index 85310cca338..064f19c9f60 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -47,7 +47,7 @@ jobs:
with:
ref: ${{ env.pr_sha }}
submodules: recursive
- - uses: ./.github/actions/create-or-update-comment
+ - uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
issue-number: ${{ github.event.issue.number }}
body: |
diff --git a/.gitmodules b/.gitmodules
index 6d6303adbe3..61cda74e73e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule ".github/actions/backport"]
path = .github/actions/backport
url = https://github.com/tibdex/backport
-[submodule ".github/actions/create-or-update-comment"]
- path = .github/actions/create-or-update-comment
- url = https://github.com/peter-evans/create-or-update-comment.git
(camel) branch camel-4.4.x updated: chore(ci): Fix vulnerability by using directly referenced action (#14726)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new e13d8d24a95 chore(ci): Fix vulnerability by using directly referenced
action (#14726)
e13d8d24a95 is described below
commit e13d8d24a95c2ab898d9905e941fe44652757e55
Author: Nicolas Filotto
AuthorDate: Thu Jul 4 17:35:57 2024 +0200
chore(ci): Fix vulnerability by using directly referenced action (#14726)
---
.github/actions/component-test/action.yaml | 4 ++--
.github/actions/create-or-update-comment | 1 -
.github/workflows/pr-comment.yml | 2 +-
.gitmodules| 3 ---
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.github/actions/component-test/action.yaml
b/.github/actions/component-test/action.yaml
index 4c1b456d1d5..c0aab3b2fd0 100644
--- a/.github/actions/component-test/action.yaml
+++ b/.github/actions/component-test/action.yaml
@@ -65,7 +65,7 @@ runs:
path: tests.log
- name: Success comment
if: success()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
@@ -75,7 +75,7 @@ runs:
**Result** :white_check_mark: The tests passed successfully
- name: Failure comment
if: failure()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
diff --git a/.github/actions/create-or-update-comment
b/.github/actions/create-or-update-comment
deleted file mode 16
index cf8251698e3..000
--- a/.github/actions/create-or-update-comment
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cf8251698e3d53de4e69e4fd13cfd7abb2c230fd
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index a1fbb7e743f..7aee6fcb0a8 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -47,7 +47,7 @@ jobs:
with:
ref: ${{ env.pr_sha }}
submodules: recursive
- - uses: ./.github/actions/create-or-update-comment
+ - uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
issue-number: ${{ github.event.issue.number }}
body: |
diff --git a/.gitmodules b/.gitmodules
index 6d6303adbe3..61cda74e73e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule ".github/actions/backport"]
path = .github/actions/backport
url = https://github.com/tibdex/backport
-[submodule ".github/actions/create-or-update-comment"]
- path = .github/actions/create-or-update-comment
- url = https://github.com/peter-evans/create-or-update-comment.git
(camel) branch essobedo/fix-rce-in-comment-action-v2-4.0 created (now 91166e9e70a)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch essobedo/fix-rce-in-comment-action-v2-4.0 in repository https://gitbox.apache.org/repos/asf/camel.git at 91166e9e70a chore(ci): Fix vulnerability by using directly referenced action This branch includes the following new commits: new 91166e9e70a chore(ci): Fix vulnerability by using directly referenced action The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: chore(ci): Fix vulnerability by using directly referenced action
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch essobedo/fix-rce-in-comment-action-v2-4.0
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91166e9e70a330b55fcf2fe2d404f26370969dbc
Author: Nicolas Filotto
AuthorDate: Thu Jul 4 17:32:31 2024 +0200
chore(ci): Fix vulnerability by using directly referenced action
---
.github/actions/component-test/action.yaml | 4 ++--
.github/actions/create-or-update-comment | 1 -
.github/workflows/pr-comment.yml | 2 +-
.gitmodules| 3 ---
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.github/actions/component-test/action.yaml
b/.github/actions/component-test/action.yaml
index 7257029e2cf..0e2f4f7b3ba 100644
--- a/.github/actions/component-test/action.yaml
+++ b/.github/actions/component-test/action.yaml
@@ -65,7 +65,7 @@ runs:
path: tests.log
- name: Success comment
if: success()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
@@ -75,7 +75,7 @@ runs:
**Result** :white_check_mark: The tests passed successfully
- name: Failure comment
if: failure()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
diff --git a/.github/actions/create-or-update-comment
b/.github/actions/create-or-update-comment
deleted file mode 16
index cf8251698e3..000
--- a/.github/actions/create-or-update-comment
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cf8251698e3d53de4e69e4fd13cfd7abb2c230fd
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index 85310cca338..064f19c9f60 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -47,7 +47,7 @@ jobs:
with:
ref: ${{ env.pr_sha }}
submodules: recursive
- - uses: ./.github/actions/create-or-update-comment
+ - uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
issue-number: ${{ github.event.issue.number }}
body: |
diff --git a/.gitmodules b/.gitmodules
index 6d6303adbe3..61cda74e73e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule ".github/actions/backport"]
path = .github/actions/backport
url = https://github.com/tibdex/backport
-[submodule ".github/actions/create-or-update-comment"]
- path = .github/actions/create-or-update-comment
- url = https://github.com/peter-evans/create-or-update-comment.git
(camel) 01/01: chore(ci): Fix vulnerability by using directly referenced action
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch essobedo/fix-rce-in-comment-action-v2-4.4
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e5bd4740172e07d3038883145638aa880ee82d86
Author: Nicolas Filotto
AuthorDate: Thu Jul 4 17:28:04 2024 +0200
chore(ci): Fix vulnerability by using directly referenced action
---
.github/actions/component-test/action.yaml | 4 ++--
.github/actions/create-or-update-comment | 1 -
.github/workflows/pr-comment.yml | 2 +-
.gitmodules| 3 ---
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.github/actions/component-test/action.yaml
b/.github/actions/component-test/action.yaml
index 4c1b456d1d5..c0aab3b2fd0 100644
--- a/.github/actions/component-test/action.yaml
+++ b/.github/actions/component-test/action.yaml
@@ -65,7 +65,7 @@ runs:
path: tests.log
- name: Success comment
if: success()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
@@ -75,7 +75,7 @@ runs:
**Result** :white_check_mark: The tests passed successfully
- name: Failure comment
if: failure()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
diff --git a/.github/actions/create-or-update-comment
b/.github/actions/create-or-update-comment
deleted file mode 16
index cf8251698e3..000
--- a/.github/actions/create-or-update-comment
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cf8251698e3d53de4e69e4fd13cfd7abb2c230fd
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index a1fbb7e743f..7aee6fcb0a8 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -47,7 +47,7 @@ jobs:
with:
ref: ${{ env.pr_sha }}
submodules: recursive
- - uses: ./.github/actions/create-or-update-comment
+ - uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
issue-number: ${{ github.event.issue.number }}
body: |
diff --git a/.gitmodules b/.gitmodules
index 6d6303adbe3..61cda74e73e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule ".github/actions/backport"]
path = .github/actions/backport
url = https://github.com/tibdex/backport
-[submodule ".github/actions/create-or-update-comment"]
- path = .github/actions/create-or-update-comment
- url = https://github.com/peter-evans/create-or-update-comment.git
(camel) branch essobedo/fix-rce-in-comment-action-v2-4.4 created (now e5bd4740172)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch essobedo/fix-rce-in-comment-action-v2-4.4 in repository https://gitbox.apache.org/repos/asf/camel.git at e5bd4740172 chore(ci): Fix vulnerability by using directly referenced action This branch includes the following new commits: new e5bd4740172 chore(ci): Fix vulnerability by using directly referenced action The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch essobedo/fix-rce-in-comment-action-v2 deleted (was db55a092902)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch essobedo/fix-rce-in-comment-action-v2 in repository https://gitbox.apache.org/repos/asf/camel.git was db55a092902 chore(ci): Fix vulnerability by using directly referenced action 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) branch main updated: chore(ci): Fix vulnerability by using directly referenced action (#14725)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 196dd98c176 chore(ci): Fix vulnerability by using directly referenced
action (#14725)
196dd98c176 is described below
commit 196dd98c1769510046f9048786041189c0413c10
Author: Nicolas Filotto
AuthorDate: Thu Jul 4 16:48:42 2024 +0200
chore(ci): Fix vulnerability by using directly referenced action (#14725)
---
.github/actions/component-test/action.yaml | 4 ++--
.github/actions/create-or-update-comment | 1 -
.github/workflows/pr-comment.yml | 2 +-
.gitmodules| 3 ---
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.github/actions/component-test/action.yaml
b/.github/actions/component-test/action.yaml
index f172611a522..c1006e4a85a 100644
--- a/.github/actions/component-test/action.yaml
+++ b/.github/actions/component-test/action.yaml
@@ -69,7 +69,7 @@ runs:
path: tests.log
- name: Success comment
if: success()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
@@ -79,7 +79,7 @@ runs:
**Result** :white_check_mark: The tests passed successfully
- name: Failure comment
if: failure()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
diff --git a/.github/actions/create-or-update-comment
b/.github/actions/create-or-update-comment
deleted file mode 16
index 71345be0265..000
--- a/.github/actions/create-or-update-comment
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 71345be0265236311c031f5c7866368bd1eff043
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index ebf383dc106..cb178c43532 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -47,7 +47,7 @@ jobs:
with:
ref: ${{ env.pr_sha }}
submodules: recursive
- - uses: ./.github/actions/create-or-update-comment
+ - uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
issue-number: ${{ github.event.issue.number }}
body: |
diff --git a/.gitmodules b/.gitmodules
index e10cc9959c1..e69de29bb2d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule ".github/actions/create-or-update-comment"]
- path = .github/actions/create-or-update-comment
- url = https://github.com/peter-evans/create-or-update-comment.git
(camel) 01/01: chore(ci): Fix vulnerability by using directly referenced action
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch essobedo/fix-rce-in-comment-action-v2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db55a092902f26928d56f6d2fb99642c4d633bcb
Author: Nicolas Filotto
AuthorDate: Thu Jul 4 16:35:31 2024 +0200
chore(ci): Fix vulnerability by using directly referenced action
---
.github/actions/component-test/action.yaml | 4 ++--
.github/actions/create-or-update-comment | 1 -
.github/workflows/pr-comment.yml | 2 +-
.gitmodules| 3 ---
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.github/actions/component-test/action.yaml
b/.github/actions/component-test/action.yaml
index f172611a522..c1006e4a85a 100644
--- a/.github/actions/component-test/action.yaml
+++ b/.github/actions/component-test/action.yaml
@@ -69,7 +69,7 @@ runs:
path: tests.log
- name: Success comment
if: success()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
@@ -79,7 +79,7 @@ runs:
**Result** :white_check_mark: The tests passed successfully
- name: Failure comment
if: failure()
- uses: ./.github/actions/create-or-update-comment
+ uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
diff --git a/.github/actions/create-or-update-comment
b/.github/actions/create-or-update-comment
deleted file mode 16
index 71345be0265..000
--- a/.github/actions/create-or-update-comment
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 71345be0265236311c031f5c7866368bd1eff043
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index ebf383dc106..cb178c43532 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -47,7 +47,7 @@ jobs:
with:
ref: ${{ env.pr_sha }}
submodules: recursive
- - uses: ./.github/actions/create-or-update-comment
+ - uses:
peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
with:
issue-number: ${{ github.event.issue.number }}
body: |
diff --git a/.gitmodules b/.gitmodules
index e10cc9959c1..e69de29bb2d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule ".github/actions/create-or-update-comment"]
- path = .github/actions/create-or-update-comment
- url = https://github.com/peter-evans/create-or-update-comment.git
(camel) branch essobedo/fix-rce-in-comment-action-v2 created (now db55a092902)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch essobedo/fix-rce-in-comment-action-v2 in repository https://gitbox.apache.org/repos/asf/camel.git at db55a092902 chore(ci): Fix vulnerability by using directly referenced action This branch includes the following new commits: new db55a092902 chore(ci): Fix vulnerability by using directly referenced action The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-karaf) branch main updated: Ref #402: Add camel-aws2-iam-test (#403)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 4d86fc65 Ref #402: Add camel-aws2-iam-test (#403)
4d86fc65 is described below
commit 4d86fc65db6435539b864ab51ee5b9f64ad63c58
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Tue Jul 2 16:35:31 2024 +0200
Ref #402: Add camel-aws2-iam-test (#403)
---
features/src/main/feature/camel-features.xml | 2 +
tests/features/camel-aws2-iam/pom.xml | 46
.../camel/test/CamelAws2IamRouteSupplier.java | 67 +
.../karaf/camel/itest/CamelAws2IamITest.java | 84 ++
tests/features/pom.xml | 1 +
5 files changed, 200 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index e0b037ae..3ad1f8c1 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -471,6 +471,7 @@
camel-core
awssdk
wrap:mvn:software.amazon.awssdk/eks/${aws-java-sdk2-version}
+wrap:mvn:software.amazon.awssdk/aws-json-protocol/${aws-java-sdk2-version}
mvn:org.apache.camel.karaf/camel-aws2-eks/${project.version}
@@ -510,6 +511,7 @@
camel-core
awssdk
wrap:mvn:software.amazon.awssdk/mq/${aws-java-sdk2-version}
+wrap:mvn:software.amazon.awssdk/aws-json-protocol/${aws-java-sdk2-version}
mvn:org.apache.camel.karaf/camel-aws2-mq/${project.version}
diff --git a/tests/features/camel-aws2-iam/pom.xml
b/tests/features/camel-aws2-iam/pom.xml
new file mode 100644
index ..8dbf231f
--- /dev/null
+++ b/tests/features/camel-aws2-iam/pom.xml
@@ -0,0 +1,46 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-aws2-iam-test
+Apache Camel :: Karaf :: Tests :: Features :: AWS2 IAM
+
+
+
+org.apache.camel
+camel-aws2-iam
+${camel-version}
+
+
+org.testcontainers
+localstack
+${testcontainers-version}
+test
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-aws2-iam/src/main/java/org/apache/karaf/camel/test/CamelAws2IamRouteSupplier.java
b/tests/features/camel-aws2-iam/src/main/java/org/apache/karaf/camel/test/CamelAws2IamRouteSupplier.java
new file mode 100644
index ..c741c608
--- /dev/null
+++
b/tests/features/camel-aws2-iam/src/main/java/org/apache/karaf/camel/test/CamelAws2IamRouteSupplier.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.iam.IAM2Component;
+import org.apache.camel.component.aws2.iam.IAM2Configuration;
+import org.apache.camel.component.aws2.iam.IAM2Constants;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(name = "karaf-camel-aws2-iam-test", immediate = true, service =
CamelRouteSupplier.class)
+public class CamelAws2IamRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+private static final String REGION =
System.getProperty("localstack.iam.region");
+private static final String ACCESS_KEY =
System.getProperty("localstack.iam.accessKey"
(camel-karaf) branch remove-hard-coded-versions-in-poms deleted (was cf322fba)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch remove-hard-coded-versions-in-poms in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was cf322fba chores(pom): Remove hard coded versions 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: chore(pom): Remove hard coded versions (#401)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 1739e5c5 chore(pom): Remove hard coded versions (#401)
1739e5c5 is described below
commit 1739e5c5ba067817d5cdb5f96ec3d9e6de2bd4c1
Author: Nicolas Filotto
AuthorDate: Mon Jul 1 10:16:48 2024 +0200
chore(pom): Remove hard coded versions (#401)
---
components/camel-blueprint/pom.xml | 6 +++---
features/pom.xml | 4 ++--
pom.xml| 4
tests/features/camel-influxdb2/pom.xml | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index 8f8bb8e8..c37ff1c1 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -158,7 +158,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.3.1
+${maven-resources-plugin-version}
copy-generated-resources-jaxb
@@ -199,7 +199,7 @@
org.codehaus.mojo
jaxb2-maven-plugin
-3.2.0
+${maven-jaxb2-plugin-version}
generate-schema
@@ -306,7 +306,7 @@
org.apache.maven.plugins
maven-antrun-plugin
-3.1.0
+${maven-antrun-plugin-version}
true
diff --git a/features/pom.xml b/features/pom.xml
index 6a4bba14..fe8aadbd 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -58,7 +58,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.3.1
+${maven-resources-plugin-version}
@@ -116,7 +116,7 @@
org.codehaus.mojo
build-helper-maven-plugin
-3.6.0
+${maven-build-helper-plugin-version}
attach-artifact
diff --git a/pom.xml b/pom.xml
index b8591dc7..18ba0836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -562,10 +562,14 @@
3.1.6
+3.1.0
+
3.6.0
5.1.9
3.13.0
3.7.1
3.4.2
+3.2.0
+3.3.1
3.6.0
diff --git a/tests/features/camel-influxdb2/pom.xml
b/tests/features/camel-influxdb2/pom.xml
index 22a789fe..b9a222db 100644
--- a/tests/features/camel-influxdb2/pom.xml
+++ b/tests/features/camel-influxdb2/pom.xml
@@ -40,7 +40,7 @@
com.influxdb
influxdb-client-java
-7.0.0
+${influx-client-java-driver-version}
compile
(camel-karaf) branch dependabot/maven/testcontainers-version-1.19.8 deleted (was 93ff4224)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/testcontainers-version-1.19.8 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 93ff4224 Bump testcontainers-version from 1.19.7 to 1.19.8 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/junit-jupiter-version-5.10.3 deleted (was 64fff7f4)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/junit-jupiter-version-5.10.3 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 64fff7f4 Bump junit-jupiter-version from 5.10.2 to 5.10.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 dependabot/maven/com.influxdb-influxdb-client-java-7.1.0 deleted (was 4666bfc5)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/com.influxdb-influxdb-client-java-7.1.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 4666bfc5 Bump com.influxdb:influxdb-client-java from 7.0.0 to 7.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 remove-hard-coded-versions-in-poms created (now cf322fba)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch remove-hard-coded-versions-in-poms in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at cf322fba chores(pom): Remove hard coded versions This branch includes the following new commits: new cf322fba chores(pom): Remove hard coded versions The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-karaf) 01/01: chores(pom): Remove hard coded versions
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch remove-hard-coded-versions-in-poms
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit cf322fbac48985035926465acc81ebc4a899182a
Author: Nicolas Filotto
AuthorDate: Mon Jul 1 09:50:20 2024 +0200
chores(pom): Remove hard coded versions
---
components/camel-blueprint/pom.xml | 6 +++---
features/pom.xml | 4 ++--
pom.xml| 4
tests/features/camel-influxdb2/pom.xml | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index 8f8bb8e8..c37ff1c1 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -158,7 +158,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.3.1
+${maven-resources-plugin-version}
copy-generated-resources-jaxb
@@ -199,7 +199,7 @@
org.codehaus.mojo
jaxb2-maven-plugin
-3.2.0
+${maven-jaxb2-plugin-version}
generate-schema
@@ -306,7 +306,7 @@
org.apache.maven.plugins
maven-antrun-plugin
-3.1.0
+${maven-antrun-plugin-version}
true
diff --git a/features/pom.xml b/features/pom.xml
index 6a4bba14..fe8aadbd 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -58,7 +58,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.3.1
+${maven-resources-plugin-version}
@@ -116,7 +116,7 @@
org.codehaus.mojo
build-helper-maven-plugin
-3.6.0
+${maven-build-helper-plugin-version}
attach-artifact
diff --git a/pom.xml b/pom.xml
index b8591dc7..18ba0836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -562,10 +562,14 @@
3.1.6
+3.1.0
+
3.6.0
5.1.9
3.13.0
3.7.1
3.4.2
+3.2.0
+3.3.1
3.6.0
diff --git a/tests/features/camel-influxdb2/pom.xml
b/tests/features/camel-influxdb2/pom.xml
index 22a789fe..b9a222db 100644
--- a/tests/features/camel-influxdb2/pom.xml
+++ b/tests/features/camel-influxdb2/pom.xml
@@ -40,7 +40,7 @@
com.influxdb
influxdb-client-java
-7.0.0
+${influx-client-java-driver-version}
compile
(camel-karaf) branch main updated: Ref #380: camel-influxdb2 integration tests added (#390)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 5f2d9bb0 Ref #380: camel-influxdb2 integration tests added (#390)
5f2d9bb0 is described below
commit 5f2d9bb02ab5a94e8188aa37b25b6b6b778801cf
Author: ÖZGÜR KISIR <157804972+ozgurkisir-q...@users.noreply.github.com>
AuthorDate: Fri Jun 28 15:07:41 2024 +0300
Ref #380: camel-influxdb2 integration tests added (#390)
---
tests/features/camel-influxdb2/pom.xml | 47 +
.../camel/test/CamelInfluxdb2RouteSupplier.java| 78 ++
.../karaf/camel/itest/CamelInfluxdb2ITest.java | 72
tests/features/pom.xml | 1 +
4 files changed, 198 insertions(+)
diff --git a/tests/features/camel-influxdb2/pom.xml
b/tests/features/camel-influxdb2/pom.xml
new file mode 100644
index ..22a789fe
--- /dev/null
+++ b/tests/features/camel-influxdb2/pom.xml
@@ -0,0 +1,47 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-influxdb2-test
+Apache Camel :: Karaf :: Tests :: Features :: Influxdb2
+
+
+
+org.testcontainers
+influxdb
+${testcontainers-version}
+test
+
+
+com.influxdb
+influxdb-client-java
+7.0.0
+compile
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-influxdb2/src/main/java/org/apache/karaf/camel/test/CamelInfluxdb2RouteSupplier.java
b/tests/features/camel-influxdb2/src/main/java/org/apache/karaf/camel/test/CamelInfluxdb2RouteSupplier.java
new file mode 100644
index ..974f9a48
--- /dev/null
+++
b/tests/features/camel-influxdb2/src/main/java/org/apache/karaf/camel/test/CamelInfluxdb2RouteSupplier.java
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+
+import com.influxdb.client.InfluxDBClient;
+import com.influxdb.client.InfluxDBClientFactory;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.apache.camel.builder.Builder.constant;
+
+@Component(name = "karaf-camel-influxdb2-test", immediate = true, service =
CamelRouteSupplier.class)
+public class CamelInfluxdb2RouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+private static final String ORG = System.getProperty("influxdb2.org");
+private static final String BUCKET =
System.getProperty("influxdb2.bucket");
+
+@Override
+public void configure(CamelContext camelContext) {
+final int influxdb2Port =
Integer.parseInt(System.getProperty("influxdb2.port"));
+InfluxDBClient myInfluxDBClient =
InfluxDBClientFactory.create("http://localhost:%s".formatted(influxdb2Port),
+System.getProperty("influxdb2.admin.token").toCharArray(),
ORG, BUCKET);
+
+camelContext.getRegistry().bind("myDbClient", myInfluxDBClient);
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+producerRoute
+.log("calling influxdb2")
+
.toF("influxdb2:myDbClient?operation=ping=%s=%s=true",
ORG, BUCKET)
+.setBody(builder.constant("OK_PING"))
+
(camel-karaf) branch main updated: Ref #396: Added camel-aws2-sts integration test (#397)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 9e349b1d Ref #396: Added camel-aws2-sts integration test (#397)
9e349b1d is described below
commit 9e349b1d581bbb9910678e2d2ca81e29db4b2d45
Author: lopushen
AuthorDate: Fri Jun 28 11:42:12 2024 +0300
Ref #396: Added camel-aws2-sts integration test (#397)
---
tests/features/camel-aws2-sts/pom.xml | 46 +
.../camel/test/CamelAws2StsRouteSupplier.java | 64 ++
.../karaf/camel/itest/CamelAws2StsITest.java | 78 ++
tests/features/pom.xml | 1 +
4 files changed, 189 insertions(+)
diff --git a/tests/features/camel-aws2-sts/pom.xml
b/tests/features/camel-aws2-sts/pom.xml
new file mode 100644
index ..6105d973
--- /dev/null
+++ b/tests/features/camel-aws2-sts/pom.xml
@@ -0,0 +1,46 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-aws2-sts-test
+Apache Camel :: Karaf :: Tests :: Features :: AWS2 STS
+
+
+
+org.apache.camel
+camel-aws2-sts
+${camel-version}
+
+
+org.testcontainers
+localstack
+${testcontainers-version}
+test
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-aws2-sts/src/main/java/org/apache/karaf/camel/test/CamelAws2StsRouteSupplier.java
b/tests/features/camel-aws2-sts/src/main/java/org/apache/karaf/camel/test/CamelAws2StsRouteSupplier.java
new file mode 100644
index ..341cbeb0
--- /dev/null
+++
b/tests/features/camel-aws2-sts/src/main/java/org/apache/karaf/camel/test/CamelAws2StsRouteSupplier.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.sts.STS2Component;
+import org.apache.camel.component.aws2.sts.STS2Configuration;
+import org.apache.camel.component.aws2.sts.STS2Constants;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(name = "karaf-camel-aws2-sts-test", immediate = true, service =
CamelRouteSupplier.class)
+public class CamelAws2StsRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+private static final String HOST =
System.getProperty("localstack.sts.host");
+private static final String PORT =
System.getProperty("localstack.sts.port");
+private static final String REGION =
System.getProperty("localstack.sts.region");
+private static final String ACCESS_KEY =
System.getProperty("localstack.sts.accessKey");
+private static final String SECRET_KEY =
System.getProperty("localstack.sts.secretKey");
+private static final String COMPONENT_NAME = "aws2-sts";
+
+@Override
+public void configure(CamelContext camelContext) {
+final STS2Component aws2StsComponent = new STS2Component();
+final STS2Configuration configuration = new STS2Configuration();
+configuration.setAccessKey(ACCESS_KEY);
+configuration.setSecretKey(SECRET_KEY);
+configuration.setRegion(REGION);
+configuration.setOverrideEndpoint(true);
+configuration.setUriEndpointOverride(String.format("http://%s:%s;,
HOST, PORT));
+aws2StsComponent.setConfiguration(configuration);
+camelContext.addComponent(COMPONENT
(camel-karaf) branch main updated: Added missing bundle and integration test for camel-aws2-s3 (#392)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 ec1c4971 Added missing bundle and integration test for camel-aws2-s3
(#392)
ec1c4971 is described below
commit ec1c49714c4bb52f9c91c285f1443003cdee625e
Author: lopushen
AuthorDate: Thu Jun 27 10:21:58 2024 +0300
Added missing bundle and integration test for camel-aws2-s3 (#392)
---
features/src/main/feature/camel-features.xml | 1 +
tests/features/camel-aws2-s3/pom.xml | 46 +
.../karaf/camel/test/CamelAws2S3RouteSupplier.java | 66 ++
.../apache/karaf/camel/itest/CamelAws2S3ITest.java | 78 ++
tests/features/pom.xml | 1 +
5 files changed, 192 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 24672337..e0b037ae 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -528,6 +528,7 @@
camel-cloudevents
awssdk
wrap:mvn:software.amazon.awssdk/s3/${aws-java-sdk2-version}
+wrap:mvn:software.amazon.awssdk/aws-xml-protocol/${aws-java-sdk2-version}
mvn:org.apache.camel.karaf/camel-aws2-s3/${project.version}
diff --git a/tests/features/camel-aws2-s3/pom.xml
b/tests/features/camel-aws2-s3/pom.xml
new file mode 100644
index ..79c054bf
--- /dev/null
+++ b/tests/features/camel-aws2-s3/pom.xml
@@ -0,0 +1,46 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-aws2-s3-test
+Apache Camel :: Karaf :: Tests :: Features :: AWS2 S3
+
+
+
+org.apache.camel
+camel-aws2-s3
+${camel-version}
+
+
+org.testcontainers
+localstack
+${testcontainers-version}
+test
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-aws2-s3/src/main/java/org/apache/karaf/camel/test/CamelAws2S3RouteSupplier.java
b/tests/features/camel-aws2-s3/src/main/java/org/apache/karaf/camel/test/CamelAws2S3RouteSupplier.java
new file mode 100644
index ..1ac57567
--- /dev/null
+++
b/tests/features/camel-aws2-s3/src/main/java/org/apache/karaf/camel/test/CamelAws2S3RouteSupplier.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.s3.AWS2S3Component;
+import org.apache.camel.component.aws2.s3.AWS2S3Configuration;
+import org.apache.camel.component.aws2.s3.AWS2S3Constants;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(name = "karaf-camel-aws2-s3-test", immediate = true, service =
CamelRouteSupplier.class)
+public class CamelAws2S3RouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+private static final String HOST =
System.getProperty("localstack.s3.host");
+private static final String PORT =
System.getProperty("localstack.s3.port");
+private static final String REGION =
System.getProperty("localstack.s3.region");
+private static final String ACCESS_KEY =
System.getProperty("localstack.s3.accessKey");
+private static final String SECRET_KEY =
System.getProperty("localstack.s3.secretKey");
+private static final String COMPONENT_NAM
(camel-karaf) branch dependabot/maven/log4j2-version-2.23.1 deleted (was da9ac2d4)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/log4j2-version-2.23.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was da9ac2d4 Bump log4j2-version from 2.21.1 to 2.23.1 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/testcontainers-version-1.19.8 deleted (was 08279127)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/testcontainers-version-1.19.8 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 08279127 Bump testcontainers-version from 1.19.7 to 1.19.8 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/spring-amqp-version-3.1.6 deleted (was 20062c97)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/spring-amqp-version-3.1.6 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 20062c97 Bump spring-amqp-version from 3.1.5 to 3.1.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: Bump spring-amqp-version from 3.1.5 to 3.1.6 (#383)
This is an automated email from the ASF dual-hosted git repository. nfilotto 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 1fa2f77f Bump spring-amqp-version from 3.1.5 to 3.1.6 (#383) 1fa2f77f is described below commit 1fa2f77f79378d4eabf9f1fb3d1678d6c5b4f811 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 10:00:45 2024 +0200 Bump spring-amqp-version from 3.1.5 to 3.1.6 (#383) Bumps `spring-amqp-version` from 3.1.5 to 3.1.6. Updates `org.springframework.amqp:spring-rabbit` from 3.1.5 to 3.1.6 - [Release notes](https://github.com/spring-projects/spring-amqp/releases) - [Commits](https://github.com/spring-projects/spring-amqp/compare/v3.1.5...v3.1.6) Updates `org.springframework.amqp:spring-amqp` from 3.1.5 to 3.1.6 - [Release notes](https://github.com/spring-projects/spring-amqp/releases) - [Commits](https://github.com/spring-projects/spring-amqp/compare/v3.1.5...v3.1.6) --- updated-dependencies: - dependency-name: org.springframework.amqp:spring-rabbit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.amqp:spring-amqp 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 720403a0..3fca3299 100644 --- a/pom.xml +++ b/pom.xml @@ -559,7 +559,7 @@ 8.0.0 10 2.0.13 -3.1.5 +3.1.6 5.1.9
(camel-karaf) branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.10.0.202406032230-r deleted (was 8d1879ab)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.10.0.202406032230-r in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 8d1879ab Bump org.eclipse.jgit:org.eclipse.jgit 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 361/fix-bugs deleted (was ca6f6027)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/fix-bugs in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was ca6f6027 Ref #361: Ignore folders without pom and retrieve from original path 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 #361: Ignore folders without pom and retrieve from original path (#382)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 14c8fa5c Ref #361: Ignore folders without pom and retrieve from
original path (#382)
14c8fa5c is described below
commit 14c8fa5ca1e958f57b509dc0eaddf91229ba4a45
Author: Nicolas Filotto
AuthorDate: Fri Jun 21 21:56:37 2024 +0200
Ref #361: Ignore folders without pom and retrieve from original path (#382)
## Motivation
While upgrading to Camel 4.6, I noticed that empty folders were taken into
account when comparing the folders and the name of the component was not
properly extracted in multi-module mode.
## Modifications:
* Skip folders that don't contain any pom file for the comparison
* Use the original path to extract the name of the component
---
.../karaf/tooling/upgrade/ComponentComparator.java | 52 --
.../tooling/upgrade/MultiModuleWrapperHandler.java | 12 ++--
.../upgrade/SingleModuleWrapperHandler.java| 39 ++-
.../camel/karaf/tooling/upgrade/UpgradeCamel.java | 16 ++---
.../karaf/tooling/upgrade/WrapperHandler.java | 31 +
.../tooling/upgrade/ComponentComparatorTest.java | 22 +-
.../upgrade/MultiModuleWrapperHandlerTest.java | 12 ++--
.../upgrade/SingleModuleWrapperHandlerTest.java| 14 +++-
.../camel-both-multiple-a/{.gitkeep => pom.xml}| 0
.../camel-both-multiple-b/{.gitkeep => pom.xml}| 0
.../{src => camel-karaf-ignore}/.gitkeep | 0
.../.gitkeep => camel-both-multiple/pom.xml} | 0
.../.gitkeep => camel-both-multiple/src/pom.xml} | 0
.../.gitkeep => camel-both-single/pom.xml} | 0
.../.gitkeep | 0
.../camel-karaf-multiple-a/pom.xml}| 0
.../camel-karaf-multiple-b/pom.xml}| 0
.../camel-karaf-multiple-only/pom.xml} | 0
.../camel-karaf-multiple/pom.xml} | 0
.../camel-karaf-only/pom.xml} | 0
.../camel-multiple/camel-multiple-a/pom.xml} | 0
.../camel-multiple/camel-multiple-b/pom.xml} | 0
.../camel-multiple/pom.xml}| 0
.../camel-both-multiple-a/pom.xml} | 0
.../camel-both-multiple-b/pom.xml} | 0
.../camel-ignore}/.gitkeep | 0
.../.gitkeep => camel-both-multiple/pom.xml} | 0
.../.gitkeep => camel-both-single/pom.xml} | 0
.../camel-complex-multiple-a/pom.xml} | 0
.../camel-complex-multiple-api/pom.xml}| 0
.../camel-complex-multiple-b/pom.xml} | 0
.../camel-complex-multiple-codegen/pom.xml}| 0
.../camel-complex-multiple-component/pom.xml} | 0
.../camel-complex-multiple-maven-plugin/pom.xml} | 0
.../camel-complex-multiple-spi/pom.xml}| 0
.../.gitkeep => camel-complex-multiple/pom.xml}| 0
.../camel-complex-single-api/pom.xml} | 0
.../camel-complex-single-codegen/pom.xml} | 0
.../camel-complex-single-component/pom.xml}| 0
.../camel-complex-single-maven-plugin/pom.xml} | 0
.../camel-complex-single-spi/pom.xml} | 0
.../camel-complex-single/pom.xml} | 0
.../camel-ignore}/.gitkeep | 0
.../camel-karaf-multiple-a/pom.xml}| 0
.../camel-karaf-multiple-b/pom.xml}| 0
.../camel-karaf-multiple/pom.xml} | 0
.../camel-multiple/camel-multiple-a/pom.xml} | 0
.../camel-multiple/camel-multiple-b/pom.xml} | 0
.../camel-multiple/camel-multiple-only/pom.xml}| 0
.../.gitkeep => camel/camel-multiple/pom.xml} | 0
.../.gitkeep => camel/camel-only/pom.xml} | 0
.../.gitkeep => camel/src/pom.xml} | 0
.../camel-karaf/b2-pom-expected.xml| 81 ++
.../camel/camel-f/pom.xml} | 41 ++-
.../camel-karaf/f-pom-expected.xml | 81 ++
.../camel-karaf/pom-expected.xml | 1 +
.../camel-a/camel-f/pom.xml} | 41 ++-
57 files changed, 334 insertions(+), 109 deletions(-)
diff --git
a/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
b/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
index d83a4a05..a5860f4d 100644
---
a/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
+++
b/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
@@ -21,9 +21,13 @@ import java.io.File;
import java.io.IOException;
import java.nio.fi
(camel-karaf) 01/01: Ref #361: Ignore folders without pom and retrieve from original path
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch 361/fix-bugs
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit ca6f60274ae803da6dd165da9f53ebb00684a8df
Author: Nicolas Filotto
AuthorDate: Fri Jun 21 20:49:52 2024 +0200
Ref #361: Ignore folders without pom and retrieve from original path
---
.../karaf/tooling/upgrade/ComponentComparator.java | 52 --
.../tooling/upgrade/MultiModuleWrapperHandler.java | 12 ++--
.../upgrade/SingleModuleWrapperHandler.java| 39 ++-
.../camel/karaf/tooling/upgrade/UpgradeCamel.java | 16 ++---
.../karaf/tooling/upgrade/WrapperHandler.java | 31 +
.../tooling/upgrade/ComponentComparatorTest.java | 22 +-
.../upgrade/MultiModuleWrapperHandlerTest.java | 12 ++--
.../upgrade/SingleModuleWrapperHandlerTest.java| 14 +++-
.../camel-both-multiple-a/{.gitkeep => pom.xml}| 0
.../camel-both-multiple-b/{.gitkeep => pom.xml}| 0
.../{src => camel-karaf-ignore}/.gitkeep | 0
.../.gitkeep => camel-both-multiple/pom.xml} | 0
.../.gitkeep => camel-both-multiple/src/pom.xml} | 0
.../.gitkeep => camel-both-single/pom.xml} | 0
.../.gitkeep | 0
.../camel-karaf-multiple-a/pom.xml}| 0
.../camel-karaf-multiple-b/pom.xml}| 0
.../camel-karaf-multiple-only/pom.xml} | 0
.../camel-karaf-multiple/pom.xml} | 0
.../camel-karaf-only/pom.xml} | 0
.../camel-multiple/camel-multiple-a/pom.xml} | 0
.../camel-multiple/camel-multiple-b/pom.xml} | 0
.../camel-multiple/pom.xml}| 0
.../camel-both-multiple-a/pom.xml} | 0
.../camel-both-multiple-b/pom.xml} | 0
.../camel-ignore}/.gitkeep | 0
.../.gitkeep => camel-both-multiple/pom.xml} | 0
.../.gitkeep => camel-both-single/pom.xml} | 0
.../camel-complex-multiple-a/pom.xml} | 0
.../camel-complex-multiple-api/pom.xml}| 0
.../camel-complex-multiple-b/pom.xml} | 0
.../camel-complex-multiple-codegen/pom.xml}| 0
.../camel-complex-multiple-component/pom.xml} | 0
.../camel-complex-multiple-maven-plugin/pom.xml} | 0
.../camel-complex-multiple-spi/pom.xml}| 0
.../.gitkeep => camel-complex-multiple/pom.xml}| 0
.../camel-complex-single-api/pom.xml} | 0
.../camel-complex-single-codegen/pom.xml} | 0
.../camel-complex-single-component/pom.xml}| 0
.../camel-complex-single-maven-plugin/pom.xml} | 0
.../camel-complex-single-spi/pom.xml} | 0
.../camel-complex-single/pom.xml} | 0
.../camel-ignore}/.gitkeep | 0
.../camel-karaf-multiple-a/pom.xml}| 0
.../camel-karaf-multiple-b/pom.xml}| 0
.../camel-karaf-multiple/pom.xml} | 0
.../camel-multiple/camel-multiple-a/pom.xml} | 0
.../camel-multiple/camel-multiple-b/pom.xml} | 0
.../camel-multiple/camel-multiple-only/pom.xml}| 0
.../.gitkeep => camel/camel-multiple/pom.xml} | 0
.../.gitkeep => camel/camel-only/pom.xml} | 0
.../.gitkeep => camel/src/pom.xml} | 0
.../camel-karaf/b2-pom-expected.xml| 81 ++
.../camel/camel-f/pom.xml} | 41 ++-
.../camel-karaf/f-pom-expected.xml | 81 ++
.../camel-karaf/pom-expected.xml | 1 +
.../camel-a/camel-f/pom.xml} | 41 ++-
57 files changed, 334 insertions(+), 109 deletions(-)
diff --git
a/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
b/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
index d83a4a05..a5860f4d 100644
---
a/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
+++
b/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
@@ -21,9 +21,13 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
public abstract class ComponentComparator {
@@ -37,7 +41,7 @@ public abstract class ComponentComparator {
}
private static boolean isCamelComponentDirectory(File file) {
-return file.isDirectory() && file.getName().startsWith("camel-");
+return file.isDirectory() && f
(camel-karaf) branch 361/fix-bugs updated (0189466e -> ca6f6027)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch 361/fix-bugs
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
discard 0189466e Ref #361: Ignore folders without pom and retrieve from
original path
add fb9b8bee Ref #375: Add missing components of Camel 4.6 (#381)
new ca6f6027 Ref #361: Ignore folders without pom and retrieve from
original path
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0189466e)
\
N -- N -- N refs/heads/361/fix-bugs (ca6f6027)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/{ => camel-ai}/camel-chatscript/pom.xml | 5 +-
components/{ => camel-ai}/camel-djl/pom.xml| 5 +-
.../camel-langchain4j-chat}/pom.xml| 11 +-
.../camel-langchain4j-embeddings}/pom.xml | 11 +-
components/{camel-vertx => camel-ai}/pom.xml | 13 +-
.../camel-avro-rpc-jetty}/pom.xml | 11 +-
.../camel-avro-rpc}/pom.xml| 15 +-
.../camel-avro-rpc/pom.xml | 9 +-
.../{camel-aws2-cw => camel-aws-bedrock}/pom.xml | 9 +-
components/camel-aws/pom.xml | 1 +
components/{camel-atom => camel-beanio}/pom.xml| 9 +-
.../camel-debezium-common}/pom.xml | 11 +-
.../camel-debezium-db2}/pom.xml| 11 +-
.../camel-debezium-mongodb}/pom.xml| 11 +-
.../camel-debezium-mysql}/pom.xml | 11 +-
.../camel-debezium-oracle}/pom.xml | 11 +-
.../camel-debezium-postgres}/pom.xml | 11 +-
.../camel-debezium-sqlserver}/pom.xml | 11 +-
components/{camel-vertx => camel-debezium}/pom.xml | 16 +-
components/{camel-box => camel-dhis2}/pom.xml | 13 +-
components/{camel-box => camel-fhir}/pom.xml | 13 +-
.../pom.xml| 9 +-
components/camel-google/pom.xml| 1 +
.../camel-huaweicloud-common}/pom.xml | 11 +-
.../camel-huaweicloud-dms}/pom.xml | 11 +-
.../camel-huaweicloud-frs}/pom.xml | 11 +-
.../camel-huaweicloud-functiongraph}/pom.xml | 11 +-
.../camel-huaweicloud-iam}/pom.xml | 11 +-
.../camel-huaweicloud-imagerecognition}/pom.xml| 11 +-
.../camel-huaweicloud-obs}/pom.xml | 11 +-
.../camel-huaweicloud-smn}/pom.xml | 11 +-
components/{camel-vertx => camel-huawei}/pom.xml | 17 +-
.../camel-infinispan-common}/pom.xml | 11 +-
.../camel-infinispan-embedded}/pom.xml | 11 +-
.../camel-infinispan}/pom.xml | 12 +-
.../{camel-vertx => camel-infinispan}/pom.xml | 12 +-
.../camel-knative-http}/pom.xml| 11 +-
.../camel-knative}/pom.xml | 15 +-
.../camel-knative/pom.xml | 9 +-
.../camel-microprofile-config}/pom.xml | 11 +-
.../camel-microprofile-fault-tolerance}/pom.xml| 11 +-
.../camel-microprofile-health}/pom.xml | 11 +-
.../{camel-vertx => camel-microprofile}/pom.xml| 12 +-
components/{camel-atom => camel-milvus}/pom.xml| 9 +-
components/{camel-atom => camel-pinecone}/pom.xml | 9 +-
.../pom.xml| 9 +-
components/{camel-atom => camel-qdrant}/pom.xml| 9 +-
components/{camel-csv => camel-wasm}/pom.xml | 9 +-
components/pom.xml | 17 +-
features/src/main/feature/camel-features.xml | 333 +++--
pom.xml| 41 +--
51 files changed, 569 insertions(+), 326 deletions(-)
rename components/{ => camel-ai}/camel-chatscript/pom.xml (95%)
rename components/{ => camel-ai}/camel-djl/pom.xml (95%)
copy components/{camel-asterisk => camel-ai/camel-langchain4j-chat}/pom.xml
(91%)
copy components/{camel-braintree =>
camel-ai/camel-langchain4j-embeddings}/pom.xml (90%)
copy components/{camel-vertx =&
(camel-karaf) 01/01: Ref #361: Ignore folders without pom and retrieve from original path
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch 361/fix-bugs
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 0189466e662eaabf2e1fec2272314700adafc464
Author: Nicolas Filotto
AuthorDate: Fri Jun 21 20:49:52 2024 +0200
Ref #361: Ignore folders without pom and retrieve from original path
---
.../karaf/tooling/upgrade/ComponentComparator.java | 52 --
.../tooling/upgrade/MultiModuleWrapperHandler.java | 12 ++--
.../upgrade/SingleModuleWrapperHandler.java| 39 ++-
.../camel/karaf/tooling/upgrade/UpgradeCamel.java | 16 ++---
.../karaf/tooling/upgrade/WrapperHandler.java | 31 +
.../tooling/upgrade/ComponentComparatorTest.java | 22 +-
.../upgrade/MultiModuleWrapperHandlerTest.java | 12 ++--
.../upgrade/SingleModuleWrapperHandlerTest.java| 14 +++-
.../camel-both-multiple-a/{.gitkeep => pom.xml}| 0
.../camel-both-multiple-b/{.gitkeep => pom.xml}| 0
.../{src => camel-karaf-ignore}/.gitkeep | 0
.../.gitkeep => camel-both-multiple/pom.xml} | 0
.../.gitkeep => camel-both-multiple/src/pom.xml} | 0
.../.gitkeep => camel-both-single/pom.xml} | 0
.../.gitkeep | 0
.../camel-karaf-multiple-a/pom.xml}| 0
.../camel-karaf-multiple-b/pom.xml}| 0
.../camel-karaf-multiple-only/pom.xml} | 0
.../camel-karaf-multiple/pom.xml} | 0
.../camel-karaf-only/pom.xml} | 0
.../camel-multiple/camel-multiple-a/pom.xml} | 0
.../camel-multiple/camel-multiple-b/pom.xml} | 0
.../camel-multiple/pom.xml}| 0
.../camel-both-multiple-a/pom.xml} | 0
.../camel-both-multiple-b/pom.xml} | 0
.../camel-ignore}/.gitkeep | 0
.../.gitkeep => camel-both-multiple/pom.xml} | 0
.../.gitkeep => camel-both-single/pom.xml} | 0
.../camel-complex-multiple-a/pom.xml} | 0
.../camel-complex-multiple-api/pom.xml}| 0
.../camel-complex-multiple-b/pom.xml} | 0
.../camel-complex-multiple-codegen/pom.xml}| 0
.../camel-complex-multiple-component/pom.xml} | 0
.../camel-complex-multiple-maven-plugin/pom.xml} | 0
.../camel-complex-multiple-spi/pom.xml}| 0
.../.gitkeep => camel-complex-multiple/pom.xml}| 0
.../camel-complex-single-api/pom.xml} | 0
.../camel-complex-single-codegen/pom.xml} | 0
.../camel-complex-single-component/pom.xml}| 0
.../camel-complex-single-maven-plugin/pom.xml} | 0
.../camel-complex-single-spi/pom.xml} | 0
.../camel-complex-single/pom.xml} | 0
.../camel-ignore}/.gitkeep | 0
.../camel-karaf-multiple-a/pom.xml}| 0
.../camel-karaf-multiple-b/pom.xml}| 0
.../camel-karaf-multiple/pom.xml} | 0
.../camel-multiple/camel-multiple-a/pom.xml} | 0
.../camel-multiple/camel-multiple-b/pom.xml} | 0
.../camel-multiple/camel-multiple-only/pom.xml}| 0
.../.gitkeep => camel/camel-multiple/pom.xml} | 0
.../.gitkeep => camel/camel-only/pom.xml} | 0
.../.gitkeep => camel/src/pom.xml} | 0
.../camel-karaf/b2-pom-expected.xml| 81 ++
.../camel/camel-f/pom.xml} | 41 ++-
.../camel-karaf/f-pom-expected.xml | 81 ++
.../camel-karaf/pom-expected.xml | 1 +
.../camel-a/camel-f/pom.xml} | 41 ++-
57 files changed, 334 insertions(+), 109 deletions(-)
diff --git
a/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
b/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
index d83a4a05..a5860f4d 100644
---
a/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
+++
b/tooling/camel-upgrade/src/main/java/org/apache/camel/karaf/tooling/upgrade/ComponentComparator.java
@@ -21,9 +21,13 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
public abstract class ComponentComparator {
@@ -37,7 +41,7 @@ public abstract class ComponentComparator {
}
private static boolean isCamelComponentDirectory(File file) {
-return file.isDirectory() && file.getName().startsWith("camel-");
+return file.isDirectory() && f
(camel-karaf) branch 361/fix-bugs created (now 0189466e)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/fix-bugs in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at 0189466e Ref #361: Ignore folders without pom and retrieve from original path This branch includes the following new commits: new 0189466e Ref #361: Ignore folders without pom and retrieve from original path The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-karaf) branch 375/add-missing-components deleted (was 69b5b803)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 375/add-missing-components in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 69b5b803 Ref #375: Add missing components of Camel 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: Ref #375: Add missing components of Camel 4.6 (#381)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 fb9b8bee Ref #375: Add missing components of Camel 4.6 (#381)
fb9b8bee is described below
commit fb9b8bee4e97eda3a453aafb672ff8e313dad421
Author: Nicolas Filotto
AuthorDate: Fri Jun 21 19:15:06 2024 +0200
Ref #375: Add missing components of Camel 4.6 (#381)
## Motivation
After the migration to Camel 4.6, it appears that some components were
missing, so we need to add them
## Modifications:
* Move the AI components into the `camel-ai` module
* Add the wrapper of the missing components
* Add the feature of the missing components
---
components/{ => camel-ai}/camel-chatscript/pom.xml | 5 +-
components/{ => camel-ai}/camel-djl/pom.xml| 5 +-
.../camel-langchain4j-chat}/pom.xml| 11 +-
.../camel-langchain4j-embeddings}/pom.xml | 11 +-
components/{camel-google => camel-ai}/pom.xml | 18 +-
.../camel-avro-rpc-jetty}/pom.xml | 11 +-
.../camel-avro-rpc}/pom.xml| 23 +-
.../{camel-google => camel-avro-rpc}/pom.xml | 16 +-
.../camel-aws-bedrock}/pom.xml | 11 +-
components/camel-aws/pom.xml | 1 +
components/{camel-djl => camel-beanio}/pom.xml | 9 +-
.../camel-debezium-common}/pom.xml | 11 +-
.../camel-debezium-db2}/pom.xml| 11 +-
.../camel-debezium-mongodb}/pom.xml| 11 +-
.../camel-debezium-mysql}/pom.xml | 11 +-
.../camel-debezium-oracle}/pom.xml | 11 +-
.../camel-debezium-postgres}/pom.xml | 11 +-
.../camel-debezium-sqlserver}/pom.xml | 11 +-
.../{camel-google => camel-debezium}/pom.xml | 21 +-
.../{camel-chatscript => camel-dhis2}/pom.xml | 21 +-
.../{camel-chatscript => camel-fhir}/pom.xml | 21 +-
.../camel-google-pubsub-lite}/pom.xml | 15 +-
components/camel-google/pom.xml| 1 +
.../camel-huaweicloud-common}/pom.xml | 11 +-
.../camel-huaweicloud-dms}/pom.xml | 11 +-
.../camel-huaweicloud-frs}/pom.xml | 11 +-
.../camel-huaweicloud-functiongraph}/pom.xml | 11 +-
.../camel-huaweicloud-iam}/pom.xml | 11 +-
.../camel-huaweicloud-imagerecognition}/pom.xml| 11 +-
.../camel-huaweicloud-obs}/pom.xml | 11 +-
.../camel-huaweicloud-smn}/pom.xml | 11 +-
components/{camel-google => camel-huawei}/pom.xml | 22 +-
.../camel-infinispan-common}/pom.xml | 11 +-
.../camel-infinispan-embedded}/pom.xml | 11 +-
.../camel-infinispan}/pom.xml | 12 +-
.../{camel-google => camel-infinispan}/pom.xml | 17 +-
.../camel-knative-http}/pom.xml| 11 +-
.../camel-knative}/pom.xml | 23 +-
components/{camel-google => camel-knative}/pom.xml | 16 +-
.../camel-microprofile-config}/pom.xml | 11 +-
.../camel-microprofile-fault-tolerance}/pom.xml| 11 +-
.../camel-microprofile-health}/pom.xml | 11 +-
.../{camel-google => camel-microprofile}/pom.xml | 17 +-
components/{camel-djl => camel-milvus}/pom.xml | 9 +-
components/{camel-djl => camel-pinecone}/pom.xml | 9 +-
.../pom.xml| 9 +-
components/{camel-djl => camel-qdrant}/pom.xml | 9 +-
components/{camel-djl => camel-wasm}/pom.xml | 9 +-
components/pom.xml | 17 +-
features/src/main/feature/camel-features.xml | 333 +++--
pom.xml| 41 +--
51 files changed, 613 insertions(+), 361 deletions(-)
diff --git a/components/camel-chatscript/pom.xml
b/components/camel-ai/camel-chatscript/pom.xml
similarity index 95%
copy from components/camel-chatscript/pom.xml
copy to components/camel-ai/camel-chatscript/pom.xml
index b3a179ec..7657e781 100644
--- a/components/camel-chatscript/pom.xml
+++ b/components/camel-ai/camel-chatscript/pom.xml
@@ -23,14 +23,14 @@
org.apache.camel.karaf
-camel-karaf-components
+camel-ai-parent
4.6.0-SNAPSHOT
../pom.xml
camel-chatscript
bundle
-Apache Camel :: Karaf :: Components :: ChatScript
+Apache Camel :: Karaf :: Components :: Ai :: ChatScript
@@ -79,4 +79,3 @@
-
diff --git a/components/camel-djl/pom.xml
b/components/camel-ai/camel-djl/pom.xml
similarity index 95%
copy from components/camel-djl/pom.xml
copy to components/camel-ai/camel-djl/pom.xml
index f72b
(camel-karaf) 01/01: Ref #375: Add missing components of Camel 4.6
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch 375/add-missing-components
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 69b5b8030dc917d777822ec78645f09dd31b9139
Author: Nicolas Filotto
AuthorDate: Fri Jun 21 18:13:54 2024 +0200
Ref #375: Add missing components of Camel 4.6
---
components/{ => camel-ai}/camel-chatscript/pom.xml | 5 +-
components/{ => camel-ai}/camel-djl/pom.xml| 5 +-
.../camel-langchain4j-chat}/pom.xml| 11 +-
.../camel-langchain4j-embeddings}/pom.xml | 11 +-
components/{camel-google => camel-ai}/pom.xml | 18 +-
.../camel-avro-rpc-jetty}/pom.xml | 11 +-
.../camel-avro-rpc}/pom.xml| 23 +-
.../{camel-google => camel-avro-rpc}/pom.xml | 16 +-
.../camel-aws-bedrock}/pom.xml | 11 +-
components/camel-aws/pom.xml | 1 +
components/{camel-djl => camel-beanio}/pom.xml | 9 +-
.../camel-debezium-common}/pom.xml | 11 +-
.../camel-debezium-db2}/pom.xml| 11 +-
.../camel-debezium-mongodb}/pom.xml| 11 +-
.../camel-debezium-mysql}/pom.xml | 11 +-
.../camel-debezium-oracle}/pom.xml | 11 +-
.../camel-debezium-postgres}/pom.xml | 11 +-
.../camel-debezium-sqlserver}/pom.xml | 11 +-
.../{camel-google => camel-debezium}/pom.xml | 21 +-
.../{camel-chatscript => camel-dhis2}/pom.xml | 21 +-
.../{camel-chatscript => camel-fhir}/pom.xml | 21 +-
.../camel-google-pubsub-lite}/pom.xml | 15 +-
components/camel-google/pom.xml| 1 +
.../camel-huaweicloud-common}/pom.xml | 11 +-
.../camel-huaweicloud-dms}/pom.xml | 11 +-
.../camel-huaweicloud-frs}/pom.xml | 11 +-
.../camel-huaweicloud-functiongraph}/pom.xml | 11 +-
.../camel-huaweicloud-iam}/pom.xml | 11 +-
.../camel-huaweicloud-imagerecognition}/pom.xml| 11 +-
.../camel-huaweicloud-obs}/pom.xml | 11 +-
.../camel-huaweicloud-smn}/pom.xml | 11 +-
components/{camel-google => camel-huawei}/pom.xml | 22 +-
.../camel-infinispan-common}/pom.xml | 11 +-
.../camel-infinispan-embedded}/pom.xml | 11 +-
.../camel-infinispan}/pom.xml | 12 +-
.../{camel-google => camel-infinispan}/pom.xml | 17 +-
.../camel-knative-http}/pom.xml| 11 +-
.../camel-knative}/pom.xml | 23 +-
components/{camel-google => camel-knative}/pom.xml | 16 +-
.../camel-microprofile-config}/pom.xml | 11 +-
.../camel-microprofile-fault-tolerance}/pom.xml| 11 +-
.../camel-microprofile-health}/pom.xml | 11 +-
.../{camel-google => camel-microprofile}/pom.xml | 17 +-
components/{camel-djl => camel-milvus}/pom.xml | 9 +-
components/{camel-djl => camel-pinecone}/pom.xml | 9 +-
.../pom.xml| 9 +-
components/{camel-djl => camel-qdrant}/pom.xml | 9 +-
components/{camel-djl => camel-wasm}/pom.xml | 9 +-
components/pom.xml | 17 +-
features/src/main/feature/camel-features.xml | 333 +++--
pom.xml| 41 +--
51 files changed, 613 insertions(+), 361 deletions(-)
diff --git a/components/camel-chatscript/pom.xml
b/components/camel-ai/camel-chatscript/pom.xml
similarity index 95%
copy from components/camel-chatscript/pom.xml
copy to components/camel-ai/camel-chatscript/pom.xml
index b3a179ec..7657e781 100644
--- a/components/camel-chatscript/pom.xml
+++ b/components/camel-ai/camel-chatscript/pom.xml
@@ -23,14 +23,14 @@
org.apache.camel.karaf
-camel-karaf-components
+camel-ai-parent
4.6.0-SNAPSHOT
../pom.xml
camel-chatscript
bundle
-Apache Camel :: Karaf :: Components :: ChatScript
+Apache Camel :: Karaf :: Components :: Ai :: ChatScript
@@ -79,4 +79,3 @@
-
diff --git a/components/camel-djl/pom.xml
b/components/camel-ai/camel-djl/pom.xml
similarity index 95%
copy from components/camel-djl/pom.xml
copy to components/camel-ai/camel-djl/pom.xml
index f72be6b9..7e8a6012 100644
--- a/components/camel-djl/pom.xml
+++ b/components/camel-ai/camel-djl/pom.xml
@@ -23,14 +23,14 @@
org.apache.camel.karaf
-camel-karaf-components
+camel-ai-parent
4.6.0-SNAPSHOT
../pom.xml
camel-djl
bundle
-Apache Camel :: Karaf :: Components :: Deep Java Library
+Apache Camel :: Karaf :: Components :: Ai :: Deep Java Library
@@ -79,4 +79,3 @@
(camel-karaf) branch 375/add-missing-components created (now 69b5b803)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 375/add-missing-components in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at 69b5b803 Ref #375: Add missing components of Camel 4.6 This branch includes the following new commits: new 69b5b803 Ref #375: Add missing components of Camel 4.6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-karaf) branch dependabot/maven/jakarta.xml.ws-jakarta.xml.ws-api-4.0.2 deleted (was 81a079e5)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/jakarta.xml.ws-jakarta.xml.ws-api-4.0.2 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 81a079e5 Bump jakarta.xml.ws:jakarta.xml.ws-api from 4.0.1 to 4.0.2 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 jakarta.xml.ws:jakarta.xml.ws-api from 4.0.1 to 4.0.2 (#357)
This is an automated email from the ASF dual-hosted git repository. nfilotto 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 1fbf6690 Bump jakarta.xml.ws:jakarta.xml.ws-api from 4.0.1 to 4.0.2 (#357) 1fbf6690 is described below commit 1fbf6690b5ec88e0a0baedd8cb6906a3f987fe05 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jun 21 13:56:00 2024 +0200 Bump jakarta.xml.ws:jakarta.xml.ws-api from 4.0.1 to 4.0.2 (#357) Bumps [jakarta.xml.ws:jakarta.xml.ws-api](https://github.com/jakartaee/jax-ws-api) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/jakartaee/jax-ws-api/releases) - [Commits](https://github.com/jakartaee/jax-ws-api/compare/4.0.1...4.0.2) --- updated-dependencies: - dependency-name: jakarta.xml.ws:jakarta.xml.ws-api 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 0c1c3df0..7952587d 100644 --- a/pom.xml +++ b/pom.xml @@ -293,7 +293,7 @@ 2.0.1 4.0.2 3.0.1 -4.0.1 +4.0.2 1.1.4 4.0.5 3.2.0
(camel-karaf) branch main updated (eb362013 -> c39ae250)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from eb362013 camel-velocity integration test (#356)
add c39ae250 Ref #376: Add camel-arangodb integration test and fix feature
(#377)
No new revisions were added by this update.
Summary of changes:
components/camel-arangodb/pom.xml | 36 ---
features/src/main/feature/camel-features.xml | 24 -
pom.xml| 1 +
.../pom.xml| 9 +-
.../camel/test/CamelArangodbRouteSupplier.java | 114 +
.../karaf/camel/itest/CamelArangodbITest.java} | 24 +++--
tests/features/pom.xml | 1 +
7 files changed, 158 insertions(+), 51 deletions(-)
copy tests/features/{camel-azure-storage-blob => camel-arangodb}/pom.xml (87%)
create mode 100644
tests/features/camel-arangodb/src/main/java/org/apache/karaf/camel/test/CamelArangodbRouteSupplier.java
copy
tests/features/{camel-http/src/test/java/org/apache/karaf/camel/itest/CamelHttpITest.java
=>
camel-arangodb/src/test/java/org/apache/karaf/camel/itest/CamelArangodbITest.java}
(64%)
(camel-karaf) branch main updated: camel-velocity integration test (#356)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 eb362013 camel-velocity integration test (#356)
eb362013 is described below
commit eb3620131f3dab381ec94b014ad7dceb5da538ca
Author: ÖZGÜR KISIR <157804972+ozgurkisir-q...@users.noreply.github.com>
AuthorDate: Fri Jun 21 14:54:06 2024 +0300
camel-velocity integration test (#356)
---
tests/features/camel-velocity/pom.xml | 33 ++
.../camel/test/CamelVelocityRouteSupplier.java | 51 ++
.../camel-velocity/src/main/resources/greeting.vm | 1 +
.../karaf/camel/itest/CamelVelocityITest.java | 42 ++
tests/features/pom.xml | 1 +
5 files changed, 128 insertions(+)
diff --git a/tests/features/camel-velocity/pom.xml
b/tests/features/camel-velocity/pom.xml
new file mode 100644
index ..9abb5f0f
--- /dev/null
+++ b/tests/features/camel-velocity/pom.xml
@@ -0,0 +1,33 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-velocity-test
+Apache Camel :: Karaf :: Tests :: Features :: Velocity
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-velocity/src/main/java/org/apache/karaf/camel/test/CamelVelocityRouteSupplier.java
b/tests/features/camel-velocity/src/main/java/org/apache/karaf/camel/test/CamelVelocityRouteSupplier.java
new file mode 100644
index ..30ad987a
--- /dev/null
+++
b/tests/features/camel-velocity/src/main/java/org/apache/karaf/camel/test/CamelVelocityRouteSupplier.java
@@ -0,0 +1,51 @@
+
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+import static org.apache.camel.builder.Builder.constant;
+
+@Component(
+name = "karaf-camel-saxon-test",
+immediate = true,
+service = CamelRouteSupplier.class
+)
+public class CamelVelocityRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+producerRoute.log("calling velocity endpoint")
+.setHeader("greeting", constant("Hello"))
+.setBody(builder.constant("World"))
+.toF("velocity:file://%s/classes/greeting.vm",
System.getProperty("project.target"))
+.log("${body}")
+.toF("mock:%s", getResultMockName());
+
+}
+}
+
diff --git a/tests/features/camel-velocity/src/main/resources/greeting.vm
b/tests/features/camel-velocity/src/main/resources/greeting.vm
new file mode 100644
index ..d8a8ba60
--- /dev/null
+++ b/tests/features/camel-velocity/src/main/resources/greeting.vm
@@ -0,0 +1 @@
+${headers.greeting}, ${body}!
diff --git
a/tests/features/camel-velocity/src/test/test/org/apache/karaf/camel/itest/CamelVelocityITest.java
b/tests/features/camel-velocity/src/test/test/org/apache/karaf/camel/itest/CamelVelocityITest.java
new file mode 100644
index ..5857a491
--- /dev/null
+++
b/tests/features/camel-velocity/src/test/test/org/apache/karaf/camel/itest/CamelVelocityITest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file
(camel-karaf) branch main updated: Ref #378: Added camel-google-pubsub integration test and fixed guava import (#379)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 aca82e14 Ref #378: Added camel-google-pubsub integration test and
fixed guava import (#379)
aca82e14 is described below
commit aca82e14aaa9c926c3a67db0f47cc05b88cccf84
Author: lopushen
AuthorDate: Fri Jun 21 13:56:56 2024 +0300
Ref #378: Added camel-google-pubsub integration test and fixed guava import
(#379)
---
features/src/main/feature/camel-features.xml | 2 +-
tests/features/camel-google-pubsub/pom.xml | 47
.../camel/test/CamelGooglePubsubRouteSupplier.java | 59 ++
.../karaf/camel/itest/CamelGooglePubsubITest.java | 126 +
tests/features/pom.xml | 1 +
5 files changed, 234 insertions(+), 1 deletion(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index fda28bfc..23ef35f2 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1065,7 +1065,7 @@
wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}
wrap:mvn:io.grpc/grpc-api/${grpc-version}$${spi-consumer}
mvn:org.threeten/threetenbp/${auto-detect-version}
-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/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*;resolution:=optional
wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}
wrap:mvn:io.opencensus/opencensus-api/${auto-detect-version}
wrap:mvn:io.opencensus/opencensus-contrib-http-util/${auto-detect-version}
diff --git a/tests/features/camel-google-pubsub/pom.xml
b/tests/features/camel-google-pubsub/pom.xml
new file mode 100644
index ..1082c3b0
--- /dev/null
+++ b/tests/features/camel-google-pubsub/pom.xml
@@ -0,0 +1,47 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+../pom.xml
+
+
+camel-google-pubsub-test
+Apache Camel :: Karaf :: Tests :: Features :: Google PubSub
+
+
+
+org.apache.camel
+camel-google-pubsub
+${camel-version}
+
+
+org.testcontainers
+gcloud
+${testcontainers-version}
+test
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-google-pubsub/src/main/java/org/apache/karaf/camel/test/CamelGooglePubsubRouteSupplier.java
b/tests/features/camel-google-pubsub/src/main/java/org/apache/karaf/camel/test/CamelGooglePubsubRouteSupplier.java
new file mode 100644
index ..3aa7c9ee
--- /dev/null
+++
b/tests/features/camel-google-pubsub/src/main/java/org/apache/karaf/camel/test/CamelGooglePubsubRouteSupplier.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.pubsub.GooglePubsubComponent;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(name = "karaf-camel-google-pubsub-test", immediate = true, service
= CamelRouteSuppl
(camel-karaf) branch main updated (7f1f4ed5 -> 2b56a9ec)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from 7f1f4ed5 Ref #372: Add camel-fastjson integration test (#373) add 2b56a9ec Ref #361: Add a Camel upgrade tool (#374) No new revisions were added by this update. Summary of changes: components/camel-blueprint/pom.xml | 2 - components/pom.xml | 4 +- pom.xml| 14 +- tooling/camel-karaf-feature-maven-plugin/pom.xml | 1 - tooling/camel-upgrade/README.md| 44 tooling/camel-upgrade/camel-upgrade.properties | 20 ++ tooling/camel-upgrade/pom.xml | 90 +++ .../karaf/tooling/upgrade/ComponentComparator.java | 124 ++ .../tooling/upgrade/DefaultValuesProvider.java | 76 ++ .../karaf/tooling/upgrade/FeatureHandler.java | 113 + .../tooling/upgrade/MultiModuleWrapperHandler.java | 94 .../karaf/tooling/upgrade/ParentPomUpdater.java| 151 .../camel/karaf/tooling/upgrade/PomUpdater.java| 74 ++ .../upgrade/SingleModuleWrapperHandler.java| 87 +++ .../camel/karaf/tooling/upgrade/UpgradeCamel.java | 266 + .../karaf/tooling/upgrade/UserInputProvider.java | 117 + .../apache/camel/karaf/tooling/upgrade/Utils.java | 57 + .../karaf/tooling/upgrade/WrapperHandler.java | 136 +++ .../src/main/resources/log4j2.properties | 21 ++ .../src/main/resources/multi-module-parent-pom.xml | 12 +- .../src/main/resources/multi-module-pom.xml| 13 +- .../src/main/resources/single-module-pom.xml | 11 +- .../tooling/upgrade/ComponentComparatorTest.java | 108 + .../tooling/upgrade/DefaultValuesProviderTest.java | 60 + .../karaf/tooling/upgrade/FeatureHandlerTest.java | 100 .../upgrade/MultiModuleWrapperHandlerTest.java | 74 ++ .../tooling/upgrade/ParentPomUpdaterTest.java | 77 ++ .../karaf/tooling/upgrade/PomUpdaterTest.java | 47 .../upgrade/SingleModuleWrapperHandlerTest.java| 68 ++ .../camel-both-multiple-a/.gitkeep | 0 .../camel-both-multiple-b/.gitkeep | 0 .../camel-karaf/camel-both-multiple/src/.gitkeep | 0 .../camel-karaf/camel-both-single/.gitkeep | 0 .../camel-karaf-multiple-a/.gitkeep| 0 .../camel-karaf-multiple-b/.gitkeep| 0 .../camel-karaf-multiple-only/.gitkeep | 0 .../comparator/camel-karaf/camel-karaf-only/.keep | 0 .../camel-multiple/camel-multiple-a/.gitkeep | 0 .../camel-multiple/camel-multiple-b/.gitkeep | 0 .../camel-both-multiple-a/.gitkeep | 0 .../camel-both-multiple-b/.gitkeep | 0 .../comparator/camel/camel-both-single/.gitkeep| 0 .../camel-complex-multiple-a/.gitkeep | 0 .../camel-complex-multiple-api/.gitkeep| 0 .../camel-complex-multiple-b/.gitkeep | 0 .../camel-complex-multiple-codegen/.gitkeep| 0 .../camel-complex-multiple-component/.gitkeep | 0 .../camel-complex-multiple-maven-plugin/.gitkeep | 0 .../camel-complex-multiple-spi/.gitkeep| 0 .../camel-complex-single-api/.gitkeep | 0 .../camel-complex-single-codegen/.gitkeep | 0 .../camel-complex-single-component/.gitkeep| 0 .../camel-complex-single-maven-plugin/.gitkeep | 0 .../camel-complex-single-spi/.gitkeep | 0 .../camel-karaf-multiple-a/.gitkeep| 0 .../camel-karaf-multiple-b/.gitkeep| 0 .../camel/camel-multiple/camel-multiple-a/.gitkeep | 0 .../camel/camel-multiple/camel-multiple-b/.gitkeep | 0 .../camel-multiple/camel-multiple-only/.gitkeep| 0 .../resources/comparator/camel/camel-only/.gitkeep | 0 .../test/resources/comparator/camel/src/.gitkeep | 0 .../test/resources/default-values/empty.properties | 0 .../test/resources/default-values/full.properties | 20 ++ .../src/test/resources/features/empty.xml | 0 .../resources/features/inject-after-expected.xml | 59 + .../src/test/resources/features/inject-after.xml | 55 + .../resources/features/inject-before-expected.xml | 59 + .../src/test/resources/features/inject-before.xml | 55 + .../resources/features/inject-middle-expected.xml | 59 + .../src/test/resources/features/inject-middle.xml | 55 + .../resources/features/remove-after-expected.xml | 55 + .../src/test/resources/features/remove-after.xml | 61 + .../resources/features/remove-before-expected.xml | 55 + .../src/test/resources/features/remove-before.xml | 61 + .../resources/features/remove-middle-expected.xml | 55
(camel-karaf) branch 361/add-camel-upgrade-tool deleted (was f3fa2534)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/add-camel-upgrade-tool in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was f3fa2534 Ref #361: Add a Camel upgrade tool 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 361/add-camel-upgrade-tool updated (3fef971e -> f3fa2534)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/add-camel-upgrade-tool in repository https://gitbox.apache.org/repos/asf/camel-karaf.git discard 3fef971e Ref #361: Add a Camel upgrade tool add f3fa2534 Ref #361: Add a Camel upgrade tool This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3fef971e) \ N -- N -- N refs/heads/361/add-camel-upgrade-tool (f3fa2534) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel/karaf/tooling/upgrade/UpgradeCamel.java | 27 -- 1 file changed, 25 insertions(+), 2 deletions(-)
(camel-karaf) branch 361/add-camel-upgrade-tool updated (3ed3f9ca -> 3fef971e)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch 361/add-camel-upgrade-tool
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
discard 3ed3f9ca Ref #361: Add a Camel upgrade tool
add b39017c4 Ref #354: Add camel-xslt-saxon integration test (#355)
add 3e576aac Ref #352: Add camel-saxon integration test (#353)
add 2b832a43 Ref #359: Add camel-http integration test (#360)
add 4017e858 Ref #366: Add camel-paho-mqtt5 integration tests (#367)
add 3d0513b6 Ref #364: Add camel-ftp integration test (#365)
add 22c0747e Ref #368: Added camel-jms integration test (#369)
add 05f0a1b5 Ref #362: Added missing camel-azure-storage-blob and
integration test (#363)
add 075de5e7 Ref #370: Add camel-gson integration tests (#371)
add 7f1f4ed5 Ref #372: Add camel-fastjson integration test (#373)
add 3fef971e Ref #361: Add a Camel upgrade tool
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3ed3f9ca)
\
N -- N -- N refs/heads/361/add-camel-upgrade-tool (3fef971e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
features/src/main/feature/camel-features.xml | 23 -
java => ExternalResourceWithPrerequisite.java} | 43 +
.../camel/itests/GenericContainerResource.java | 1 +
.../pom.xml| 10 +-
.../test/CamelAzureStorageBlobRouteSupplier.java | 96 ++
.../camel/itest/CamelAzureStorageBlobITest.java| 77 +++
.../{camel-olingo2 => camel-fastjson}/pom.xml | 4 +-
.../camel/test/CamelFastjsonRouteSupplier.java}| 28 +++---
.../karaf/camel/itest/CamelFastjsonITest.java} | 5 +-
tests/features/{camel-amqp => camel-ftp}/pom.xml | 11 ++-
.../karaf/camel/test/CamelFtpRouteSupplier.java} | 28 +++---
.../apache/karaf/camel/itest/CamelFtpITest.java} | 35 +++
.../karaf/camel/itest/FtpServerResource.java | 107 +
tests/features/{camel-jetty => camel-gson}/pom.xml | 5 +-
.../karaf/camel/test/CamelGsonRouteSupplier.java} | 51 +++---
.../apache/karaf/camel/itest/CamelGsonITest.java} | 6 +-
tests/features/{camel-mail => camel-http}/pom.xml | 4 +-
.../karaf/camel/test/CamelHttpRouteSupplier.java} | 25 ++---
.../apache/karaf/camel/itest/CamelHttpITest.java} | 24 ++---
.../features/{camel-activemq => camel-jms}/pom.xml | 6 +-
.../main/resources/OSGI-INF/blueprint/route.xml| 38
.../apache/karaf/camel/itest/CamelJmsITest.java} | 18 ++--
.../{camel-mail => camel-paho-mqtt5}/pom.xml | 5 +-
.../camel/test/CamelPahoMqtt5RouteSupplier.java} | 17 ++--
.../karaf/camel/itest/CamelPahoMqtt5ITest.java}| 29 +++---
.../src/test/resources/mosquitto.conf | 2 +
.../features/{camel-jetty => camel-saxon}/pom.xml | 5 +-
.../karaf/camel/test/CamelSaxonRouteSupplier.java} | 31 +++---
.../camel-saxon/src/main/resources/myTransform.xq} | 21 ++--
.../apache/karaf/camel/itest/CamelSaxonITest.java} | 6 +-
.../{camel-hazelcast => camel-xslt-saxon}/pom.xml | 8 +-
.../camel/test/CamelXsltSaxonRouteSupplier.java} | 29 +++---
.../src/main/resources/transform.xsl} | 33 ---
.../karaf/camel/itest/CamelXsltSaxonITest.java}| 15 ++-
tests/features/pom.xml | 9 ++
35 files changed, 612 insertions(+), 243 deletions(-)
copy
tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/{AbstractCamelSingleFeatureRouteITest.java
=> ExternalResourceWithPrerequisite.java} (51%)
copy tests/features/{camel-kafka => camel-azure-storage-blob}/pom.xml (86%)
create mode 100644
tests/features/camel-azure-storage-blob/src/main/java/org/apache/karaf/camel/test/CamelAzureStorageBlobRouteSupplier.java
create mode 100644
tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
copy tests/features/{camel-olingo2 => camel-fastjson}/pom.xml (90%)
copy
tests/features/{camel-mail/src/main/java/org/apache/karaf/camel/test/CamelMailRouteSupplier.java
=>
camel-fastjson/src/main/java/org/apache/karaf/camel/test/CamelFastjsonRouteSupplier.java}
(62%)
copy
tests/features/{camel-quartz/src/test/java/org/apache/karaf/camel/itest/CamelQuartzIT
(camel-karaf) branch 361/add-camel-upgrade-tool updated (579a765f -> 3ed3f9ca)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/add-camel-upgrade-tool in repository https://gitbox.apache.org/repos/asf/camel-karaf.git discard 579a765f Ref #361: Add a Camel upgrade tool add 3ed3f9ca Ref #361: Add a Camel upgrade tool This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (579a765f) \ N -- N -- N refs/heads/361/add-camel-upgrade-tool (3ed3f9ca) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../karaf/tooling/upgrade/ComponentComparator.java | 10 + .../camel/karaf/tooling/upgrade/UpgradeCamel.java | 24 +- .../karaf/tooling/upgrade/UserInputProvider.java | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-)
(camel-karaf) branch 361/add-camel-upgrade-tool updated (0212c236 -> 579a765f)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/add-camel-upgrade-tool in repository https://gitbox.apache.org/repos/asf/camel-karaf.git discard 0212c236 Ref #361: Add a Camel upgrade tool add 579a765f Ref #361: Add a Camel upgrade tool This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0212c236) \ N -- N -- N refs/heads/361/add-camel-upgrade-tool (579a765f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/karaf/tooling/upgrade/ParentPomUpdater.java | 2 +- .../camel-upgrade/src/test/resources/parent-pom-updater/camel-pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
(camel-karaf) branch 361/add-camel-upgrade-tool updated (21c2be49 -> 0212c236)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/add-camel-upgrade-tool in repository https://gitbox.apache.org/repos/asf/camel-karaf.git discard 21c2be49 Ref #361: Add a Camel upgrade tool new 0212c236 Ref #361: Add a Camel upgrade tool This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (21c2be49) \ N -- N -- N refs/heads/361/add-camel-upgrade-tool (0212c236) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: tooling/camel-upgrade/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(camel-karaf) branch 361/add-camel-upgrade-tool updated (e4d4f06a -> 21c2be49)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/add-camel-upgrade-tool in repository https://gitbox.apache.org/repos/asf/camel-karaf.git discard e4d4f06a Ref #361: Add a Camel upgrade tool new 21c2be49 Ref #361: Add a Camel upgrade tool This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e4d4f06a) \ N -- N -- N refs/heads/361/add-camel-upgrade-tool (21c2be49) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 1 - 1 file changed, 1 deletion(-)
(camel-karaf) branch 361/add-camel-upgrade-tool created (now e4d4f06a)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 361/add-camel-upgrade-tool in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at e4d4f06a Ref #361: Add a Camel upgrade tool This branch includes the following new commits: new e4d4f06a Ref #361: Add a Camel upgrade tool The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-karaf) branch main updated: Ref #372: Add camel-fastjson integration test (#373)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 7f1f4ed5 Ref #372: Add camel-fastjson integration test (#373)
7f1f4ed5 is described below
commit 7f1f4ed512ea141994785a5c9c9b24623486b1b0
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jun 19 15:53:55 2024 +0200
Ref #372: Add camel-fastjson integration test (#373)
---
features/src/main/feature/camel-features.xml | 2 +
tests/features/camel-fastjson/pom.xml | 33 +
.../camel/test/CamelFastjsonRouteSupplier.java | 57 ++
.../karaf/camel/itest/CamelFastjsonITest.java | 40 +++
tests/features/pom.xml | 1 +
5 files changed, 133 insertions(+)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index f076f13c..fda28bfc 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -908,6 +908,8 @@
camel-core
wrap:mvn:com.alibaba/fastjson/${fastjson-version}
+wrap:mvn:com.alibaba.fastjson2/fastjson2/${auto-detect-version}
+wrap:mvn:com.alibaba.fastjson2/fastjson2-extension/${auto-detect-version}
mvn:org.apache.camel.karaf/camel-fastjson/${project.version}
diff --git a/tests/features/camel-fastjson/pom.xml
b/tests/features/camel-fastjson/pom.xml
new file mode 100644
index ..97b2e9eb
--- /dev/null
+++ b/tests/features/camel-fastjson/pom.xml
@@ -0,0 +1,33 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-fastjson-test
+Apache Camel :: Karaf :: Tests :: Features :: Fastjson
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-fastjson/src/main/java/org/apache/karaf/camel/test/CamelFastjsonRouteSupplier.java
b/tests/features/camel-fastjson/src/main/java/org/apache/karaf/camel/test/CamelFastjsonRouteSupplier.java
new file mode 100644
index ..f7d47b26
--- /dev/null
+++
b/tests/features/camel-fastjson/src/main/java/org/apache/karaf/camel/test/CamelFastjsonRouteSupplier.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.Map;
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.dataformat.JsonLibrary;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
+@Component(
+name = "karaf-camel-fastjson-test",
+immediate = true,
+service = CamelRouteSupplier.class
+)
+public class CamelFastjsonRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+return builder ->
+builder.from("direct:consumejson")
+.log("received message ${body}")
+.unmarshal().json(JsonLibrary.Fastjson, Map.class)
+.log("unmarshalled ${body}")
+.process(ex -> {
+Map data = ex.getIn().getBody(Map.class);
+ex.getIn().setBody(data.get("key"));
+});
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+producerRoute.process(ex -> ex.getIn().setBody(Map.of("key",
(camel-karaf) branch main updated: Ref #370: Add camel-gson integration tests (#371)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 075de5e7 Ref #370: Add camel-gson integration tests (#371)
075de5e7 is described below
commit 075de5e7248831794f19162ac1eb219808f54326
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jun 19 15:31:23 2024 +0200
Ref #370: Add camel-gson integration tests (#371)
---
tests/features/camel-gson/pom.xml | 33 +
.../karaf/camel/test/CamelGsonRouteSupplier.java | 82 ++
.../apache/karaf/camel/itest/CamelGsonITest.java | 41 +++
tests/features/pom.xml | 1 +
4 files changed, 157 insertions(+)
diff --git a/tests/features/camel-gson/pom.xml
b/tests/features/camel-gson/pom.xml
new file mode 100644
index ..a9b2d056
--- /dev/null
+++ b/tests/features/camel-gson/pom.xml
@@ -0,0 +1,33 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-gson-test
+Apache Camel :: Karaf :: Tests :: Features :: Gson
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-gson/src/main/java/org/apache/karaf/camel/test/CamelGsonRouteSupplier.java
b/tests/features/camel-gson/src/main/java/org/apache/karaf/camel/test/CamelGsonRouteSupplier.java
new file mode 100644
index ..6bc82f47
--- /dev/null
+++
b/tests/features/camel-gson/src/main/java/org/apache/karaf/camel/test/CamelGsonRouteSupplier.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.dataformat.JsonLibrary;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
+@Component(
+name = "karaf-camel-gson-test",
+immediate = true,
+service = CamelRouteSupplier.class
+)
+public class CamelGsonRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+public static class MyData {
+private String name;
+private int age;
+
+public MyData(String name, int age) {
+this.name = name;
+this.age = age;
+}
+
+// Getters and setters
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
+public int getAge() {
+return age;
+}
+
+public void setAge(int age) {
+this.age = age;
+}
+}
+
+@Override
+protected Function consumerRoute() {
+return builder ->
+builder.from("direct:consumejson")
+.log("received message ${body}")
+.unmarshal().json(JsonLibrary.Gson, MyData.class)
+.process(ex -> {
+MyData data = ex.getIn().getBody(MyData.class);
+ex.getIn().setBody(data.getName());
+});
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+producerRoute.process(ex -> ex.getIn().setBody(new MyData("OK", 3)))
+.marshal().json(JsonLibrary.Gson)
+.log("serialized json ${body}")
+.to("direct:consumejson");
+}
+}
+
diff --git
a/tests/features/camel-gson/src/test/java/org/apache/karaf/camel/itest/Came
(camel-karaf) branch main updated (22c0747e -> 05f0a1b5)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from 22c0747e Ref #368: Added camel-jms integration test (#369)
add 05f0a1b5 Ref #362: Added missing camel-azure-storage-blob and
integration test (#363)
No new revisions were added by this update.
Summary of changes:
features/src/main/feature/camel-features.xml | 20 -
.../pom.xml| 10 +--
.../test/CamelAzureStorageBlobRouteSupplier.java | 96 ++
.../camel/itest/CamelAzureStorageBlobITest.java| 77 +
tests/features/pom.xml | 1 +
5 files changed, 197 insertions(+), 7 deletions(-)
copy tests/features/{camel-kafka => camel-azure-storage-blob}/pom.xml (86%)
create mode 100644
tests/features/camel-azure-storage-blob/src/main/java/org/apache/karaf/camel/test/CamelAzureStorageBlobRouteSupplier.java
create mode 100644
tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
(camel-karaf) branch main updated (3d0513b6 -> 22c0747e)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from 3d0513b6 Ref #364: Add camel-ftp integration test (#365)
add 22c0747e Ref #368: Added camel-jms integration test (#369)
No new revisions were added by this update.
Summary of changes:
.../features/{camel-activemq => camel-jms}/pom.xml | 6 ++--
.../main/resources/OSGI-INF/blueprint/route.xml| 38 --
.../apache/karaf/camel/itest/CamelJmsITest.java} | 18 +-
tests/features/pom.xml | 1 +
4 files changed, 34 insertions(+), 29 deletions(-)
copy tests/features/{camel-activemq => camel-jms}/pom.xml (92%)
copy tests/features/{camel-aws2-sns =>
camel-jms}/src/main/resources/OSGI-INF/blueprint/route.xml (60%)
copy
tests/features/{camel-activemq/src/test/java/org/apache/karaf/camel/itest/CamelActivemqITest.java
=> camel-jms/src/test/java/org/apache/karaf/camel/itest/CamelJmsITest.java}
(74%)
(camel-karaf) branch main updated: Ref #364: Add camel-ftp integration test (#365)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 3d0513b6 Ref #364: Add camel-ftp integration test (#365)
3d0513b6 is described below
commit 3d0513b6a0f783c06a3a03c87906da836fbf6990
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Wed Jun 19 14:24:24 2024 +0200
Ref #364: Add camel-ftp integration test (#365)
---
.../itests/ExternalResourceWithPrerequisite.java | 60
.../camel/itests/GenericContainerResource.java | 1 +
tests/features/camel-ftp/pom.xml | 42
.../karaf/camel/test/CamelFtpRouteSupplier.java| 51 ++
.../apache/karaf/camel/itest/CamelFtpITest.java| 63
.../karaf/camel/itest/FtpServerResource.java | 107 +
tests/features/pom.xml | 1 +
7 files changed, 325 insertions(+)
diff --git
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/ExternalResourceWithPrerequisite.java
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/ExternalResourceWithPrerequisite.java
new file mode 100644
index ..d930f959
--- /dev/null
+++
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/ExternalResourceWithPrerequisite.java
@@ -0,0 +1,60 @@
+/**
+ * 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.
+ */
+
+package org.apache.karaf.camel.itests;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class ExternalResourceWithPrerequisite implements
ExternalResource {
+
+private final Map properties = new HashMap<>();
+
+@Override
+public void before() {
+for (ExternalResource prerequisite : getPrerequisites()) {
+prerequisite.before();
+prerequisite.properties().forEach(this::setProperty);
+}
+doStart();
+}
+
+@Override
+public void after() {
+doStop();
+for (ExternalResource prerequisite : getPrerequisites()) {
+prerequisite.after();
+}
+}
+
+public void setProperty(String key, String value) {
+properties.put(key, value);
+}
+
+@Override
+public Map properties() {
+return properties;
+}
+
+protected abstract List getPrerequisites();
+
+protected abstract void doStart();
+
+protected abstract void doStop();
+
+}
diff --git
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/GenericContainerResource.java
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/GenericContainerResource.java
index 5adbbba9..39c4ad90 100644
---
a/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/GenericContainerResource.java
+++
b/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/GenericContainerResource.java
@@ -60,6 +60,7 @@ public class GenericContainerResource> implements
container.start();
onStarted.accept(this);
for (ExternalResource dependency : dependencies) {
+dependency.before();
dependency.properties().forEach(this::setProperty);
}
LOG.info("Container {} started", container.getDockerImageName());
diff --git a/tests/features/camel-ftp/pom.xml b/tests/features/camel-ftp/pom.xml
new file mode 100644
index ..a236b88e
--- /dev/null
+++ b/tests/features/camel-ftp/pom.xml
@@ -0,0 +1,42 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-ftp-test
+Apache Camel :: Karaf :: Tests :: Features :: FTP
+
+
+
+org.apache.ftpserver
+ftpserver-core
+${ftpserver-version}
+test
(camel-karaf) branch main updated (2b832a43 -> 4017e858)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from 2b832a43 Ref #359: Add camel-http integration test (#360)
add 4017e858 Ref #366: Add camel-paho-mqtt5 integration tests (#367)
No new revisions were added by this update.
Summary of changes:
.../{camel-http => camel-paho-mqtt5}/pom.xml | 5 ++--
.../camel/test/CamelPahoMqtt5RouteSupplier.java} | 17 +---
.../karaf/camel/itest/CamelPahoMqtt5ITest.java}| 31 --
.../src/test/resources/mosquitto.conf | 2 ++
tests/features/pom.xml | 1 +
5 files changed, 30 insertions(+), 26 deletions(-)
copy tests/features/{camel-http => camel-paho-mqtt5}/pom.xml (91%)
copy
tests/features/{camel-netty-http/src/main/java/org/apache/karaf/camel/test/CamelNettyHttpRouteSupplier.java
=>
camel-paho-mqtt5/src/main/java/org/apache/karaf/camel/test/CamelPahoMqtt5RouteSupplier.java}
(73%)
copy
tests/features/{camel-http/src/test/java/org/apache/karaf/camel/itest/CamelHttpITest.java
=>
camel-paho-mqtt5/src/test/java/org/apache/karaf/camel/itest/CamelPahoMqtt5ITest.java}
(53%)
create mode 100644
tests/features/camel-paho-mqtt5/src/test/resources/mosquitto.conf
(camel-karaf) branch main updated: Ref #359: Add camel-http integration test (#360)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 2b832a43 Ref #359: Add camel-http integration test (#360)
2b832a43 is described below
commit 2b832a434022172254575f3d6b3562af51f73454
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Tue Jun 18 09:59:57 2024 +0200
Ref #359: Add camel-http integration test (#360)
---
tests/features/camel-http/pom.xml | 42
.../karaf/camel/test/CamelHttpRouteSupplier.java | 47 ++
.../apache/karaf/camel/itest/CamelHttpITest.java | 58 ++
tests/features/pom.xml | 1 +
4 files changed, 148 insertions(+)
diff --git a/tests/features/camel-http/pom.xml
b/tests/features/camel-http/pom.xml
new file mode 100644
index ..e189e57e
--- /dev/null
+++ b/tests/features/camel-http/pom.xml
@@ -0,0 +1,42 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-http-test
+Apache Camel :: Karaf :: Tests :: Features :: Http
+
+
+
+org.testcontainers
+testcontainers
+${testcontainers-version}
+test
+
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-http/src/main/java/org/apache/karaf/camel/test/CamelHttpRouteSupplier.java
b/tests/features/camel-http/src/main/java/org/apache/karaf/camel/test/CamelHttpRouteSupplier.java
new file mode 100644
index ..28422e97
--- /dev/null
+++
b/tests/features/camel-http/src/main/java/org/apache/karaf/camel/test/CamelHttpRouteSupplier.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-http-test",
+immediate = true,
+service = CamelRouteSupplier.class
+)
+public class CamelHttpRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+configureConsumer(
+producerRoute.log("calling local http server")
+.setHeader("CamelHttpMethod", constant("GET"))
+.toF("http://localhost:%s;,
System.getProperty("http.port"))
+.log("got ${body}"));
+}
+}
+
diff --git
a/tests/features/camel-http/src/test/java/org/apache/karaf/camel/itest/CamelHttpITest.java
b/tests/features/camel-http/src/test/java/org/apache/karaf/camel/itest/CamelHttpITest.java
new file mode 100644
index ..cff038ef
--- /dev/null
+++
b/tests/features/camel-http/src/test/java/org/apache/karaf/camel/itest/CamelHttpITest.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed 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 impli
(camel-karaf) branch main updated: Ref #352: Add camel-saxon integration test (#353)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 3e576aac Ref #352: Add camel-saxon integration test (#353)
3e576aac is described below
commit 3e576aac60819b3b38a60368437d001096893c46
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Sat Jun 15 18:50:53 2024 +0200
Ref #352: Add camel-saxon integration test (#353)
---
tests/features/camel-saxon/pom.xml | 33 ++
.../karaf/camel/test/CamelSaxonRouteSupplier.java | 53 ++
.../camel-saxon/src/main/resources/myTransform.xq | 20
.../apache/karaf/camel/itest/CamelSaxonITest.java | 41 +
tests/features/pom.xml | 1 +
5 files changed, 148 insertions(+)
diff --git a/tests/features/camel-saxon/pom.xml
b/tests/features/camel-saxon/pom.xml
new file mode 100644
index ..4e113ccc
--- /dev/null
+++ b/tests/features/camel-saxon/pom.xml
@@ -0,0 +1,33 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-saxon-test
+Apache Camel :: Karaf :: Tests :: Features :: Saxon
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-saxon/src/main/java/org/apache/karaf/camel/test/CamelSaxonRouteSupplier.java
b/tests/features/camel-saxon/src/main/java/org/apache/karaf/camel/test/CamelSaxonRouteSupplier.java
new file mode 100644
index ..d0b39ba5
--- /dev/null
+++
b/tests/features/camel-saxon/src/main/java/org/apache/karaf/camel/test/CamelSaxonRouteSupplier.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.camel.test;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-saxon-test",
+immediate = true,
+service = CamelRouteSupplier.class
+)
+public class CamelSaxonRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+
+@Override
+protected boolean consumerEnabled() {
+return false;
+}
+
+@Override
+protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+producerRoute.log("calling xquery endpoint")
+
.setBody(builder.constant("London"))
+.filter().xquery("/person/city = 'London'")
+.setBody(builder.constant("""
+
+James
+Strachan
+London
+"""))
+
.to("xquery:file://%s/classes/myTransform.xq".formatted(System.getProperty("project.target")))
+.log("${body}")
+.toF("mock:%s", getResultMockName());
+}
+}
+
diff --git a/tests/features/camel-saxon/src/main/resources/myTransform.xq
b/tests/features/camel-saxon/src/main/resources/myTransform.xq
new file mode 100644
index ..c9f0c100
--- /dev/null
+++ b/tests/features/camel-saxon/src/main/resources/myTransform.xq
@@ -0,0 +1,20 @@
+(:
+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 co
