[camel-quarkus] 19/21: Fixed web3j + generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 563ba7df59fadc80326f04af1f7006a764d65096 Author: JiriOndrusek AuthorDate: Thu Jul 20 13:07:57 2023 +0200 Fixed web3j + generated poms --- pom.xml | 1 + poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml| 5 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 + poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 + 5 files changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index d8e34c8ec8..0a8b560c49 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ ${jetty-version} ${jira-rest-client-api-version} 5.6.0 +0.9.11 2.2.13 0.2.9 ${json-path-version} diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index a1b8d23ab1..1bed98f8d0 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6091,6 +6091,11 @@ + +com.github.jnr +jnr-constants +${jnr-constants.version} + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 76a61f8661..1e5eabeb84 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 0a147eea3b..d97c9a7815 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index a99a8ea618..68c3d6ed5a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi
[camel-quarkus] 12/21: Fixed tika version conflict + regen of poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit ae750ddc1e2d24b49ca20ae8262bcc6e89d2430a Author: JiriOndrusek AuthorDate: Tue Jul 18 09:12:56 2023 +0200 Fixed tika version conflict + regen of poms --- poms/bom/pom.xml | 4 poms/bom/src/main/generated/flattened-full-pom.xml| 10 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 10 +++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 63bff236a7..fdcae4dcae 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6386,6 +6386,10 @@ commons-logging commons-logging + +fontbox +org.apache.pdfbox + diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9210ee5ba6..ecdfd44de6 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6509,7 +6513,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6534,7 +6538,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e63e957e0b..58aa26a8b8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6494,7 +6498,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6514,7 +6518,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 1e403ecbae..5be4fdd539 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6494,7 +6498,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6514,7 +6518,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis
[camel-quarkus] 05/21: fixed debezium version problem
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 635574c8c775d03da36b1f489dd8a8e20a665c9e Author: JiriOndrusek AuthorDate: Thu Jul 13 11:04:28 2023 +0200 fixed debezium version problem --- pom.xml| 1 - poms/bom/pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 432 ++--- .../src/main/generated/flattened-reduced-pom.xml | 28 +- .../generated/flattened-reduced-verbose-pom.xml| 132 +++ 5 files changed, 297 insertions(+), 298 deletions(-) diff --git a/pom.xml b/pom.xml index 036f609899..d8e34c8ec8 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,6 @@ camel-${camel.major.minor}.x camel-spring-boot-${camel.major.minor}.x 1.2.0 -2.2.0.Final 9.37.0.Final 2.4.1 3.0.1 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index b5f0040b28..63bff236a7 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -88,7 +88,7 @@ io.debezium debezium-bom -${debezium.version} +${debezium-version} pom import diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index ba936a2e5c..35457be641 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6180,16 +6180,6 @@ - -io.dropwizard.metrics -dropwizard-core -4.2.19 - - -io.dropwizard.metrics -metrics-jmx -4.2.19 - io.perfmark perfmark-api @@ -20932,9 +20922,9 @@ 25.1-jre-graal-sub-1 -org.apache.kafka -connect-api -3.4.0 +org.apache.kafka +connect-api +3.4.0 javax.ws.rs @@ -20943,337 +20933,347 @@ -org.apache.kafka -connect-json -3.4.0 +org.apache.kafka +connect-json +3.4.0 + + +org.apache.kafka +connect-file +3.4.0 + + +org.apache.kafka +connect-transforms +3.4.0 -org.apache.kafka -connect-file -3.4.0 +org.apache.kafka +kafka_2.13 +3.4.0 +test -org.apache.kafka -connect-transforms -3.4.0 +io.confluent +kafka-connect-avro-converter +7.0.1 -org.apache.kafka -kafka_2.13 -3.4.0 -test +io.confluent +kafka-connect-protobuf-converter +7.0.1 -io.confluent -kafka-connect-avro-converter -7.0.1 +io.apicurio +apicurio-registry-utils-converter +2.4.1.Final -io.confluent -kafka-connect-protobuf-converter -7.0.1 +com.mysql +mysql-connector-j +8.0.33 -io.apicurio -apicurio-registry-utils-converter -2.4.1.Final +com.zendesk +mysql-binlog-connector-java +0.27.2 -com.mysql -mysql-connector-j -8.0.32 +mil.nga +wkb +1.0.2 -com.zendesk -mysql-binlog-connector-java -0.27.2 +com.oracle.instantclient +xstreams +21.6.0.0 -mil.nga -wkb -1.0.2 +ch.qos.logback +logback-classic +1.2.10 -com.oracle.instantclient -xstreams -21.6.0.0 +org.codehaus.groovy +groovy +3.0.7 -ch.qos.logback -logback-classic -1.2.10 +org.codehaus.groovy +groovy-json +3.0.7 -org.codehaus.groovy -groovy -3.0.7 +org.codehaus.groovy +groovy-jsr223 +3.0.7 -org.codehaus.groovy -groovy-json -3.0.7 +io.vitess +vitess-grpc-client +12.0.0 -org.codehaus.groovy -groovy-jsr223 -3.0.7 +org.apache.cassandra +cassandra-all +3.11.12 -io.vitess -vitess-grpc-client -12.0.0 +com.datastax.cassandra +cassandra-driver-core +4.14.0 -org.apache.cassandra -cassandra-all -3.11.12 +io.dropwizard.metrics +metrics-core +4.0.1 -com.datastax.cassandra -
[camel-quarkus] 14/21: Fixed ArangoDB and google-secret-manager version conflict + generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a345b12ae7e88c1653a4c7f3be8de31418859415 Author: JiriOndrusek AuthorDate: Wed Jul 19 09:41:42 2023 +0200 Fixed ArangoDB and google-secret-manager version conflict + generated poms --- extensions-jvm/google-secret-manager/runtime/pom.xml| 8 +++- .../quarkus/component/arangodb/it/ArangodbResource.java | 4 +--- .../quarkus/component/arangodb/it/ArangodbTest.java | 5 ++--- poms/bom/src/main/generated/flattened-full-pom.xml | 17 +++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- .../main/generated/flattened-reduced-verbose-pom.xml| 2 +- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/extensions-jvm/google-secret-manager/runtime/pom.xml b/extensions-jvm/google-secret-manager/runtime/pom.xml index 54269907aa..6f2fa282ee 100644 --- a/extensions-jvm/google-secret-manager/runtime/pom.xml +++ b/extensions-jvm/google-secret-manager/runtime/pom.xml @@ -83,8 +83,14 @@ -google-cloud-pubsub com.google.cloud +google-cloud-pubsub + + +gax-httpjson +com.google.api + + diff --git a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java index eafdbbf913..e56adbcb65 100644 --- a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java +++ b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java @@ -23,7 +23,6 @@ import java.util.Map; import com.arangodb.entity.DocumentCreateEntity; import com.arangodb.entity.DocumentDeleteEntity; -import com.arangodb.util.MapBuilder; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; @@ -121,8 +120,7 @@ public class ArangodbResource { LOG.infof("Retrieve document from arangodb with foo: %s", fooName); String query = "FOR t IN camel FILTER t.foo == @foo RETURN t"; -Map bindVars = new MapBuilder().put("foo", fooName) -.get(); +Map bindVars = Map.of("foo", fooName); Map headers = new HashMap<>(); headers.put(AQL_QUERY, query); diff --git a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java index 82cf2bb695..642dd304c0 100644 --- a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java +++ b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java @@ -19,7 +19,6 @@ package org.apache.camel.quarkus.component.arangodb.it; import com.arangodb.ArangoCollection; import com.arangodb.ArangoDB; import com.arangodb.ArangoDatabase; -import com.arangodb.DbName; import com.arangodb.entity.BaseDocument; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; @@ -140,8 +139,8 @@ class ArangodbTest { String host = ConfigProvider.getConfig().getValue("camel.arangodb.host", String.class); Integer port = ConfigProvider.getConfig().getValue("camel.arangodb.port", Integer.class); arangoDb = new ArangoDB.Builder().host(host, port).build(); -arangoDb.createDatabase(DbName.of(DATABASE_NAME)); -ArangoDatabase arangoDatabase = arangoDb.db(DbName.of(DATABASE_NAME)); +arangoDb.createDatabase(DATABASE_NAME); +ArangoDatabase arangoDatabase = arangoDb.db(DATABASE_NAME); arangoDatabase.createCollection(COLLECTION_NAME); collection = arangoDatabase.collection(COLLECTION_NAME); } diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 0849da1c1c..c8a7c7c619 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6059,7 +6059,7 @@ com.google.oauth-client google-oauth-client -1.34.0 +1.34.1 commons-logging @@ -6180,6 +6180,16 @@ + +io.dropwizard.metrics +dropwizard-core +4.2.19 + + +io.dropwizard.metrics +metrics-jmx +4.2.19 + io.perfmark perfmark-api @@ -21039,11 +21049,6 @@ metrics-core 4.0.1 - -
[camel-quarkus] 17/21: enabled ssh
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit bf42e3879a39b5683d4c186991f04c6e4aa634ad Author: JiriOndrusek AuthorDate: Thu Jul 20 08:46:11 2023 +0200 enabled ssh --- integration-tests/ssh/pom.xml| 5 ++--- .../test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/integration-tests/ssh/pom.xml b/integration-tests/ssh/pom.xml index 53e93384da..74bd48388f 100644 --- a/integration-tests/ssh/pom.xml +++ b/integration-tests/ssh/pom.xml @@ -71,8 +71,7 @@ - + virtualDependencies diff --git a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java index 9cf3c3f78c..4681ee0a94 100644 --- a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java +++ b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java @@ -20,7 +20,6 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,7 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class SshTest { @Test -@Disabled //temporarily disabled because of https://github.com/apache/camel-quarkus/issues/5092 public void testWriteToSSHAndReadFromSSH() { final String fileContent = "Hello Camel Quarkus SSH"; // Write a file to SSH session
[camel-quarkus] 09/21: generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f3b3b49e85ee50480c350b87705b811786172a4b Author: JiriOndrusek AuthorDate: Mon Jul 17 08:48:47 2023 +0200 generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 30 +++--- .../src/main/generated/flattened-reduced-pom.xml | 30 +++--- .../generated/flattened-reduced-verbose-pom.xml| 30 +++--- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b8a76a5adf..e4b0ff8584 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5917,7 +5917,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -6.6.1 +6.6.2 com.google.code.findbugs @@ -5936,32 +5936,32 @@ ca.uhn.hapi.fhir hapi-fhir-client -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -6.6.1 +6.6.2 ca.uhn.hapi.fhir @@ -6193,7 +6193,7 @@ io.projectreactor.netty reactor-netty -1.1.6 +1.1.9 io.quarkiverse.freemarker @@ -6564,7 +6564,7 @@ org.springframework spring-aop -6.0.10 +6.0.11 org.springframework @@ -6579,7 +6579,7 @@ org.springframework spring-expression -6.0.10 +6.0.11 org.springframework @@ -6590,7 +6590,7 @@ org.springframework spring-jdbc -6.0.10 +6.0.11 org.springframework @@ -6605,7 +6605,7 @@ org.springframework spring-jms -6.0.10 +6.0.11 org.springframework @@ -6620,7 +6620,7 @@ org.springframework spring-messaging -6.0.10 +6.0.11 org.springframework @@ -6635,7 +6635,7 @@ org.springframework spring-orm -6.0.10 +6.0.11 org.springframework @@ -6650,7 +6650,7 @@ org.springframework spring-tx -6.0.10 +6.0.11 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index ddb9bc42d7..e55b1dadcf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -5917,7 +5917,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -6.6.1 +6.6.2 com.google.code.findbugs @@ -5936,32 +5936,32 @@ ca.uhn.hapi.fhir hapi-fhir-client -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -6.6.1 +6.6.2 ca.uhn.hapi.fhir @@ -6193,7 +6193,7 @@ io.projectreactor.netty reactor-netty -1.1.6 +1.1.9 io.quarkiverse.freemarker @@ -6544,7 +6544,7 @@ org.springframework spring-aop -6.0.10 +6.0.11 org.springframework @@ -6559,7 +6559,7 @@ org.springframework spring-expression -6.0.10 +6.0.11 org.springframework @@ -6570,7 +6570,7 @@ org.springframework spring-jdbc -6.0.10 +6.0.11 org.springframework @@ -6585,7 +6585,7 @@ org.springframework spring-jms -
[camel-quarkus] 07/21: Fixed twitter + generated stuff.
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f626565b1b4727b4efe0fdc863a5afa3856e57c9 Author: JiriOndrusek AuthorDate: Thu Jul 13 17:13:54 2023 +0200 Fixed twitter + generated stuff. --- .../src/generated/resources/org/apache/camel/component/qute/qute.json | 2 +- .../camel/quarkus/component/twitter/deployment/TwitterProcessor.java| 2 +- .../java/org/apache/camel/quarkus/component/twitter/CamelResource.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json index 21cef72912..653cb4fcb8 100644 --- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json +++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json @@ -28,7 +28,7 @@ "quteEngine": { "index": 3, "kind": "property", "displayName": "Qute Engine", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.quarkus.qute.Engine", "deprecated": false, "autowired": false, "secret": false, "description": "To use the Engine otherwise a new engine is created" } }, "properties": { -"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registr [...] +"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will look [...] "allowContextMapAll": { "index": 1, "kind": "parameter", "displayName": "Allow Context Map All", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and C [...] "allowTemplateFromHeader": { "index": 2, "kind": "parameter", "displayName": "Allow Template From Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential s [...] "contentCache": { "index": 3, "kind": "parameter", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether to use resource content cache or not" }, diff --git a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java index 60a5d06614..7e1e9348ba 100644 --- a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java +++ b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java @@ -25,7 +25,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import org.apache.camel.component.twitter.AbstractTwitterComponent; -import twitter4j.auth.OAuthAuthorization; +import twitter4j.OAuthAuthorization; class TwitterProcessor { private static final String FEATURE = "camel-twitter"; diff --git a/integration-tests/twitter/src/main/java/org/apache/camel/quarkus/component/twitter/CamelResource.java
[camel-quarkus] 02/21: synced + generated files
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d0ae9b988dce15195d94fdeada028f43108e9494 Author: JiriOndrusek AuthorDate: Mon Jul 10 09:40:35 2023 +0200 synced + generated files --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 15319a3f5b..036f609899 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ 1.313 ${google-auth-library-oauth2-http-version} ${google-oauth-client-version} -0.182.1 - 1.121.0 -1.121.0 +0.199.0 + 1.123.17 + 1.123.17 22.3.2 4.0.13 1.56.0 @@ -132,7 +132,7 @@ ${mapstruct-version} 8.2.2 1.13.8 -2.4.15.Final +2.5.0.Final 3.5.11 1.48.0 ${squareup-okio-version}
[camel-quarkus] 04/21: Fixed version conflict + substitution in json-validator
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1ac2b11fb575697ea0dd37a5447ff680cec86998 Author: JiriOndrusek AuthorDate: Wed Jul 12 14:51:26 2023 +0200 Fixed version conflict + substitution in json-validator --- .../graal/JsonValidatorSubstitutions.java | 39 +++--- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java b/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java index 82518ba3fd..5237dc65a3 100644 --- a/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java +++ b/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java @@ -19,16 +19,10 @@ package org.apache.camel.quarkus.component.json.validator.graal; import java.lang.reflect.Constructor; import java.util.function.BooleanSupplier; -import com.fasterxml.jackson.databind.JsonNode; -import com.networknt.schema.JsonSchema; -import com.networknt.schema.JsonValidator; -import com.networknt.schema.PatternValidator; import com.networknt.schema.ValidationContext; -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.Delete; +import com.networknt.schema.regex.RegularExpression; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.TargetElement; /** * Removes references to PatternValidatorEcma262Deletion, which requires optional org.jruby.joni:joni @@ -36,36 +30,27 @@ import com.oracle.svm.core.annotate.TargetElement; public class JsonValidatorSubstitutions { } -@TargetClass(value = PatternValidator.class, onlyWith = IsJoniAbsent.class) -final class PatternValidatorSubstitutions { -@Alias -private JsonValidator delegate; -@Alias -private ValidationContext validationContext; +@TargetClass(value = RegularExpression.class, onlyWith = IsJoniAbsent.class) +@Substitute +interface RegularExpressionSubstitutions { +@Substitute +boolean matches(String value); @Substitute -@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) -public PatternValidatorSubstitutions(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, -ValidationContext validationContext) { +static RegularExpression compile(String regex, ValidationContext validationContext) { +if (null == regex) +return s -> true; try { -Class clazz = Class.forName("com.networknt.schema.PatternValidator$PatternValidatorJava"); -Constructor constructor = clazz.getDeclaredConstructor(String.class, JsonNode.class, JsonSchema.class, -ValidationContext.class); +Class clazz = Class.forName("com.networknt.schema.regex.JDKRegularExpression"); +Constructor constructor = clazz.getDeclaredConstructor(String.class); -this.validationContext = validationContext; -this.delegate = (JsonValidator) constructor.newInstance(schemaPath, schemaNode, parentSchema, -validationContext); +return (RegularExpression) constructor.newInstance(regex); } catch (Exception e) { throw new RuntimeException(e); } } } -@TargetClass(className = "com.networknt.schema.PatternValidator$PatternValidatorEcma262", onlyWith = IsJoniAbsent.class) -@Delete -final class PatternValidatorEcma262Deletion { -} - final class IsJoniAbsent implements BooleanSupplier { @Override public boolean getAsBoolean() {
[camel-quarkus] 16/21: Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d583ec9d7f97dc3d65277bf5fd26213f355f948e Author: JiriOndrusek AuthorDate: Wed Jul 19 12:32:37 2023 +0200 Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 --- poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 - poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 - 2 files changed, 10 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7a18d60f90..f6373ec294 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6336,11 +6336,6 @@ jakarta.jms-api 3.1.0 - -jaxen -jaxen -1.2.0 - joda-time joda-time diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d69c679e8e..4db76fb393 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6336,11 +6336,6 @@ jakarta.jms-api 3.1.0 - -jaxen -jaxen -1.2.0 - joda-time joda-time
[camel-quarkus] 11/21: POM regen
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9021f186285f062bdcb6b578c76e32f82bb48cae Author: JiriOndrusek AuthorDate: Mon Jul 17 14:07:37 2023 +0200 POM regen --- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e4b0ff8584..9210ee5ba6 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e55b1dadcf..e63e957e0b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 7947aebfd3..1e403ecbae 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto
[camel-quarkus] 20/21: generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 021b7b8c67e9f1f4d4a3ac3f63454317e026e57b Author: JiriOndrusek AuthorDate: Fri Jul 21 09:16:33 2023 +0200 generated poms --- pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 0a8b560c49..398c777f66 100644 --- a/pom.xml +++ b/pom.xml @@ -97,9 +97,9 @@ 1.313 ${google-auth-library-oauth2-http-version} ${google-oauth-client-version} -0.199.0 - 1.123.17 - 1.123.17 +0.200.0 + 1.123.18 + 1.123.18 22.3.2 4.0.13 1.56.0 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1e5eabeb84..4d576219a8 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6464,7 +6464,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6479,7 +6479,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d97c9a7815..4ee5110ee7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6439,7 +6439,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6454,7 +6454,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 68c3d6ed5a..8d3824dce6 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6439,7 +6439,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6454,7 +6454,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient
[camel-quarkus] 18/21: Fixed arangodb + generated pomns
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit bbe457e96a8ff337a4ac51800640393bf90754cf Author: JiriOndrusek AuthorDate: Thu Jul 20 11:03:39 2023 +0200 Fixed arangodb + generated pomns --- .../component/arangodb/it/ArangodbResource.java| 58 + .../component/arangodb/it/ArangodbTest.java| 75 +- .../arangodb/it/ArangodbTestResource.java | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 10 +-- .../src/main/generated/flattened-reduced-pom.xml | 10 +-- .../generated/flattened-reduced-verbose-pom.xml| 10 +-- 6 files changed, 91 insertions(+), 74 deletions(-) diff --git a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java index e56adbcb65..8da0ca2ef0 100644 --- a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java +++ b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java @@ -17,10 +17,13 @@ package org.apache.camel.quarkus.component.arangodb.it; import java.net.URI; -import java.util.Collection; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import com.arangodb.entity.BaseDocument; import com.arangodb.entity.DocumentCreateEntity; import com.arangodb.entity.DocumentDeleteEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -36,6 +39,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.camel.ProducerTemplate; +import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; import static org.apache.camel.component.arangodb.ArangoDbConstants.AQL_QUERY; @@ -44,7 +48,7 @@ import static org.apache.camel.component.arangodb.ArangoDbConstants.AQL_QUERY_OP import static org.apache.camel.component.arangodb.ArangoDbConstants.ARANGO_KEY; import static org.apache.camel.component.arangodb.ArangoDbConstants.RESULT_CLASS_TYPE; -@Path("/arangodb/camel") +@Path("/arangodb") @ApplicationScoped public class ArangodbResource { @@ -53,14 +57,20 @@ public class ArangodbResource { @Inject ProducerTemplate producerTemplate; +@ConfigProperty(name = "camel.arangodb.host") +String host; + +@ConfigProperty(name = "camel.arangodb.port") +String port; + @PUT @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN) public Response put(String message) throws Exception { LOG.infof("Saving to arangodb: %s", message); final DocumentCreateEntity response = producerTemplate.requestBody( - "arangodb:test?host={{camel.arangodb.host}}={{camel.arangodb.port}}=camel=SAVE_DOCUMENT", -message, DocumentCreateEntity.class); + String.format("arangodb:test?host=%s=%s=camel=SAVE_DOCUMENT", host, port), +toDocument(message), DocumentCreateEntity.class); LOG.infof("Got response from arangodb: %s", response); return Response .created(new URI("https://camel.apache.org/;)) @@ -73,13 +83,13 @@ public class ArangodbResource { @Produces(MediaType.TEXT_PLAIN) public Response get(@PathParam("key") String key) throws Exception { LOG.infof("Retrieve document from arangodb with key: %s", key); -final String response = producerTemplate.requestBodyAndHeader( +final BaseDocument response = producerTemplate.requestBodyAndHeader( "arangodb:test?host={{camel.arangodb.host}}={{camel.arangodb.port}}=camel=FIND_DOCUMENT_BY_KEY", -key, RESULT_CLASS_TYPE, String.class, String.class); +key, RESULT_CLASS_TYPE, BaseDocument.class, BaseDocument.class); LOG.infof("Got response from arangodb: %s", response); return Response .ok() -.entity(response) +.entity(toString(response)) .build(); } @@ -107,7 +117,7 @@ public class ArangodbResource { producerTemplate.requestBodyAndHeaders( "arangodb:test?host={{camel.arangodb.host}}={{camel.arangodb.port}}=camel=UPDATE_DOCUMENT", -msg, headers, String.class); +toDocument(msg), headers, String.class); return Response .ok() .build(); @@ -126,15 +136,39 @@ public class ArangodbResource { headers.put(AQL_QUERY, query); headers.put(AQL_QUERY_BIND_PARAMETERS, bindVars); headers.put(AQL_QUERY_OPTIONS, null); -
[camel-quarkus] 10/21: Workaround for dataformat (because of iCal4j update - #5099
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit cc41eb9ef1d403d06fcfd8c48fa269b5c9dff4da Author: JiriOndrusek AuthorDate: Mon Jul 17 12:50:47 2023 +0200 Workaround for dataformat (because of iCal4j update - #5099 --- .../component/ical/deployment/IcalProcessor.java | 22 .../deployment/SchemaValidatorFactorySubst.java| 39 ++ 2 files changed, 61 insertions(+) diff --git a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java index 23c1623539..989dd7cd8c 100644 --- a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java +++ b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java @@ -20,9 +20,13 @@ import java.util.stream.Stream; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; class IcalProcessor { @@ -57,4 +61,22 @@ class IcalProcessor { .forEach(path -> nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem(path))); } +@BuildStep +void registerWsSecurityReflectionItems(CombinedIndexBuildItem combinedIndexBuildItem, +BuildProducer reflectiveClass) { +reflectiveClass + .produce(ReflectiveClassBuildItem.builder("net.fortuna.ical4j.util.MapTimeZoneCache").methods(true).build()); +} + +@BuildStep +IndexDependencyBuildItem registerDependencyForIndex() { +return new IndexDependencyBuildItem("org.mnode.ical4j", "ical4j"); +} + +@BuildStep +void runtimeInitializedClasses(BuildProducer runtimeInitializedClass) { +runtimeInitializedClass +.produce(new RuntimeInitializedClassBuildItem("net.fortuna.ical4j.validate.schema.JsonSchemaValidator")); +} + } diff --git a/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java b/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java new file mode 100644 index 00..e3f6e3447a --- /dev/null +++ b/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java @@ -0,0 +1,39 @@ +/* + * 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.quarkus.component.ical.deployment; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import net.fortuna.ical4j.model.parameter.Schema; +import net.fortuna.ical4j.model.property.StructuredData; +import net.fortuna.ical4j.validate.Validator; +import net.fortuna.ical4j.validate.schema.SchemaValidatorFactory; + +@TargetClass(value = SchemaValidatorFactory.class) +final class SchemaValidatorFactorySubstitutions { + +@Substitute +public static Validator newInstance(Schema schema) { +//see https://github.com/apache/camel-quarkus/issues/5099 for more details +//Method causes error (it is unclear to me, why it is happening): +//UnresolvedElementException: Discovered unresolved method during parsing: net.fortuna.ical4j.validate.schema.JsonSchemaValidator.(java.net.URL). +// This error is reported at image build time because class net.fortuna.ical4j.validate.schema.SchemaValidatorFactory +
[camel-quarkus] 08/21: Fixed Slack
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 3bdda5a03fb2748ac03cc89b3103665237547efd Author: JiriOndrusek AuthorDate: Fri Jul 14 09:31:46 2023 +0200 Fixed Slack --- .../component/slack/graal/SlackSubstitutions.java | 47 ++ 1 file changed, 47 insertions(+) diff --git a/extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java b/extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java index ae481858db..64afbb4087 100644 --- a/extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java +++ b/extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java @@ -30,6 +30,7 @@ import com.slack.api.audit.AuditConfig; import com.slack.api.methods.MethodsConfig; import com.slack.api.rate_limits.metrics.MetricsDatastore; import com.slack.api.scim.SCIMConfig; +import com.slack.api.scim2.SCIM2Config; import com.slack.api.util.http.listener.DetailedLoggingListener; import com.slack.api.util.http.listener.HttpResponseListener; import com.slack.api.util.http.listener.ResponsePrettyPrintingListener; @@ -162,6 +163,44 @@ final class SlackConfigSubstitutions { } }; +@Alias +@RecomputeFieldValue(kind = Reset) +private SCIM2Config sCIM2Config = new SCIM2Config() { +void throwException() { +throw new UnsupportedOperationException("This config is immutable"); +} + +@Override +public void setStatsEnabled(boolean statsEnabled) { +throwException(); +} + +@Override +public void setExecutorName(String executorName) { +throwException(); +} + +@Override +public void setMaxIdleMills(int maxIdleMills) { +throwException(); +} + +@Override +public void setDefaultThreadPoolSize(int defaultThreadPoolSize) { +throwException(); +} + +@Override +public void setMetricsDatastore(MetricsDatastore metricsDatastore) { +throwException(); +} + +@Override +public void setCustomThreadPoolSizes(Map customThreadPoolSizes) { +throwException(); +} +}; + @Alias private ExecutorServiceProvider executorServiceProvider; @Alias @@ -199,3 +238,11 @@ final class SCIMConfigSubstitutions { @RecomputeFieldValue(kind = Reset) public static SCIMConfig DEFAULT_SINGLETON = null; } + +@TargetClass(SCIM2Config.class) +final class SCIM2ConfigSubstitutions { + +@Alias +@RecomputeFieldValue(kind = Reset) +public static SCIM2Config DEFAULT_SINGLETON = null; +}
[camel-quarkus] 21/21: Fixed aws2-kinesis
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 8630e84ada563774e68309427b6274469cfbf60b Author: JiriOndrusek AuthorDate: Fri Jul 21 13:46:36 2023 +0200 Fixed aws2-kinesis --- .../component/aws2/kinesis/it/Aws2KinesisResource.java| 6 +- .../component/aws2/kinesis/it/Aws2KinesisRoutes.java | 9 + .../aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java | 15 +++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java index d3a556d253..fdbeeff70a 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java @@ -45,6 +45,9 @@ public class Aws2KinesisResource extends BaseAws2Resource { @ConfigProperty(name = "aws-kinesis.stream-name") String streamName; +@ConfigProperty(name = "aws-kinesis.stream-name-for-default-credentials") +String streamNameForDefaultCredentials; + @Inject ProducerTemplate producerTemplate; @@ -81,7 +84,8 @@ public class Aws2KinesisResource extends BaseAws2Resource { } private String componentUri() { -return "aws2-kinesis://" + streamName + "?useDefaultCredentialsProvider=" + isUseDefaultCredentials(); +return "aws2-kinesis://" + (isUseDefaultCredentials() ? streamNameForDefaultCredentials : streamName) ++ "?useDefaultCredentialsProvider=" + isUseDefaultCredentials(); } } diff --git a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java index bf6433ef9f..5b6a701da5 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java @@ -32,6 +32,9 @@ public class Aws2KinesisRoutes extends RouteBuilder { @ConfigProperty(name = "aws-kinesis.stream-name") String streamName; +@ConfigProperty(name = "aws-kinesis.stream-name-for-default-credentials") +String streamNameForDefaultCredentials; + @Inject @Named("aws2KinesisMessages") Queue aws2KinesisMessages; @@ -40,10 +43,16 @@ public class Aws2KinesisRoutes extends RouteBuilder { return "aws2-kinesis://" + streamName; } +private String componentUriForDefaultCredentials() { +return "aws2-kinesis://" + streamNameForDefaultCredentials; +} + @Override public void configure() throws Exception { from(componentUri()) .process(exchange -> aws2KinesisMessages.add(exchange.getMessage().getBody(String.class))); +from(componentUriForDefaultCredentials()) +.process(exchange -> aws2KinesisMessages.add(exchange.getMessage().getBody(String.class))); } static class Producers { diff --git a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java index 4486af899c..99d7718a8c 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java @@ -79,6 +79,8 @@ public class Aws2KinesisTestEnvCustomizer implements Aws2TestEnvCustomizer { public void customize(Aws2TestEnvContext envContext) { final String streamName = "camel-quarkus-" + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); +final String streamNameForDefaultCredentials = "camel-quarkus-" ++ RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); final String streamArn; { envContext.property("aws-kinesis.stream-name", streamName); @@ -99,6 +101,19 @@ public class Aws2KinesisTestEnvCustomizer implements Aws2TestEnvCustomizer { envContext.closeable(() ->
[camel-quarkus] 13/21: Proper fix of tika version conflict + generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 047db3413cb9fd7a9bd48c4561979c4d97386d83 Author: JiriOndrusek AuthorDate: Tue Jul 18 16:21:15 2023 +0200 Proper fix of tika version conflict + generated poms --- poms/bom/pom.xml | 15 +++ poms/bom/src/main/generated/flattened-full-pom.xml| 15 +++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +++ .../src/main/generated/flattened-reduced-verbose-pom.xml | 15 +++ 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index fdcae4dcae..a1b8d23ab1 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6386,10 +6386,6 @@ commons-logging commons-logging - -fontbox -org.apache.pdfbox - @@ -6515,6 +6511,17 @@ kudu-client ${kudu.version} + +org.apache.pdfbox +fontbox +${pdfbox.version} + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index ecdfd44de6..0849da1c1c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6428,6 +6424,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 58aa26a8b8..52cf685193 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6418,6 +6414,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 5be4fdd539..3e75c27e15 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6418,6 +6414,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons
[camel-quarkus] branch camel-main updated (6f536f3281 -> 8630e84ada)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 6f536f3281 Fixed aws2-kinesis discard b6aedcbdbe generated poms discard 08c8091902 Fixed web3j + generated poms discard af0693a188 Fixed arangodb + generated pomns discard 72ddabb791 enabled ssh discard ad41af24b4 Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 discard a628accd99 Fixed Atom discard 27d134ae61 Fixed ArangoDB and google-secret-manager version conflict + generated poms discard 3ba4a9e91c Proper fix of tika version conflict + generated poms discard 1078609654 Fixed tika version conflict + regen of poms discard 4df5185433 POM regen discard 4c96358e0c Workaround for dataformat (because of iCal4j update - #5099 discard 235a28ea0b generated poms discard a3df65ca73 Fixed Slack discard 5ccc91c9c3 Fixed twitter + generated stuff. discard 7f063c76d2 generated POMs discard 25e3849301 fixed debezium version problem discard 4622a74b05 Fixed version conflict + substitution in json-validator discard c124bece99 fixed optaplanner version conflict + generated files discard e637a414c9 synced + generated files discard da1624ebb6 Upgrade Camel to 4.0.0 add 9ac6ee8f91 Do not produce JmxMeterRegistry bean in native mode testing add fb1eaa11db Upgrade Quarkus to 3.2.2.Final new eb5b0817f7 Upgrade Camel to 4.0.0 new d0ae9b988d synced + generated files new 5a9f64f870 fixed optaplanner version conflict + generated files new 1ac2b11fb5 Fixed version conflict + substitution in json-validator new 635574c8c7 fixed debezium version problem new 69002a0390 generated POMs new f626565b1b Fixed twitter + generated stuff. new 3bdda5a03f Fixed Slack new f3b3b49e85 generated poms new cc41eb9ef1 Workaround for dataformat (because of iCal4j update - #5099 new 9021f18628 POM regen new ae750ddc1e Fixed tika version conflict + regen of poms new 047db3413c Proper fix of tika version conflict + generated poms new a345b12ae7 Fixed ArangoDB and google-secret-manager version conflict + generated poms new 6812f79a1c Fixed Atom new d583ec9d7f Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 new bf42e3879a enabled ssh new bbe457e96a Fixed arangodb + generated pomns new 563ba7df59 Fixed web3j + generated poms new 021b7b8c67 generated poms new 8630e84ada Fixed aws2-kinesis 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 (6f536f3281) \ N -- N -- N refs/heads/camel-main (8630e84ada) 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 21 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: docs/antora.yml | 2 +- .../camel/quarkus/component/micrometer/it/MicrometerProducers.java | 2 ++ pom.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
[camel-quarkus] 03/21: fixed optaplanner version conflict + generated files
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 5a9f64f87099c0537c51c2a3aa6c09cdc4cf7267 Author: JiriOndrusek AuthorDate: Wed Jul 12 09:22:37 2023 +0200 fixed optaplanner version conflict + generated files --- poms/bom/pom.xml | 8 poms/bom/src/main/generated/flattened-full-pom.xml| 10 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +-- .../src/main/generated/flattened-reduced-verbose-pom.xml | 15 +-- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 3b70a8ccb2..b5f0040b28 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2000,6 +2000,14 @@ org.optaplanner optaplanner-core + +org.optaplanner +optaplanner-core-impl + + +org.optaplanner +optaplanner-persistence-common + diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 25d4313c77..ba936a2e5c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -53,7 +53,7 @@ org.apache.camel camel-activemq -4.0.0-RC1 +4.0.0-SNAPSHOT org.apache.camel @@ -1938,6 +1938,14 @@ org.optaplanner optaplanner-core + +org.optaplanner +optaplanner-core-impl + + +org.optaplanner +optaplanner-persistence-common + diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 4e382a7d23..8fa9b76c43 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -53,7 +53,7 @@ org.apache.camel camel-activemq -4.0.0-RC1 +4.0.0-SNAPSHOT org.apache.camel @@ -1938,6 +1938,14 @@ org.optaplanner optaplanner-core + +org.optaplanner +optaplanner-core-impl + + +org.optaplanner +optaplanner-persistence-common + @@ -6493,11 +6501,6 @@ javassist 3.28.0-GA - -org.jetbrains.kotlin -kotlin-script-util -1.8.22 - org.jetbrains.kotlin kotlin-scripting-jvm diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 91f0a1f31f..37c644a57b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -53,7 +53,7 @@ org.apache.camel camel-activemq -4.0.0-RC1 +4.0.0-SNAPSHOT org.apache.camel @@ -1938,6 +1938,14 @@ org.optaplanner optaplanner-core + +org.optaplanner +optaplanner-core-impl + + +org.optaplanner +optaplanner-persistence-common + @@ -6493,11 +6501,6 @@ javassist 3.28.0-GA - -org.jetbrains.kotlin -kotlin-script-util -1.8.22 - org.jetbrains.kotlin kotlin-scripting-jvm
[camel-quarkus] 06/21: generated POMs
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 69002a03906a39fa47877bb504d26fa5f4de2a21 Author: JiriOndrusek AuthorDate: Thu Jul 13 12:51:19 2023 +0200 generated POMs --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 35457be641..b8a76a5adf 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6514,7 +6514,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 2579bfed7e..ddb9bc42d7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6499,7 +6499,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 3023fad4f1..5447bf7fc3 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6499,7 +6499,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin
[camel-quarkus] 15/21: Fixed Atom
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6812f79a1c5602cb0a5010a8eaea32484f981484 Author: JiriOndrusek AuthorDate: Wed Jul 19 11:09:35 2023 +0200 Fixed Atom --- .../component/atom/deployment/AtomProcessor.java | 8 -- .../quarkus/component/atom/it/AtomResource.java| 33 +- .../src/main/resources/META-INF/resources/atom.xml | 6 ++-- .../camel/quarkus/component/atom/it/AtomTest.java | 10 ++- 4 files changed, 19 insertions(+), 38 deletions(-) diff --git a/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java b/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java index 2956932b33..681b68246a 100644 --- a/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java +++ b/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java @@ -18,9 +18,6 @@ package org.apache.camel.quarkus.component.atom.deployment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import org.apache.abdera.parser.stax.FOMFactory; -import org.apache.abdera.parser.stax.FOMParser; class AtomProcessor { @@ -30,9 +27,4 @@ class AtomProcessor { FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); } - -@BuildStep -ReflectiveClassBuildItem registerForReflection() { -return ReflectiveClassBuildItem.builder(FOMParser.class, FOMFactory.class).build(); -} } diff --git a/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java b/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java index 5a0e5a4995..46039e9de8 100644 --- a/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java +++ b/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java @@ -16,6 +16,9 @@ */ package org.apache.camel.quarkus.component.atom.it; +import java.util.List; + +import com.apptasticsoftware.rssreader.Item; import jakarta.inject.Inject; import jakarta.json.Json; import jakarta.json.JsonArrayBuilder; @@ -26,8 +29,6 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import org.apache.abdera.model.Entry; -import org.apache.abdera.model.Feed; import org.apache.camel.ConsumerTemplate; import org.apache.camel.Exchange; import org.apache.camel.component.atom.AtomConstants; @@ -43,27 +44,19 @@ public class AtomResource { @Produces(MediaType.APPLICATION_JSON) public JsonObject consumeAtomFeed(@QueryParam("test-port") int port) throws Exception { Exchange exchange = consumerTemplate.receive("atom://http://localhost:; + port + "/atom.xml?splitEntries=false"); -Feed feed = exchange.getMessage().getHeader(AtomConstants.ATOM_FEED, Feed.class); - -JsonObjectBuilder atom = Json.createObjectBuilder(); -atom.add("title", feed.getTitle()); -atom.add("subtitle", feed.getSubtitle()); -atom.add("link", feed.getLinks().get(0).getHref().toASCIIString()); +List feed = exchange.getIn().getHeader(AtomConstants.ATOM_FEED, List.class); +JsonArrayBuilder atom = Json.createArrayBuilder(); -JsonArrayBuilder entries = Json.createArrayBuilder(); - -for (Entry entry : feed.getEntries()) { +for (Item entry : feed) { JsonObjectBuilder atomEntry = Json.createObjectBuilder(); -atomEntry.add("title", entry.getTitle()); -atomEntry.add("link", entry.getLinks().get(0).getHref().toASCIIString()); -atomEntry.add("summary", entry.getSummary()); -atomEntry.add("content", entry.getContent()); -atomEntry.add("author", entry.getAuthor().getName()); -entries.add(atomEntry); +atomEntry.add("title", entry.getTitle().get()); +atomEntry.add("link", entry.getLink().get()); +atomEntry.add("comments", entry.getComments().get()); +atomEntry.add("description", entry.getDescription().get()); +atomEntry.add("author", entry.getAuthor().get()); +atom.add(atomEntry); } -atom.add("entries", entries.build()); - -return atom.build(); +return Json.createObjectBuilder().add("entries", atom.build()).build(); } } diff --git a/integration-tests/syndication/src/main/resources/META-INF/resources/atom.xml
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1646442338 Build fixed with: * Camel Quarkus Commit: 8630e84ada563774e68309427b6274469cfbf60b * Camel Main Commit: fb1eaa11db707bd20bbebf542d7713b381c9227a * Link to build: https://github.com/apache/camel-quarkus/actions/runs/5627668072 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2927 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 1b28881956 Updated CHANGELOG.md 1b28881956 is described below commit 1b2888195604317ef22570170a3703b4658b4d4e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Jul 22 03:16:25 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1067fa9ddf..27c14e6aeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ **Fixed bugs:** +- \[Quarkus 3.3.0\] Micrometer native integration test application throws NPE on startup [\#5109](https://github.com/apache/camel-quarkus/issues/5109) - Re-add activemq extension after it was added back in Camel 4.0.0-RC1 [\#5087](https://github.com/apache/camel-quarkus/issues/5087) - MicrometerTest.testJMXQuarkusDomain\(\) fail with Quarkus Platform BOMs [\#5086](https://github.com/apache/camel-quarkus/issues/5086) - NettyHttpJaasTestResource reads config.jaas from disk [\#5083](https://github.com/apache/camel-quarkus/issues/5083) @@ -29,6 +30,10 @@ **Merged pull requests:** +- Upgrade Quarkus to 3.2.2.Final [\#5114](https://github.com/apache/camel-quarkus/pull/5114) ([jamesnetherton](https://github.com/jamesnetherton)) +- Do not produce JmxMeterRegistry bean in native mode testing [\#5113](https://github.com/apache/camel-quarkus/pull/5113) ([jamesnetherton](https://github.com/jamesnetherton)) +- Build Camel from source for camel-main branch builds [\#5112](https://github.com/apache/camel-quarkus/pull/5112) ([jamesnetherton](https://github.com/jamesnetherton)) +- Fix hamcrest GAV in bom-test [\#5106](https://github.com/apache/camel-quarkus/pull/5106) ([claudio4j](https://github.com/claudio4j)) - Upgrade Quarkus to 3.2.1.final [\#5105](https://github.com/apache/camel-quarkus/pull/5105) ([jamesnetherton](https://github.com/jamesnetherton)) - Added atlassion-groupId for the correct functionality with the 'io.atlassian.fugue' [\#5104](https://github.com/apache/camel-quarkus/pull/5104) ([JiriOndrusek](https://github.com/JiriOndrusek)) - Add missing graal-sdk dependency declaration to extensions that use GraalVM APIs [\#5103](https://github.com/apache/camel-quarkus/pull/5103) ([jamesnetherton](https://github.com/jamesnetherton))
[camel-karavan] branch main updated (0362f7ed -> b8ac47a4)
This is an automated email from the ASF dual-hosted git repository. marat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git from 0362f7ed Doc improvements #743 new 365e9d6a karavan-infinispan #817 new fc9c11fb karavan-headless #817 new e93a16a3 karavan-infinispan #817 new 333d04f0 karavan-headless #817 new b8ac47a4 karavan-app #817 The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../karavan-app/Dockerfile.legacy-jar.dockerignore | 5 - .../karavan-app/Dockerfile.multistage.dockerignore | 3 - karavan-web/karavan-app/pom.xml| 60 ++- .../src/main/docker/Dockerfile.legacy-jar | 41 .../src/main/docker/Dockerfile.multistage | 66 .../apache/camel/karavan/api/DevModeResource.java | 4 +- .../camel/karavan/docker/DockerEventListener.java | 5 +- .../apache/camel/karavan/docker/DockerService.java | 57 +-- .../karavan/kubernetes/KubernetesService.java | 2 +- .../camel/karavan/kubernetes/PodEventHandler.java | 3 +- .../apache/camel/karavan/service/CamelService.java | 42 +++- .../apache/camel/karavan/service/EventService.java | 25 +++-- .../camel/karavan/service/ScheduledService.java| 17 ++-- .../apache/camel/karavan/shared/ConfigService.java | 7 ++ .../org/apache/camel/karavan/shared/EventType.java | 2 +- .../src/main/resources/application.properties | 15 +-- .../src/test/resources/application.properties | 11 -- .../.dockerignore | 0 .../.mvn/wrapper/maven-wrapper.properties | 0 .../Dockerfile.distroless.dockerignore | 0 .../karavan-headless}/mvnw | 0 .../karavan-headless}/mvnw.cmd | 0 .../karavan-headless}/pom.xml | 110 ++-- .../src/main/docker/Dockerfile.distroless | 0 .../camel/karavan/headless}/CamelService.java | 63 .../camel/karavan/headless/EventService.java | 52 ++ .../camel/karavan/headless/HeadlessService.java} | 38 +++ .../src/main/resources/application.properties | 14 +++ .../.mvn/wrapper/maven-wrapper.properties | 0 .../karavan-infinispan}/mvnw | 0 .../karavan-infinispan}/mvnw.cmd | 0 .../karavan-infinispan}/pom.xml| 112 +++-- .../karavan/infinispan/CodeReloadListener.java | 30 ++ .../karavan/infinispan/InfinispanService.java | 42 ++-- .../karavan/infinispan/model/CamelStatus.java | 0 .../camel/karavan/infinispan/model/CommitInfo.java | 0 .../karavan/infinispan/model/ContainerInfo.java| 0 .../karavan/infinispan/model/ContainerStatus.java | 33 +- .../karavan/infinispan/model/DeploymentStatus.java | 0 .../karavan/infinispan/model/DevModeStatus.java| 0 .../camel/karavan/infinispan/model/GitConfig.java | 0 .../camel/karavan/infinispan/model/GitRepo.java| 0 .../karavan/infinispan/model/GitRepoFile.java | 0 .../camel/karavan/infinispan/model/GroupedKey.java | 9 ++ .../karavan/infinispan/model/KaravanSchema.java| 0 .../karavan/infinispan/model/PipelineStatus.java | 0 .../camel/karavan/infinispan/model/Project.java| 0 .../karavan/infinispan/model/ProjectFile.java | 0 .../karavan/infinispan/model/ServiceStatus.java| 0 .../src/main/resources/application.properties | 14 +++ .../main/resources/cache/command-cache-config.xml | 0 .../src/main/resources/cache/data-cache-config.xml | 0 .../camel/karavan/infinispan/DataGridTest.java | 27 - karavan-web/pom.xml| 8 +- 54 files changed, 443 insertions(+), 474 deletions(-) delete mode 100644 karavan-web/karavan-app/Dockerfile.legacy-jar.dockerignore delete mode 100644 karavan-web/karavan-app/Dockerfile.multistage.dockerignore delete mode 100644 karavan-web/karavan-app/src/main/docker/Dockerfile.legacy-jar delete mode 100644 karavan-web/karavan-app/src/main/docker/Dockerfile.multistage delete mode 100644 karavan-web/karavan-app/src/test/resources/application.properties copy karavan-web/{karavan-app => karavan-headless}/.dockerignore (100%) copy {karavan-generator => karavan-web/karavan-headless}/.mvn/wrapper/maven-wrapper.properties (100%) copy karavan-web/{karavan-app => karavan-headless}/Dockerfile.distroless.dockerignore (100%) copy {karavan-generator => karavan-web/karavan-headless}/mvnw (100%) copy {karavan-generator => karavan-web/karavan-headless}/mvnw.cmd (100%) copy {karavan-generator => karavan-web/karavan-headless}/pom.xml (51%) copy karavan-web/{karavan-app
[camel-karavan] 03/05: karavan-infinispan #817
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit e93a16a316567939afb098ba172bf2131f2a97d4 Author: Marat Gubaidullin AuthorDate: Fri Jul 21 21:18:42 2023 -0400 karavan-infinispan #817 --- .../karavan-app/Dockerfile.legacy-jar.dockerignore | 5 - .../karavan-app/Dockerfile.multistage.dockerignore | 3 - .../src/main/docker/Dockerfile.legacy-jar | 41 --- .../src/main/docker/Dockerfile.multistage | 66 .../karavan/infinispan/InfinispanService.java | 388 - .../karavan/infinispan/model/CamelStatus.java | 81 - .../camel/karavan/infinispan/model/CommitInfo.java | 53 --- .../karavan/infinispan/model/ContainerInfo.java| 70 .../karavan/infinispan/model/ContainerStatus.java | 141 .../karavan/infinispan/model/DeploymentStatus.java | 111 -- .../karavan/infinispan/model/DevModeStatus.java| 78 - .../camel/karavan/infinispan/model/GitConfig.java | 48 --- .../camel/karavan/infinispan/model/GitRepo.java| 49 --- .../karavan/infinispan/model/GitRepoFile.java | 37 -- .../camel/karavan/infinispan/model/GroupedKey.java | 72 .../karavan/infinispan/model/KaravanSchema.java| 28 -- .../karavan/infinispan/model/PipelineStatus.java | 83 - .../camel/karavan/infinispan/model/Project.java| 125 --- .../karavan/infinispan/model/ProjectFile.java | 71 .../karavan/infinispan/model/ServiceStatus.java| 107 -- .../main/resources/cache/command-cache-config.xml | 6 - .../src/main/resources/cache/data-cache-config.xml | 6 - .../camel/karavan/infinispan/DataGridTest.java | 53 --- .../src/test/resources/application.properties | 11 - .../karavan/infinispan/model/ContainerStatus.java | 33 +- 25 files changed, 5 insertions(+), 1761 deletions(-) diff --git a/karavan-web/karavan-app/Dockerfile.legacy-jar.dockerignore b/karavan-web/karavan-app/Dockerfile.legacy-jar.dockerignore deleted file mode 100644 index 94810d00.. --- a/karavan-web/karavan-app/Dockerfile.legacy-jar.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -* -!target/*-runner -!target/*-runner.jar -!target/lib/* -!target/quarkus-app/* \ No newline at end of file diff --git a/karavan-web/karavan-app/Dockerfile.multistage.dockerignore b/karavan-web/karavan-app/Dockerfile.multistage.dockerignore deleted file mode 100644 index 7e3ec665.. --- a/karavan-web/karavan-app/Dockerfile.multistage.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -target -karavan/src/main/webapp/build -karavan/src/main/webapp/node_modules \ No newline at end of file diff --git a/karavan-web/karavan-app/src/main/docker/Dockerfile.legacy-jar b/karavan-web/karavan-app/src/main/docker/Dockerfile.legacy-jar deleted file mode 100644 index ef0505cb.. --- a/karavan-web/karavan-app/src/main/docker/Dockerfile.legacy-jar +++ /dev/null @@ -1,41 +0,0 @@ -# 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. -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 - -ARG JAVA_PACKAGE=java-11-openjdk-headless -ARG RUN_JAVA_VERSION=1.3.8 -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' -# Install java and the run-java script -# Also set up permissions for user `1001` -RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \ -&& microdnf update \ -&& microdnf clean all \ -&& mkdir /deployments \ -&& chown 1001 /deployments \ -&& chmod "g+rwX" /deployments \ -&& chown 1001:root /deployments \ -&& curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \ -&& chown 1001 /deployments/run-java.sh \ -&& chmod 540 /deployments/run-java.sh \ -&& echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security - -# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size. -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -COPY target/*-runner.jar /deployments/app.jar - -EXPOSE 8080 -USER 1001 - -ENTRYPOINT [
[camel-karavan] 02/05: karavan-headless #817
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit fc9c11fbbebad3c006ee9344f2718bf4f68a8558 Author: Marat Gubaidullin AuthorDate: Fri Jul 21 20:59:25 2023 -0400 karavan-headless #817 --- karavan-web/karavan-headless/.dockerignore | 6 + .../.mvn/wrapper/maven-wrapper.properties | 18 ++ .../Dockerfile.distroless.dockerignore | 6 + karavan-web/karavan-headless/mvnw | 308 + karavan-web/karavan-headless/mvnw.cmd | 205 ++ karavan-web/karavan-headless/pom.xml | 126 + .../src/main/docker/Dockerfile.distroless | 18 ++ .../camel/karavan/headless/CamelService.java | 230 +++ .../camel/karavan/headless/EventService.java | 52 .../camel/karavan/headless/HeadlessService.java| 54 .../src/main/resources/application.properties | 14 + 11 files changed, 1037 insertions(+) diff --git a/karavan-web/karavan-headless/.dockerignore b/karavan-web/karavan-headless/.dockerignore new file mode 100644 index ..855da0f3 --- /dev/null +++ b/karavan-web/karavan-headless/.dockerignore @@ -0,0 +1,6 @@ +* +!target/*-runner +!target/*-runner.jar +!target/lib/* +!target/quarkus-app/* +src/* \ No newline at end of file diff --git a/karavan-web/karavan-headless/.mvn/wrapper/maven-wrapper.properties b/karavan-web/karavan-headless/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index ..70f4f50f --- /dev/null +++ b/karavan-web/karavan-headless/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/karavan-web/karavan-headless/Dockerfile.distroless.dockerignore b/karavan-web/karavan-headless/Dockerfile.distroless.dockerignore new file mode 100644 index ..855da0f3 --- /dev/null +++ b/karavan-web/karavan-headless/Dockerfile.distroless.dockerignore @@ -0,0 +1,6 @@ +* +!target/*-runner +!target/*-runner.jar +!target/lib/* +!target/quarkus-app/* +src/* \ No newline at end of file diff --git a/karavan-web/karavan-headless/mvnw b/karavan-web/karavan-headless/mvnw new file mode 100755 index ..8d937f4c --- /dev/null +++ b/karavan-web/karavan-headless/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# -- +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# - +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# + +if [ -z "$MAVEN_SKIP_RC"
[camel-karavan] 04/05: karavan-headless #817
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 333d04f079a16475f5ac36c82bc4c2865d87654f Author: Marat Gubaidullin AuthorDate: Fri Jul 21 21:19:01 2023 -0400 karavan-headless #817 --- .../camel/karavan/headless/CamelService.java | 38 -- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/CamelService.java b/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/CamelService.java index e26a697f..22372f0d 100644 --- a/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/CamelService.java +++ b/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/CamelService.java @@ -16,7 +16,6 @@ */ package org.apache.camel.karavan.headless; -import io.quarkus.vertx.ConsumeEvent; import io.vertx.core.json.JsonObject; import io.vertx.mutiny.core.Vertx; import io.vertx.mutiny.core.buffer.Buffer; @@ -70,9 +69,8 @@ public class CamelService { LOGGER.info("Reload project code " + projectId); try { ContainerStatus containerStatus = infinispanService.getDevModeContainerStatuses(projectId, environment); -Integer exposedPort = containerStatus.getExposedPort(); -infinispanService.getProjectFiles(projectId).forEach(projectFile -> putRequest(projectId,exposedPort, projectFile.getName(), projectFile.getCode(), 1000)); -reloadRequest(projectId, exposedPort); +infinispanService.getProjectFiles(projectId).forEach(projectFile -> putRequest(projectId, projectFile.getName(), projectFile.getCode(), 1000)); +reloadRequest(projectId); DevModeStatus dms = infinispanService.getDevModeStatus(projectId); dms.setCodeLoaded(true); infinispanService.saveDevModeStatus(dms); @@ -82,9 +80,9 @@ public class CamelService { } @CircuitBreaker(requestVolumeThreshold = 10, failureRatio = 0.5, delay = 1000) -public boolean putRequest(String containerName, Integer exposedPort, String fileName, String body, int timeout) { +public boolean putRequest(String containerName, String fileName, String body, int timeout) { try { -String url = getContainerAddress(containerName, exposedPort) + "/q/upload/" + fileName; +String url = getContainerAddress(containerName) + "/q/upload/" + fileName; HttpResponse result = getWebClient().putAbs(url) .timeout(timeout).sendBuffer(Buffer.buffer(body)).subscribeAsCompletionStage().toCompletableFuture().get(); return result.statusCode() == 200; @@ -94,8 +92,8 @@ public class CamelService { return false; } -public void reloadRequest(String containerName, Integer exposedPort) { -String url = getContainerAddress(containerName, exposedPort) + "/q/dev/reload?reload=true"; +public void reloadRequest(String containerName) { +String url = getContainerAddress(containerName) + "/q/dev/reload?reload=true"; try { result(url, 1000); } catch (InterruptedException | ExecutionException e) { @@ -103,14 +101,14 @@ public class CamelService { } } -public String getContainerAddress(String containerName, Integer exposedPort) { -return "http://localhost:; + exposedPort; +public String getContainerAddress(String containerName) { +return "http://localhost:8080;; } public void collectCamelStatuses() { if (infinispanService.isReady()) { infinispanService.getContainerStatuses(environment).forEach(pod -> { -CamelStatusRequest csr = new CamelStatusRequest(pod.getProjectId(), pod.getName(), pod.getExposedPort()); +CamelStatusRequest csr = new CamelStatusRequest(pod.getProjectId(), pod.getName()); eventBus.publish(CMD_COLLECT_CAMEL_STATUS, JsonObject.mapFrom(csr)); }); } @@ -120,8 +118,7 @@ public class CamelService { CamelStatusRequest dms = data.mapTo(CamelStatusRequest.class); Arrays.stream(CamelStatus.Name.values()).forEach(statusName -> { String containerName = dms.getContainerName(); -Integer exposedPort = dms.getExposedPort(); -String status = getCamelStatus(containerName, exposedPort, statusName); +String status = getCamelStatus(containerName, statusName); if (status != null) { CamelStatus cs = new CamelStatus(dms.getProjectId(), containerName, statusName, status, environment); infinispanService.saveCamelStatus(cs); @@ -164,8 +161,8 @@ public class CamelService { } } -public String getCamelStatus(String podName, Integer exposedPort,
[camel-karavan] 05/05: karavan-app #817
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit b8ac47a41a185e8fe7f9eae1559203d42af7e5bf Author: Marat Gubaidullin AuthorDate: Fri Jul 21 21:19:51 2023 -0400 karavan-app #817 --- karavan-web/karavan-app/pom.xml| 60 +++--- .../apache/camel/karavan/api/DevModeResource.java | 4 +- .../camel/karavan/docker/DockerEventListener.java | 5 +- .../apache/camel/karavan/docker/DockerService.java | 57 .../karavan/kubernetes/KubernetesService.java | 2 +- .../camel/karavan/kubernetes/PodEventHandler.java | 3 +- .../apache/camel/karavan/service/CamelService.java | 42 +-- .../apache/camel/karavan/service/EventService.java | 25 ++--- .../camel/karavan/service/ScheduledService.java| 17 +++--- .../apache/camel/karavan/shared/ConfigService.java | 7 +++ .../org/apache/camel/karavan/shared/EventType.java | 2 +- .../src/main/resources/application.properties | 15 ++ karavan-web/pom.xml| 8 +-- 13 files changed, 110 insertions(+), 137 deletions(-) diff --git a/karavan-web/karavan-app/pom.xml b/karavan-web/karavan-app/pom.xml index 620584ec..f38269f9 100644 --- a/karavan-web/karavan-app/pom.xml +++ b/karavan-web/karavan-app/pom.xml @@ -20,12 +20,17 @@ karavan org.apache.camel.karavan -karavan-cloud +karavan-web 3.21.1-SNAPSHOT ../pom.xml + +org.apache.camel.karavan +karavan-infinispan +${project.version} + io.quarkus quarkus-smallrye-reactive-messaging @@ -104,11 +109,6 @@ com.google.guava guava - - -io.quarkus -quarkus-infinispan-client - com.github.docker-java @@ -144,11 +144,6 @@ rest-assured test - -io.quarkiverse.quinoa -quarkus-quinoa -${quinoa.version} - @@ -164,13 +159,6 @@ **/**.xml - -target/classes/proto -true - -karavan.proto - - @@ -224,42 +212,6 @@ - - -native - - -native - - - - - -maven-failsafe-plugin -${surefire-plugin.version} - - - -integration-test -verify - - - - ${project.build.directory}/${project.build.finalName}-runner - org.jboss.logmanager.LogManager -${maven.home} - - - - - - - - -native - - - apache.snapshots diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java index 4170abd8..a5372ed9 100644 --- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java +++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java @@ -63,9 +63,9 @@ public class DevModeResource { if (status == null) { infinispanService.saveDevModeStatus(new DevModeStatus(project.getProjectId(), null, null, false)); if (ConfigService.inKubernetes()) { -kubernetesService.createRunner(project, runnerName, ""); +kubernetesService.runDevModeContainer(project, runnerName, ""); } else { -dockerService.createRunner(project, runnerName, ""); +dockerService.runDevmodeContainer(project, runnerName, ""); } return Response.ok(runnerName).build(); } diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java index 64816aea..40c2b858 100644 ---
[camel-karavan] 01/05: karavan-infinispan #817
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 365e9d6ae6b22b33d852f0def0a432cc7270fe90 Author: Marat Gubaidullin AuthorDate: Fri Jul 21 20:59:01 2023 -0400 karavan-infinispan #817 --- .../.mvn/wrapper/maven-wrapper.properties | 18 + karavan-web/karavan-infinispan/mvnw| 308 +++ karavan-web/karavan-infinispan/mvnw.cmd| 205 ++ karavan-web/karavan-infinispan/pom.xml | 132 +++ .../karavan/infinispan/CodeReloadListener.java | 30 ++ .../karavan/infinispan/InfinispanService.java | 414 + .../karavan/infinispan/model/CamelStatus.java | 81 .../camel/karavan/infinispan/model/CommitInfo.java | 53 +++ .../karavan/infinispan/model/ContainerInfo.java| 70 .../karavan/infinispan/model/ContainerStatus.java | 141 +++ .../karavan/infinispan/model/DeploymentStatus.java | 111 ++ .../karavan/infinispan/model/DevModeStatus.java| 78 .../camel/karavan/infinispan/model/GitConfig.java | 48 +++ .../camel/karavan/infinispan/model/GitRepo.java| 49 +++ .../karavan/infinispan/model/GitRepoFile.java | 37 ++ .../camel/karavan/infinispan/model/GroupedKey.java | 81 .../karavan/infinispan/model/KaravanSchema.java| 28 ++ .../karavan/infinispan/model/PipelineStatus.java | 83 + .../camel/karavan/infinispan/model/Project.java| 125 +++ .../karavan/infinispan/model/ProjectFile.java | 71 .../karavan/infinispan/model/ServiceStatus.java| 107 ++ .../src/main/resources/application.properties | 14 + .../main/resources/cache/command-cache-config.xml | 6 + .../src/main/resources/cache/data-cache-config.xml | 6 + .../camel/karavan/infinispan/DataGridTest.java | 74 25 files changed, 2370 insertions(+) diff --git a/karavan-web/karavan-infinispan/.mvn/wrapper/maven-wrapper.properties b/karavan-web/karavan-infinispan/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index ..70f4f50f --- /dev/null +++ b/karavan-web/karavan-infinispan/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/karavan-web/karavan-infinispan/mvnw b/karavan-web/karavan-infinispan/mvnw new file mode 100755 index ..8d937f4c --- /dev/null +++ b/karavan-web/karavan-infinispan/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# -- +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# - +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag
[camel-k] 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit f20a8f37767ea7040f177c84ada815557d070120 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Jul 21 23:48:28 2023 + chore: nightly SBOM update --- camel-k-sbom/camel-k-sbom.json | 72 +- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index b708006ec..08d42a1d5 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:0571f230-f155-468c-b29f-5bd2e6733d58", + "serialNumber": "urn:uuid:5e11332f-752b-4aba-a75b-d46bffc9dc2a", "version": 1, "metadata": { -"timestamp": "2023-07-20T23:47:40Z", +"timestamp": "2023-07-21T23:48:28Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230720234141-14122aefeced?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230721234131-6703e1df8ed8?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20230720234141-14122aefeced", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230720234141-14122aefeced?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20230721234131-6703e1df8ed8", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230721234131-6703e1df8ed8?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k;, @@ -423,18 +423,18 @@ } }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230720234141-14122aefeced?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230721234131-6703e1df8ed8?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/apis/camel", - "version": "v0.0.0-20230720234141-14122aefeced", + "version": "v0.0.0-20230721234131-6703e1df8ed8", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "23b26118edf35404ea842e2636c02193bef4cee36027961bd1a0ca64fe9d34a1" + "content": "54033aa27ca35ac3429cc65f5fc8e4212ab2e66cba63e7f73d93a2f489e40c25" } ], - "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230720234141-14122aefeced?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230721234131-6703e1df8ed8?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/v2/pkg/apis/camel;, @@ -443,18 +443,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230720234141-14122aefeced?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230721234131-6703e1df8ed8?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/client/camel", - "version": "v0.0.0-20230720234141-14122aefeced", + "version": "v0.0.0-20230721234131-6703e1df8ed8", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "0578e27e60304dd0fd8df859af5ed86614ca3f135267d63f668ff52b8ed13c16" + "content": "f35c53431533781da30bb73a90925aac5158edacd9c0e87d5d0d7a9fec415027" } ], - "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230720234141-14122aefeced?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230721234131-6703e1df8ed8?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/v2/pkg/client/camel;, @@ -463,18 +463,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230720234141-14122aefeced?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230721234131-6703e1df8ed8?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/kamelet/repository", - "version": "v0.0.0-20230720234141-14122aefeced", + "version": "v0.0.0-20230721234131-6703e1df8ed8", "scope": "required", "hashes": [ {
[camel-k] branch main updated (3297b2639 -> f20a8f377)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 3297b2639 chore(deps): bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3 (#4588) new 6703e1df8 chore: changelog automatic update new f20a8f377 chore: nightly SBOM update 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: CHANGELOG.md | 1 + camel-k-sbom/camel-k-sbom.json | 72 +- 2 files changed, 37 insertions(+), 36 deletions(-)
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 6703e1df8ed81ee3711b609924f298297a1ccfea Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Jul 21 23:41:31 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 878a7b25f..eabb8a5ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ **Merged pull requests:** +- chore\(deps\): bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3 [\#4588](https://github.com/apache/camel-k/pull/4588) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore: Refactor operator logs [\#4586](https://github.com/apache/camel-k/pull/4586) ([christophd](https://github.com/christophd)) - Fix misc tests on global operator [\#4585](https://github.com/apache/camel-k/pull/4585) ([bouskaJ](https://github.com/bouskaJ)) - chore\(doc\): detailed builder runtime info [\#4584](https://github.com/apache/camel-k/pull/4584) ([squakez](https://github.com/squakez))
[camel-k] branch release-1.12.x updated: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.12.x by this push: new d80c24f04 Periodic Sync of Camel K Main Branch for SBOM Generation d80c24f04 is described below commit d80c24f04f3645dcb9aa621ba95d5a4584f471dc Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Jul 21 23:47:37 2023 + Periodic Sync of Camel K Main Branch for SBOM Generation --- camel-k-sbom/camel-k-sbom.json | 54 +- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index f2bad504a..ae01b41be 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:a2aa70d7-b579-46a0-af4b-77e1694df230", + "serialNumber": "urn:uuid:3f25573e-5889-4b8f-85de-7147d14689df", "version": 1, "metadata": { -"timestamp": "2023-07-20T23:47:00Z", +"timestamp": "2023-07-21T23:47:37Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230719234454-7c311ff9ecf0?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230720234700-f398eeb37917?type=module", "type": "application", "name": "github.com/apache/camel-k", - "version": "v0.0.0-20230719234454-7c311ff9ecf0", - "purl": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230719234454-7c311ff9ecf0?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20230720234700-f398eeb37917", + "purl": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230720234700-f398eeb37917?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k;, @@ -510,18 +510,18 @@ } }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230719234454-7c311ff9ecf0?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230720234700-f398eeb37917?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/apis/camel", - "version": "v0.0.0-20230719234454-7c311ff9ecf0", + "version": "v0.0.0-20230720234700-f398eeb37917", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "55504db5ed33ee19c40cfccddb317a5bfad34b29b7398a384bd1133b118e66b7" + "content": "840f012f9ac74cc3689345053810c49274b014b3b26b47e71ef50a8431f386ee" } ], - "purl": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230719234454-7c311ff9ecf0?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230720234700-f398eeb37917?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/pkg/apis/camel;, @@ -530,18 +530,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230719234454-7c311ff9ecf0?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230720234700-f398eeb37917?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/client/camel", - "version": "v0.0.0-20230719234454-7c311ff9ecf0", + "version": "v0.0.0-20230720234700-f398eeb37917", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "26b219f22e5e501982cf503f0bc480e06887f7894c5c17e92a21a76797669856" + "content": "c3a81e3ae4ffdd1119afa4caa3046ae59fabf27b0b6716344d4b434cbdf6380a" } ], - "purl": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230719234454-7c311ff9ecf0?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230720234700-f398eeb37917?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/pkg/client/camel;, @@ -550,18 +550,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230719234454-7c311ff9ecf0?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230720234700-f398eeb37917?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/kamelet/repository", -
[camel-quarkus] branch main updated: Upgrade Quarkus to 3.2.2.Final
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new fb1eaa11db Upgrade Quarkus to 3.2.2.Final fb1eaa11db is described below commit fb1eaa11db707bd20bbebf542d7713b381c9227a Author: James Netherton AuthorDate: Fri Jul 21 15:43:19 2023 +0100 Upgrade Quarkus to 3.2.2.Final --- docs/antora.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 44c933cfca..85403940d6 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,7 +30,7 @@ asciidoc: # Project versions camel-version: 4.0.0-RC1 # replace ${camel.version} camel-docs-version: "" -quarkus-version: 3.2.1.Final # replace ${quarkus.version} +quarkus-version: 3.2.2.Final # replace ${quarkus.version} graalvm-version: 22.3.2 # replace ${graalvm.version} graalvm-docs-version: 22.3 min-maven-version: 3.8.2 # replace ${min-maven-version} diff --git a/pom.xml b/pom.xml index 078be90860..61409adc92 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.0.0 2.0.1 2.0.2 -3.2.1.Final +3.2.2.Final 4.0.0 2.4.0
[GitHub] [camel-quarkus] jamesnetherton merged pull request #5114: Upgrade Quarkus to 3.2.2.Final
jamesnetherton merged PR #5114: URL: https://github.com/apache/camel-quarkus/pull/5114 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #5113: Do not produce JmxMeterRegistry bean in native mode testing
jamesnetherton merged PR #5113: URL: https://github.com/apache/camel-quarkus/pull/5113 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Do not produce JmxMeterRegistry bean in native mode testing
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 9ac6ee8f91 Do not produce JmxMeterRegistry bean in native mode testing 9ac6ee8f91 is described below commit 9ac6ee8f914f63329f0783924eb85cb2ff6ae86b Author: James Netherton AuthorDate: Fri Jul 21 15:07:23 2023 +0100 Do not produce JmxMeterRegistry bean in native mode testing Fixes #5109 --- .../camel/quarkus/component/micrometer/it/MicrometerProducers.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java index c259593f32..3d64957055 100644 --- a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java +++ b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java @@ -27,6 +27,7 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import io.micrometer.core.instrument.util.HierarchicalNameMapper; import io.micrometer.jmx.JmxMeterRegistry; import io.micrometer.prometheus.PrometheusMeterRegistry; +import io.quarkus.arc.profile.IfBuildProfile; import io.quarkus.micrometer.runtime.MeterFilterConstraint; import jakarta.enterprise.inject.Produces; import jakarta.inject.Named; @@ -38,6 +39,7 @@ public class MicrometerProducers { @Produces @Singleton +@IfBuildProfile("test") public MeterRegistry registry(Clock clock) { return new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, HierarchicalNameMapper.DEFAULT); }
[GitHub] [camel-quarkus] jamesnetherton closed issue #5109: [Quarkus 3.3.0] Micrometer native integration test application throws NPE on startup
jamesnetherton closed issue #5109: [Quarkus 3.3.0] Micrometer native integration test application throws NPE on startup URL: https://github.com/apache/camel-quarkus/issues/5109 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] 04/04: Temporarily disable debezium tests due to #5110
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 690e5949ff0adf154445c1b33862528e9c0c Author: James Netherton AuthorDate: Fri Jul 21 15:12:20 2023 +0100 Temporarily disable debezium tests due to #5110 --- integration-tests/debezium/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/integration-tests/debezium/pom.xml b/integration-tests/debezium/pom.xml index 4750a4cd79..39df398f30 100644 --- a/integration-tests/debezium/pom.xml +++ b/integration-tests/debezium/pom.xml @@ -38,6 +38,9 @@ src/test/resources/container-license-acceptance.txt + + +true @@ -128,6 +131,7 @@ + mysqlDriver
[camel-quarkus] 02/04: Ref #4894: Make Groovy DSL ITs platform compliant
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 13a650f64763f9ced1c8b074f9ff33d2e93a1a09 Author: Nicolas Filotto AuthorDate: Thu Jun 29 16:23:59 2023 +0200 Ref #4894: Make Groovy DSL ITs platform compliant --- integration-tests/groovy-dsl/pom.xml | 55 +-- .../camel/quarkus/dsl/groovy/GroovyDslTest.java| 181 ++--- tooling/test-list/pom.xml | 1 - 3 files changed, 51 insertions(+), 186 deletions(-) diff --git a/integration-tests/groovy-dsl/pom.xml b/integration-tests/groovy-dsl/pom.xml index 5e9211a412..7760421ef1 100644 --- a/integration-tests/groovy-dsl/pom.xml +++ b/integration-tests/groovy-dsl/pom.xml @@ -30,9 +30,6 @@ Camel Quarkus :: Integration Tests :: Groovy DSL Integration tests for Camel Groovy DSL extension - - ${project.build.directory}/quarkus-app/quarkus-run.jar - org.apache.camel.quarkus @@ -70,18 +67,12 @@ test -org.assertj -assertj-core -test - - -org.apache.camel.quarkus - camel-quarkus-integration-tests-process-executor-support -test +io.rest-assured +rest-assured -org.awaitility -awaitility +org.assertj +assertj-core test @@ -185,7 +176,6 @@ native - ${project.build.directory}/${project.artifactId}-${project.version}-runner @@ -200,43 +190,6 @@ - - - ${quarkus.runner} - - - - - - - -full - - -!quickly - - - - - - -org.apache.maven.plugins -maven-surefire-plugin - - -default-test - -test - -integration-test - - - ${quarkus.runner} - - - - diff --git a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java index 82ce107208..6f41d92bba 100644 --- a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java +++ b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java @@ -16,151 +16,64 @@ */ package org.apache.camel.quarkus.dsl.groovy; -import java.util.concurrent.TimeUnit; - +import io.quarkus.test.junit.QuarkusTest; +import io.restassured.RestAssured; import org.apache.camel.dsl.groovy.GroovyRoutesBuilderLoader; -import org.apache.camel.quarkus.test.support.process.QuarkusProcessExecutor; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; +import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; -import org.zeroturnaround.exec.StartedProcess; - -import static org.assertj.core.api.Assertions.assertThat; +@QuarkusTest class GroovyDslTest { -private static int port; -private static StartedProcess process; - -@BeforeAll -static void start() throws Exception { -// Need to use an external process to test the extension because of a CL issue that happens only on test mode -// due to the fact that groovy is defined as a parent first artifact -QuarkusProcessExecutor quarkusProcessExecutor
[camel-quarkus] 01/04: Upgrade Quarkus to 3.3.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 72c2dd73bfb04ff1ce13bda9d5b9247cc151676c Author: James Netherton AuthorDate: Wed Jul 19 08:14:42 2023 +0100 Upgrade Quarkus to 3.3.0.CR1 --- docs/antora.yml | 2 +- pom.xml | 12 ++-- poms/bom/src/main/generated/flattened-full-pom.xml | 16 poms/bom/src/main/generated/flattened-reduced-pom.xml| 12 ++-- .../src/main/generated/flattened-reduced-verbose-pom.xml | 12 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 44c933cfca..efa5b2e53b 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,7 +30,7 @@ asciidoc: # Project versions camel-version: 4.0.0-RC1 # replace ${camel.version} camel-docs-version: "" -quarkus-version: 3.2.1.Final # replace ${quarkus.version} +quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} graalvm-version: 22.3.2 # replace ${graalvm.version} graalvm-docs-version: 22.3 min-maven-version: 3.8.2 # replace ${min-maven-version} diff --git a/pom.xml b/pom.xml index 078be90860..1547347a06 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.0.0 2.0.1 2.0.2 -3.2.1.Final +999-SNAPSHOT 4.0.0 2.4.0 @@ -71,7 +71,7 @@ ${angus-mail-version} 1.18 3.5.2 -1.11.1 +1.11.2 2.20.103 0.22.2 3.24.2 @@ -81,7 +81,7 @@ 1.9.0 1.0.0-beta.3 3.7.1 -1.74 +1.75 0.1.2 3.1.5 ${commons-beanutils-version} @@ -103,7 +103,7 @@ 1.121.0 22.3.2 4.0.13 -1.56.0 +1.56.1 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -125,7 +125,7 @@ 0.2.9 ${json-path-version} 2.4.10 -3.4.0 +3.5.0 ${kudu-version} 1.8.22 2.24.0 @@ -142,7 +142,7 @@ 3.4.27 ${reactor-netty-version} 2.9.0 - 4.6.0 + 4.8.0 ${spring-version} 2.0 0.43.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 04057839c4..42e3c12fda 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6311,7 +6311,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel -4.6.0 +4.8.0 io.swagger.core.v3 @@ -6371,12 +6371,12 @@ org.apache.avro avro-ipc-jetty -1.11.1 +1.11.2 org.apache.avro avro-ipc-netty -1.11.1 +1.11.2 org.apache.commons @@ -6401,7 +6401,7 @@ org.apache.kafka connect-runtime -3.4.0 +3.5.0 javax.activation @@ -6471,22 +6471,22 @@ org.bouncycastle bcmail-jdk18on -1.74 +1.75 org.bouncycastle bcpg-jdk18on -1.74 +1.75 org.bouncycastle bcprov-ext-jdk18on -1.74 +1.75 org.bouncycastle bcutil-jdk18on -1.74 +1.75 org.brotli diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 9d3a190639..3c46b41e90 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6301,7 +6301,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel -4.6.0 +4.8.0 io.swagger.core.v3 @@ -6381,7 +6381,7 @@ org.apache.kafka connect-runtime -3.4.0 +3.5.0 javax.activation @@ -6451,22 +6451,22 @@ org.bouncycastle bcmail-jdk18on -1.74 +1.75 org.bouncycastle bcpg-jdk18on -1.74 +1.75 org.bouncycastle bcprov-ext-jdk18on -1.74 +1.75 org.bouncycastle bcutil-jdk18on -1.74 +1.75 org.brotli diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d0e7a5d23b..6ca0e1c2d7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++
[camel-quarkus] 03/04: Temporarily disable cxf-grouped tests due to #5108
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 11f5647018f6842a70d7b1e26360c9c6ac3b39d4 Author: James Netherton AuthorDate: Fri Jul 21 14:17:00 2023 +0100 Temporarily disable cxf-grouped tests due to #5108 --- integration-tests/cxf-soap-grouped/pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/integration-tests/cxf-soap-grouped/pom.xml b/integration-tests/cxf-soap-grouped/pom.xml index acf4498841..0802233eb0 100644 --- a/integration-tests/cxf-soap-grouped/pom.xml +++ b/integration-tests/cxf-soap-grouped/pom.xml @@ -30,6 +30,10 @@ Camel Quarkus :: Integration Tests :: Cxf Soap Grouped Cxf Soap tests from ../integration-test-groups/cxf-soap merged together + +true + + @@ -160,6 +164,7 @@ + virtualDependencies
[camel-quarkus] branch quarkus-main updated (c2473c7dcd -> 690e5949ff)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard c2473c7dcd Ref #4894: Make Groovy DSL ITs platform compliant discard 0f5414a1f9 Upgrade Quarkus to 3.3.0.CR1 add 41c7dfd634 Fix hamcrest GAV in bom-test add 8f487a5b71 Update hamcrest GAV in dependabot.yml add 96b6a98d0a Build Camel from source for camel-main branch builds new 72c2dd73bf Upgrade Quarkus to 3.3.0.CR1 new 13a650f647 Ref #4894: Make Groovy DSL ITs platform compliant new 11f5647018 Temporarily disable cxf-grouped tests due to #5108 new 690e5949ff Temporarily disable debezium tests due to #5110 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 (c2473c7dcd) \ N -- N -- N refs/heads/quarkus-main (690e5949ff) 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 4 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: .github/dependabot.yml | 2 +- .github/workflows/ci-build.yaml| 33 -- integration-tests/cxf-soap-grouped/pom.xml | 6 ++ integration-tests/debezium/pom.xml | 5 + poms/bom-test/pom.xml | 4 ++-- 5 files changed, 22 insertions(+), 28 deletions(-)
[GitHub] [camel-quarkus] jamesnetherton opened a new pull request, #5113: Do not produce JmxMeterRegistry bean in native mode testing
jamesnetherton opened a new pull request, #5113: URL: https://github.com/apache/camel-quarkus/pull/5113 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch dependabot/go_modules/go.uber.org/automaxprocs-1.5.3 deleted (was 591bc4a00)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/go.uber.org/automaxprocs-1.5.3 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 591bc4a00 chore(deps): bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-k] branch main updated: chore(deps): bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3 (#4588)
This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 3297b2639 chore(deps): bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3 (#4588) 3297b2639 is described below commit 3297b26397b34c02579c72d6606d5426804d2c11 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jul 21 10:15:30 2023 -0300 chore(deps): bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3 (#4588) Bumps [go.uber.org/automaxprocs](https://github.com/uber-go/automaxprocs) from 1.5.2 to 1.5.3. - [Release notes](https://github.com/uber-go/automaxprocs/releases) - [Changelog](https://github.com/uber-go/automaxprocs/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber-go/automaxprocs/compare/v1.5.2...v1.5.3) --- updated-dependencies: - dependency-name: go.uber.org/automaxprocs 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> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4d7ea777e..e6b9e02dd 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/spf13/viper v1.16.0 github.com/stoewer/go-strcase v1.3.0 github.com/stretchr/testify v1.8.4 - go.uber.org/automaxprocs v1.5.2 + go.uber.org/automaxprocs v1.5.3 go.uber.org/multierr v1.9.0 go.uber.org/zap v1.24.0 golang.org/x/oauth2 v0.10.0 diff --git a/go.sum b/go.sum index 39a48ddfa..608fb95d8 100644 --- a/go.sum +++ b/go.sum @@ -749,8 +749,8 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME= -go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= +go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= +go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
[GitHub] [camel-k] claudio4j merged pull request #4588: chore(deps): bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3
claudio4j merged PR #4588: URL: https://github.com/apache/camel-k/pull/4588 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (5416c36f5f7 -> fe4f519bea9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 5416c36f5f7 Upgrade huaweicloud-sdk-core 3.1.49 (#10778) omit c616ed2097b Upgrade javax json-api 1.1.4 (#10779) omit a437e1bbb43 Upgrade to Netty 4.1.95 (#10777) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (fe4f519bea9) \ O -- O -- O (5416c36f5f7) 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: components/camel-elytron/pom.xml | 2 +- parent/pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (b75cf748c9d -> 5416c36f5f7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from b75cf748c9d Upgrade ical4j 3.2.12 add fe4f519bea9 Upgrade Infinispan 14.0.13 (#10776) add a437e1bbb43 Upgrade to Netty 4.1.95 (#10777) add c616ed2097b Upgrade javax json-api 1.1.4 (#10779) add 5416c36f5f7 Upgrade huaweicloud-sdk-core 3.1.49 (#10778) No new revisions were added by this update. Summary of changes: components/camel-elytron/pom.xml | 2 +- parent/pom.xml| 8 .../infinispan/services/InfinispanLocalContainerService.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
[camel] branch h deleted (was a1d5d555c0c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch h in repository https://gitbox.apache.org/repos/asf/camel.git was a1d5d555c0c Merge branch 'main' into h 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: Upgrade huaweicloud-sdk-core 3.1.49 (#10778)
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 5416c36f5f7 Upgrade huaweicloud-sdk-core 3.1.49 (#10778) 5416c36f5f7 is described below commit 5416c36f5f75f7826bad3cd91b74185f7d44613a Author: Claus Ibsen AuthorDate: Fri Jul 21 14:33:57 2023 +0200 Upgrade huaweicloud-sdk-core 3.1.49 (#10778) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index aae16023913..e9b446794bb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -212,7 +212,7 @@ 4.5.14 4.1.5 3.23.3.1 -3.1.48 +3.1.49 3.2.12 73.2 2.15.0
[GitHub] [camel] davsclaus merged pull request #10778: Upgrade huaweicloud-sdk-core 3.1.49
davsclaus merged PR #10778: URL: https://github.com/apache/camel/pull/10778 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: Merge branch 'main' into h
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch h in repository https://gitbox.apache.org/repos/asf/camel.git commit a1d5d555c0c6c429cbdeb34ddfde3bccef9e055b Merge: f809a437461 c616ed2097b Author: Claus Ibsen AuthorDate: Fri Jul 21 14:33:46 2023 +0200 Merge branch 'main' into h components/camel-elytron/pom.xml | 2 +- .../camel/component/xchange/account/AccountProducerTest.java | 3 +++ .../camel/component/xchange/market/MarketDataProducerTest.java| 3 +++ .../camel/component/xchange/metadata/MetaDataProducerTest.java| 3 +++ parent/pom.xml| 8 .../infinispan/services/InfinispanLocalContainerService.java | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --cc parent/pom.xml index 57dca8c0bf8,aae16023913..e9b446794bb --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -212,8 -212,8 +212,8 @@@ 4.5.14 4.1.5 3.23.3.1 -3.1.48 +3.1.49 - 3.2.11 + 3.2.12 73.2 2.15.0 1.9.0
[camel] branch h updated (f809a437461 -> a1d5d555c0c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch h in repository https://gitbox.apache.org/repos/asf/camel.git from f809a437461 Upgrade huaweicloud-sdk-core 3.1.49 add 52162f86d53 (chores) camel-xchange: prevent tests from running on ASF CI add b75cf748c9d Upgrade ical4j 3.2.12 add fe4f519bea9 Upgrade Infinispan 14.0.13 (#10776) add a437e1bbb43 Upgrade to Netty 4.1.95 (#10777) add c616ed2097b Upgrade javax json-api 1.1.4 (#10779) new a1d5d555c0c Merge branch 'main' into h 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-elytron/pom.xml | 2 +- .../camel/component/xchange/account/AccountProducerTest.java | 3 +++ .../camel/component/xchange/market/MarketDataProducerTest.java| 3 +++ .../camel/component/xchange/metadata/MetaDataProducerTest.java| 3 +++ parent/pom.xml| 8 .../infinispan/services/InfinispanLocalContainerService.java | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-)
[camel] branch japi deleted (was 467208c0fb6)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch japi in repository https://gitbox.apache.org/repos/asf/camel.git was 467208c0fb6 Upgrade javax json-api 1.1.4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: Upgrade javax json-api 1.1.4 (#10779)
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 c616ed2097b Upgrade javax json-api 1.1.4 (#10779) c616ed2097b is described below commit c616ed2097b47e8158edc77cc3adc34cd3a819e8 Author: Claus Ibsen AuthorDate: Fri Jul 21 14:33:09 2023 +0200 Upgrade javax json-api 1.1.4 (#10779) --- components/camel-elytron/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-elytron/pom.xml b/components/camel-elytron/pom.xml index 1f68bf7e247..12da1b028b1 100644 --- a/components/camel-elytron/pom.xml +++ b/components/camel-elytron/pom.xml @@ -75,7 +75,7 @@ javax.json javax.json-api -${json-api} +${javax-json-api-version} org.glassfish diff --git a/parent/pom.xml b/parent/pom.xml index 947618c0839..aae16023913 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -283,7 +283,7 @@ 0.1.14 3.0.0 0.2.9 -1.0 +1.1.4 1.5.1 2.8.0 1.13
[GitHub] [camel] davsclaus merged pull request #10779: Upgrade javax json-api 1.1.4
davsclaus merged PR #10779: URL: https://github.com/apache/camel/pull/10779 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch netty deleted (was a2b0bd6ba76)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch netty in repository https://gitbox.apache.org/repos/asf/camel.git was a2b0bd6ba76 Upgrade to Netty 4.1.95 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 inf deleted (was b7d2af24bc8)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch inf in repository https://gitbox.apache.org/repos/asf/camel.git was b7d2af24bc8 Upgrade Infinispan 14.0.13 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: Upgrade to Netty 4.1.95 (#10777)
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 a437e1bbb43 Upgrade to Netty 4.1.95 (#10777) a437e1bbb43 is described below commit a437e1bbb4395fe86cedee2c088c17960a7ec8b3 Author: Claus Ibsen AuthorDate: Fri Jul 21 14:32:52 2023 +0200 Upgrade to Netty 4.1.95 (#10777) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 802ec296753..947618c0839 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -357,7 +357,7 @@ 3.5.13 5.13.1.Final 0.4.0 -4.1.94.Final +4.1.95.Final 2.0.5 1.0.86 9.31
[GitHub] [camel] davsclaus merged pull request #10776: Upgrade Infinispan 14.0.13
davsclaus merged PR #10776: URL: https://github.com/apache/camel/pull/10776 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Upgrade Infinispan 14.0.13 (#10776)
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 fe4f519bea9 Upgrade Infinispan 14.0.13 (#10776) fe4f519bea9 is described below commit fe4f519bea984bc3dca1fd7f72df0c0891249186 Author: Claus Ibsen AuthorDate: Fri Jul 21 14:32:41 2023 +0200 Upgrade Infinispan 14.0.13 (#10776) --- parent/pom.xml | 2 +- .../test/infra/infinispan/services/InfinispanLocalContainerService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index eff75c94383..802ec296753 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -217,7 +217,7 @@ 73.2 2.15.0 1.9.0 -14.0.12.Final +14.0.13.Final 2.23 6.9.0 1.10 diff --git a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java b/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java index 5faed844313..340095db55b 100644 --- a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java +++ b/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java @@ -29,7 +29,7 @@ import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; public class InfinispanLocalContainerService implements InfinispanService, ContainerService> { -public static final String CONTAINER_IMAGE = "quay.io/infinispan/server:14.0.12.Final"; +public static final String CONTAINER_IMAGE = "quay.io/infinispan/server:14.0.13.Final"; public static final String CONTAINER_NAME = "infinispan"; private static final String DEFAULT_USERNAME = "admin"; private static final String DEFAULT_PASSWORD = "password";
[GitHub] [camel] davsclaus merged pull request #10777: Upgrade to Netty 4.1.95
davsclaus merged PR #10777: URL: https://github.com/apache/camel/pull/10777 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (a7b1e75bc30 -> b75cf748c9d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from a7b1e75bc30 (chores) camel-xml-dsl-io: run sequentially add 52162f86d53 (chores) camel-xchange: prevent tests from running on ASF CI add b75cf748c9d Upgrade ical4j 3.2.12 No new revisions were added by this update. Summary of changes: .../apache/camel/component/xchange/account/AccountProducerTest.java| 3 +++ .../apache/camel/component/xchange/market/MarketDataProducerTest.java | 3 +++ .../apache/camel/component/xchange/metadata/MetaDataProducerTest.java | 3 +++ parent/pom.xml | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-)
[GitHub] [camel] github-actions[bot] commented on pull request #10779: Upgrade javax json-api 1.1.4
github-actions[bot] commented on PR #10779: URL: https://github.com/apache/camel/pull/10779#issuecomment-1645477002 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus opened a new pull request, #10779: Upgrade javax json-api 1.1.4
davsclaus opened a new pull request, #10779: URL: https://github.com/apache/camel/pull/10779 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch japi created (now 467208c0fb6)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch japi in repository https://gitbox.apache.org/repos/asf/camel.git at 467208c0fb6 Upgrade javax json-api 1.1.4 This branch includes the following new commits: new 467208c0fb6 Upgrade javax json-api 1.1.4 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: Upgrade javax json-api 1.1.4
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch japi in repository https://gitbox.apache.org/repos/asf/camel.git commit 467208c0fb68c97ecdde498dcd327a7763eae205 Author: Claus Ibsen AuthorDate: Fri Jul 21 14:05:19 2023 +0200 Upgrade javax json-api 1.1.4 --- components/camel-elytron/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-elytron/pom.xml b/components/camel-elytron/pom.xml index 1f68bf7e247..12da1b028b1 100644 --- a/components/camel-elytron/pom.xml +++ b/components/camel-elytron/pom.xml @@ -75,7 +75,7 @@ javax.json javax.json-api -${json-api} +${javax-json-api-version} org.glassfish diff --git a/parent/pom.xml b/parent/pom.xml index eff75c94383..888e193da63 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -283,7 +283,7 @@ 0.1.14 3.0.0 0.2.9 -1.0 +1.1.4 1.5.1 2.8.0 1.13
[camel] branch main updated (a7b1e75bc30 -> 52162f86d53)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from a7b1e75bc30 (chores) camel-xml-dsl-io: run sequentially add 52162f86d53 (chores) camel-xchange: prevent tests from running on ASF CI No new revisions were added by this update. Summary of changes: .../apache/camel/component/xchange/account/AccountProducerTest.java| 3 +++ .../apache/camel/component/xchange/market/MarketDataProducerTest.java | 3 +++ .../apache/camel/component/xchange/metadata/MetaDataProducerTest.java | 3 +++ 3 files changed, 9 insertions(+)
[camel] branch main updated: Upgrade ical4j 3.2.12
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 b75cf748c9d Upgrade ical4j 3.2.12 b75cf748c9d is described below commit b75cf748c9d8a2f28209212716394726c1c30b62 Author: Claus Ibsen AuthorDate: Fri Jul 21 14:02:30 2023 +0200 Upgrade ical4j 3.2.12 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9d24dddbe2f..eff75c94383 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -213,7 +213,7 @@ 4.1.5 3.23.3.1 3.1.48 -3.2.11 +3.2.12 73.2 2.15.0 1.9.0
[GitHub] [camel] davsclaus opened a new pull request, #10778: Upgrade huaweicloud-sdk-core 3.1.49
davsclaus opened a new pull request, #10778: URL: https://github.com/apache/camel/pull/10778 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch h created (now f809a437461)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch h in repository https://gitbox.apache.org/repos/asf/camel.git at f809a437461 Upgrade huaweicloud-sdk-core 3.1.49 This branch includes the following new commits: new f809a437461 Upgrade huaweicloud-sdk-core 3.1.49 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: Upgrade huaweicloud-sdk-core 3.1.49
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch h in repository https://gitbox.apache.org/repos/asf/camel.git commit f809a43746155d3abf24ddedb0f508381636a68e Author: Claus Ibsen AuthorDate: Fri Jul 21 14:01:05 2023 +0200 Upgrade huaweicloud-sdk-core 3.1.49 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9d24dddbe2f..57dca8c0bf8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -212,7 +212,7 @@ 4.5.14 4.1.5 3.23.3.1 -3.1.48 +3.1.49 3.2.11 73.2 2.15.0
[GitHub] [camel] davsclaus opened a new pull request, #10777: Upgrade to Netty 4.1.95
davsclaus opened a new pull request, #10777: URL: https://github.com/apache/camel/pull/10777 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus opened a new pull request, #10776: Upgrade Infinispan 14.0.13
davsclaus opened a new pull request, #10776: URL: https://github.com/apache/camel/pull/10776 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: Upgrade Infinispan 14.0.13
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch inf in repository https://gitbox.apache.org/repos/asf/camel.git commit b7d2af24bc893e34537cc6e15d216156d73934ff Author: Claus Ibsen AuthorDate: Fri Jul 21 13:59:16 2023 +0200 Upgrade Infinispan 14.0.13 --- parent/pom.xml | 2 +- .../test/infra/infinispan/services/InfinispanLocalContainerService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9d24dddbe2f..912856510b4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -217,7 +217,7 @@ 73.2 2.15.0 1.9.0 -14.0.12.Final +14.0.13.Final 2.23 6.9.0 1.10 diff --git a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java b/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java index 5faed844313..340095db55b 100644 --- a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java +++ b/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java @@ -29,7 +29,7 @@ import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; public class InfinispanLocalContainerService implements InfinispanService, ContainerService> { -public static final String CONTAINER_IMAGE = "quay.io/infinispan/server:14.0.12.Final"; +public static final String CONTAINER_IMAGE = "quay.io/infinispan/server:14.0.13.Final"; public static final String CONTAINER_NAME = "infinispan"; private static final String DEFAULT_USERNAME = "admin"; private static final String DEFAULT_PASSWORD = "password";
[camel] branch inf created (now b7d2af24bc8)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch inf in repository https://gitbox.apache.org/repos/asf/camel.git at b7d2af24bc8 Upgrade Infinispan 14.0.13 This branch includes the following new commits: new b7d2af24bc8 Upgrade Infinispan 14.0.13 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 netty created (now a2b0bd6ba76)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch netty in repository https://gitbox.apache.org/repos/asf/camel.git at a2b0bd6ba76 Upgrade to Netty 4.1.95 This branch includes the following new commits: new a2b0bd6ba76 Upgrade to Netty 4.1.95 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: Upgrade to Netty 4.1.95
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch netty in repository https://gitbox.apache.org/repos/asf/camel.git commit a2b0bd6ba763aae70a6af7cdb611aedec2f233f7 Author: Claus Ibsen AuthorDate: Fri Jul 21 13:57:50 2023 +0200 Upgrade to Netty 4.1.95 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9d24dddbe2f..cde8eaeb871 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -357,7 +357,7 @@ 3.5.13 5.13.1.Final 0.4.0 -4.1.94.Final +4.1.95.Final 2.0.5 1.0.86 9.31
[GitHub] [camel-k] github-actions[bot] commented on pull request #4590: fix(core): Remove ownership from CamelCatalog on builder image IS
github-actions[bot] commented on PR #4590: URL: https://github.com/apache/camel-k/pull/4590#issuecomment-1645468168 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] gansheer opened a new pull request, #4590: fix(core): Remove ownership from CamelCatalog on builder image IS
gansheer opened a new pull request, #4590: URL: https://github.com/apache/camel-k/pull/4590 Fix #4569 This will remove the ownership from the CamelCatalog on the build image ImageStream resource. It will be kept when the camel-k operator is removed. The side effects this modification is that any uninstall won't remove the ImageStream so it needs to be done manually. **Release Note** ```release-note fix(core): Remove ownership from CamelCatalog on builder image IS ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] 21/21: Fixed aws2-kinesis
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6f536f3281f5281f6725aecbbba9dae43dcedf9d Author: JiriOndrusek AuthorDate: Fri Jul 21 13:46:36 2023 +0200 Fixed aws2-kinesis --- .../component/aws2/kinesis/it/Aws2KinesisResource.java| 6 +- .../component/aws2/kinesis/it/Aws2KinesisRoutes.java | 9 + .../aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java | 15 +++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java index d3a556d253..fdbeeff70a 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java @@ -45,6 +45,9 @@ public class Aws2KinesisResource extends BaseAws2Resource { @ConfigProperty(name = "aws-kinesis.stream-name") String streamName; +@ConfigProperty(name = "aws-kinesis.stream-name-for-default-credentials") +String streamNameForDefaultCredentials; + @Inject ProducerTemplate producerTemplate; @@ -81,7 +84,8 @@ public class Aws2KinesisResource extends BaseAws2Resource { } private String componentUri() { -return "aws2-kinesis://" + streamName + "?useDefaultCredentialsProvider=" + isUseDefaultCredentials(); +return "aws2-kinesis://" + (isUseDefaultCredentials() ? streamNameForDefaultCredentials : streamName) ++ "?useDefaultCredentialsProvider=" + isUseDefaultCredentials(); } } diff --git a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java index bf6433ef9f..5b6a701da5 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java @@ -32,6 +32,9 @@ public class Aws2KinesisRoutes extends RouteBuilder { @ConfigProperty(name = "aws-kinesis.stream-name") String streamName; +@ConfigProperty(name = "aws-kinesis.stream-name-for-default-credentials") +String streamNameForDefaultCredentials; + @Inject @Named("aws2KinesisMessages") Queue aws2KinesisMessages; @@ -40,10 +43,16 @@ public class Aws2KinesisRoutes extends RouteBuilder { return "aws2-kinesis://" + streamName; } +private String componentUriForDefaultCredentials() { +return "aws2-kinesis://" + streamNameForDefaultCredentials; +} + @Override public void configure() throws Exception { from(componentUri()) .process(exchange -> aws2KinesisMessages.add(exchange.getMessage().getBody(String.class))); +from(componentUriForDefaultCredentials()) +.process(exchange -> aws2KinesisMessages.add(exchange.getMessage().getBody(String.class))); } static class Producers { diff --git a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java index 4486af899c..99d7718a8c 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java @@ -79,6 +79,8 @@ public class Aws2KinesisTestEnvCustomizer implements Aws2TestEnvCustomizer { public void customize(Aws2TestEnvContext envContext) { final String streamName = "camel-quarkus-" + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); +final String streamNameForDefaultCredentials = "camel-quarkus-" ++ RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); final String streamArn; { envContext.property("aws-kinesis.stream-name", streamName); @@ -99,6 +101,19 @@ public class Aws2KinesisTestEnvCustomizer implements Aws2TestEnvCustomizer { envContext.closeable(() ->
[camel-quarkus] 14/21: Fixed ArangoDB and google-secret-manager version conflict + generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 27d134ae61fe5e9090c93b6f115173580e7b3948 Author: JiriOndrusek AuthorDate: Wed Jul 19 09:41:42 2023 +0200 Fixed ArangoDB and google-secret-manager version conflict + generated poms --- extensions-jvm/google-secret-manager/runtime/pom.xml| 8 +++- .../quarkus/component/arangodb/it/ArangodbResource.java | 4 +--- .../quarkus/component/arangodb/it/ArangodbTest.java | 5 ++--- poms/bom/src/main/generated/flattened-full-pom.xml | 17 +++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- .../main/generated/flattened-reduced-verbose-pom.xml| 2 +- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/extensions-jvm/google-secret-manager/runtime/pom.xml b/extensions-jvm/google-secret-manager/runtime/pom.xml index 54269907aa..6f2fa282ee 100644 --- a/extensions-jvm/google-secret-manager/runtime/pom.xml +++ b/extensions-jvm/google-secret-manager/runtime/pom.xml @@ -83,8 +83,14 @@ -google-cloud-pubsub com.google.cloud +google-cloud-pubsub + + +gax-httpjson +com.google.api + + diff --git a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java index eafdbbf913..e56adbcb65 100644 --- a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java +++ b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java @@ -23,7 +23,6 @@ import java.util.Map; import com.arangodb.entity.DocumentCreateEntity; import com.arangodb.entity.DocumentDeleteEntity; -import com.arangodb.util.MapBuilder; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; @@ -121,8 +120,7 @@ public class ArangodbResource { LOG.infof("Retrieve document from arangodb with foo: %s", fooName); String query = "FOR t IN camel FILTER t.foo == @foo RETURN t"; -Map bindVars = new MapBuilder().put("foo", fooName) -.get(); +Map bindVars = Map.of("foo", fooName); Map headers = new HashMap<>(); headers.put(AQL_QUERY, query); diff --git a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java index 82cf2bb695..642dd304c0 100644 --- a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java +++ b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java @@ -19,7 +19,6 @@ package org.apache.camel.quarkus.component.arangodb.it; import com.arangodb.ArangoCollection; import com.arangodb.ArangoDB; import com.arangodb.ArangoDatabase; -import com.arangodb.DbName; import com.arangodb.entity.BaseDocument; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; @@ -140,8 +139,8 @@ class ArangodbTest { String host = ConfigProvider.getConfig().getValue("camel.arangodb.host", String.class); Integer port = ConfigProvider.getConfig().getValue("camel.arangodb.port", Integer.class); arangoDb = new ArangoDB.Builder().host(host, port).build(); -arangoDb.createDatabase(DbName.of(DATABASE_NAME)); -ArangoDatabase arangoDatabase = arangoDb.db(DbName.of(DATABASE_NAME)); +arangoDb.createDatabase(DATABASE_NAME); +ArangoDatabase arangoDatabase = arangoDb.db(DATABASE_NAME); arangoDatabase.createCollection(COLLECTION_NAME); collection = arangoDatabase.collection(COLLECTION_NAME); } diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 0849da1c1c..c8a7c7c619 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6059,7 +6059,7 @@ com.google.oauth-client google-oauth-client -1.34.0 +1.34.1 commons-logging @@ -6180,6 +6180,16 @@ + +io.dropwizard.metrics +dropwizard-core +4.2.19 + + +io.dropwizard.metrics +metrics-jmx +4.2.19 + io.perfmark perfmark-api @@ -21039,11 +21049,6 @@ metrics-core 4.0.1 - -
[camel-quarkus] 13/21: Proper fix of tika version conflict + generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 3ba4a9e91c8931adb3846e4a5e0dc8733683945e Author: JiriOndrusek AuthorDate: Tue Jul 18 16:21:15 2023 +0200 Proper fix of tika version conflict + generated poms --- poms/bom/pom.xml | 15 +++ poms/bom/src/main/generated/flattened-full-pom.xml| 15 +++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +++ .../src/main/generated/flattened-reduced-verbose-pom.xml | 15 +++ 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index fdcae4dcae..a1b8d23ab1 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6386,10 +6386,6 @@ commons-logging commons-logging - -fontbox -org.apache.pdfbox - @@ -6515,6 +6511,17 @@ kudu-client ${kudu.version} + +org.apache.pdfbox +fontbox +${pdfbox.version} + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index ecdfd44de6..0849da1c1c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6428,6 +6424,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 58aa26a8b8..52cf685193 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6418,6 +6414,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 5be4fdd539..3e75c27e15 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6418,6 +6414,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons
[camel-quarkus] 11/21: POM regen
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 4df5185433840dd6fdbfbd2d01920ab1efa079a5 Author: JiriOndrusek AuthorDate: Mon Jul 17 14:07:37 2023 +0200 POM regen --- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e4b0ff8584..9210ee5ba6 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e55b1dadcf..e63e957e0b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 7947aebfd3..1e403ecbae 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto
[camel-quarkus] 20/21: generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit b6aedcbdbed6c1538984e86872db7a131d8ef340 Author: JiriOndrusek AuthorDate: Fri Jul 21 09:16:33 2023 +0200 generated poms --- pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index b46161d917..750d7d1d64 100644 --- a/pom.xml +++ b/pom.xml @@ -97,9 +97,9 @@ 1.313 ${google-auth-library-oauth2-http-version} ${google-oauth-client-version} -0.199.0 - 1.123.17 - 1.123.17 +0.200.0 + 1.123.18 + 1.123.18 22.3.2 4.0.13 1.56.0 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1e5eabeb84..4d576219a8 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6464,7 +6464,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6479,7 +6479,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d97c9a7815..4ee5110ee7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6439,7 +6439,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6454,7 +6454,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 68c3d6ed5a..8d3824dce6 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6439,7 +6439,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6454,7 +6454,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient
[camel-quarkus] 17/21: enabled ssh
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 72ddabb7914d62d2ad98483d45b0113460e23358 Author: JiriOndrusek AuthorDate: Thu Jul 20 08:46:11 2023 +0200 enabled ssh --- integration-tests/ssh/pom.xml| 5 ++--- .../test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/integration-tests/ssh/pom.xml b/integration-tests/ssh/pom.xml index 53e93384da..74bd48388f 100644 --- a/integration-tests/ssh/pom.xml +++ b/integration-tests/ssh/pom.xml @@ -71,8 +71,7 @@ - + virtualDependencies diff --git a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java index 9cf3c3f78c..4681ee0a94 100644 --- a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java +++ b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java @@ -20,7 +20,6 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,7 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class SshTest { @Test -@Disabled //temporarily disabled because of https://github.com/apache/camel-quarkus/issues/5092 public void testWriteToSSHAndReadFromSSH() { final String fileContent = "Hello Camel Quarkus SSH"; // Write a file to SSH session
[camel-quarkus] 07/21: Fixed twitter + generated stuff.
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 5ccc91c9c35423e7465dece6fbac0a6036b37c13 Author: JiriOndrusek AuthorDate: Thu Jul 13 17:13:54 2023 +0200 Fixed twitter + generated stuff. --- .../src/generated/resources/org/apache/camel/component/qute/qute.json | 2 +- .../camel/quarkus/component/twitter/deployment/TwitterProcessor.java| 2 +- .../java/org/apache/camel/quarkus/component/twitter/CamelResource.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json index 21cef72912..653cb4fcb8 100644 --- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json +++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json @@ -28,7 +28,7 @@ "quteEngine": { "index": 3, "kind": "property", "displayName": "Qute Engine", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.quarkus.qute.Engine", "deprecated": false, "autowired": false, "secret": false, "description": "To use the Engine otherwise a new engine is created" } }, "properties": { -"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registr [...] +"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will look [...] "allowContextMapAll": { "index": 1, "kind": "parameter", "displayName": "Allow Context Map All", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and C [...] "allowTemplateFromHeader": { "index": 2, "kind": "parameter", "displayName": "Allow Template From Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential s [...] "contentCache": { "index": 3, "kind": "parameter", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether to use resource content cache or not" }, diff --git a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java index 60a5d06614..7e1e9348ba 100644 --- a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java +++ b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java @@ -25,7 +25,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import org.apache.camel.component.twitter.AbstractTwitterComponent; -import twitter4j.auth.OAuthAuthorization; +import twitter4j.OAuthAuthorization; class TwitterProcessor { private static final String FEATURE = "camel-twitter"; diff --git a/integration-tests/twitter/src/main/java/org/apache/camel/quarkus/component/twitter/CamelResource.java
[camel-quarkus] 16/21: Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit ad41af24b433f70298f7bb25c8f88df44587290b Author: JiriOndrusek AuthorDate: Wed Jul 19 12:32:37 2023 +0200 Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 --- poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 - poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 - 2 files changed, 10 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7a18d60f90..f6373ec294 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6336,11 +6336,6 @@ jakarta.jms-api 3.1.0 - -jaxen -jaxen -1.2.0 - joda-time joda-time diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d69c679e8e..4db76fb393 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6336,11 +6336,6 @@ jakarta.jms-api 3.1.0 - -jaxen -jaxen -1.2.0 - joda-time joda-time
[camel-quarkus] branch camel-main updated (61ca05fda1 -> 6f536f3281)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 61ca05fda1 Fixed aws2-kinesis discard f044858b8d generated poms discard 67f89e2f5a Fixed web3j + generated poms discard efc58d8d32 Fixed arangodb + generated pomns discard 1dfaedc2e7 enabled ssh discard d373f26500 Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 discard 2dd5e6bcd2 Fixed Atom discard 847f6bfc85 Fixed ArangoDB and google-secret-manager version conflict + generated poms discard 3f36569a60 Proper fix of tika version conflict + generated poms discard 02deb606c3 Fixed tika version conflict + regen of poms discard a5f01d7d62 POM regen discard a76318e4d6 Workaround for dataformat (because of iCal4j update - #5099 discard 4ac940659e generated poms discard e88155cd97 Fixed Slack discard affea51792 Fixed twitter + generated stuff. discard f629de2336 generated POMs discard 3b37d431eb fixed debezium version problem discard 93d9ef6e95 Fixed version conflict + substitution in json-validator discard 1ee54b9470 fixed optaplanner version conflict + generated files discard 6e0706e376 synced + generated files discard 7f9aa917c2 Upgrade Camel to 4.0.0 add 41c7dfd634 Fix hamcrest GAV in bom-test add 8f487a5b71 Update hamcrest GAV in dependabot.yml add 96b6a98d0a Build Camel from source for camel-main branch builds new da1624ebb6 Upgrade Camel to 4.0.0 new e637a414c9 synced + generated files new c124bece99 fixed optaplanner version conflict + generated files new 4622a74b05 Fixed version conflict + substitution in json-validator new 25e3849301 fixed debezium version problem new 7f063c76d2 generated POMs new 5ccc91c9c3 Fixed twitter + generated stuff. new a3df65ca73 Fixed Slack new 235a28ea0b generated poms new 4c96358e0c Workaround for dataformat (because of iCal4j update - #5099 new 4df5185433 POM regen new 1078609654 Fixed tika version conflict + regen of poms new 3ba4a9e91c Proper fix of tika version conflict + generated poms new 27d134ae61 Fixed ArangoDB and google-secret-manager version conflict + generated poms new a628accd99 Fixed Atom new ad41af24b4 Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 new 72ddabb791 enabled ssh new af0693a188 Fixed arangodb + generated pomns new 08c8091902 Fixed web3j + generated poms new b6aedcbdbe generated poms new 6f536f3281 Fixed aws2-kinesis 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 (61ca05fda1) \ N -- N -- N refs/heads/camel-main (6f536f3281) 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 21 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: .github/dependabot.yml | 2 +- .github/workflows/ci-build.yaml | 33 - poms/bom-test/pom.xml | 4 ++-- 3 files changed, 11 insertions(+), 28 deletions(-)
[camel-quarkus] 18/21: Fixed arangodb + generated pomns
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit af0693a1881ec2a6d2922d9c4eb585b33dc1c628 Author: JiriOndrusek AuthorDate: Thu Jul 20 11:03:39 2023 +0200 Fixed arangodb + generated pomns --- .../component/arangodb/it/ArangodbResource.java| 58 + .../component/arangodb/it/ArangodbTest.java| 75 +- .../arangodb/it/ArangodbTestResource.java | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 10 +-- .../src/main/generated/flattened-reduced-pom.xml | 10 +-- .../generated/flattened-reduced-verbose-pom.xml| 10 +-- 6 files changed, 91 insertions(+), 74 deletions(-) diff --git a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java index e56adbcb65..8da0ca2ef0 100644 --- a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java +++ b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java @@ -17,10 +17,13 @@ package org.apache.camel.quarkus.component.arangodb.it; import java.net.URI; -import java.util.Collection; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import com.arangodb.entity.BaseDocument; import com.arangodb.entity.DocumentCreateEntity; import com.arangodb.entity.DocumentDeleteEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -36,6 +39,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.camel.ProducerTemplate; +import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; import static org.apache.camel.component.arangodb.ArangoDbConstants.AQL_QUERY; @@ -44,7 +48,7 @@ import static org.apache.camel.component.arangodb.ArangoDbConstants.AQL_QUERY_OP import static org.apache.camel.component.arangodb.ArangoDbConstants.ARANGO_KEY; import static org.apache.camel.component.arangodb.ArangoDbConstants.RESULT_CLASS_TYPE; -@Path("/arangodb/camel") +@Path("/arangodb") @ApplicationScoped public class ArangodbResource { @@ -53,14 +57,20 @@ public class ArangodbResource { @Inject ProducerTemplate producerTemplate; +@ConfigProperty(name = "camel.arangodb.host") +String host; + +@ConfigProperty(name = "camel.arangodb.port") +String port; + @PUT @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN) public Response put(String message) throws Exception { LOG.infof("Saving to arangodb: %s", message); final DocumentCreateEntity response = producerTemplate.requestBody( - "arangodb:test?host={{camel.arangodb.host}}={{camel.arangodb.port}}=camel=SAVE_DOCUMENT", -message, DocumentCreateEntity.class); + String.format("arangodb:test?host=%s=%s=camel=SAVE_DOCUMENT", host, port), +toDocument(message), DocumentCreateEntity.class); LOG.infof("Got response from arangodb: %s", response); return Response .created(new URI("https://camel.apache.org/;)) @@ -73,13 +83,13 @@ public class ArangodbResource { @Produces(MediaType.TEXT_PLAIN) public Response get(@PathParam("key") String key) throws Exception { LOG.infof("Retrieve document from arangodb with key: %s", key); -final String response = producerTemplate.requestBodyAndHeader( +final BaseDocument response = producerTemplate.requestBodyAndHeader( "arangodb:test?host={{camel.arangodb.host}}={{camel.arangodb.port}}=camel=FIND_DOCUMENT_BY_KEY", -key, RESULT_CLASS_TYPE, String.class, String.class); +key, RESULT_CLASS_TYPE, BaseDocument.class, BaseDocument.class); LOG.infof("Got response from arangodb: %s", response); return Response .ok() -.entity(response) +.entity(toString(response)) .build(); } @@ -107,7 +117,7 @@ public class ArangodbResource { producerTemplate.requestBodyAndHeaders( "arangodb:test?host={{camel.arangodb.host}}={{camel.arangodb.port}}=camel=UPDATE_DOCUMENT", -msg, headers, String.class); +toDocument(msg), headers, String.class); return Response .ok() .build(); @@ -126,15 +136,39 @@ public class ArangodbResource { headers.put(AQL_QUERY, query); headers.put(AQL_QUERY_BIND_PARAMETERS, bindVars); headers.put(AQL_QUERY_OPTIONS, null); -
[camel-quarkus] 05/21: fixed debezium version problem
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 25e384930121c091d787efeadc174f8002ba868a Author: JiriOndrusek AuthorDate: Thu Jul 13 11:04:28 2023 +0200 fixed debezium version problem --- pom.xml| 1 - poms/bom/pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 432 ++--- .../src/main/generated/flattened-reduced-pom.xml | 28 +- .../generated/flattened-reduced-verbose-pom.xml| 132 +++ 5 files changed, 297 insertions(+), 298 deletions(-) diff --git a/pom.xml b/pom.xml index f8a7fa0135..dd6a0b8fe6 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,6 @@ camel-${camel.major.minor}.x camel-spring-boot-${camel.major.minor}.x 1.2.0 -2.2.0.Final 9.37.0.Final 2.4.1 3.0.1 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index b5f0040b28..63bff236a7 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -88,7 +88,7 @@ io.debezium debezium-bom -${debezium.version} +${debezium-version} pom import diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index ba936a2e5c..35457be641 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6180,16 +6180,6 @@ - -io.dropwizard.metrics -dropwizard-core -4.2.19 - - -io.dropwizard.metrics -metrics-jmx -4.2.19 - io.perfmark perfmark-api @@ -20932,9 +20922,9 @@ 25.1-jre-graal-sub-1 -org.apache.kafka -connect-api -3.4.0 +org.apache.kafka +connect-api +3.4.0 javax.ws.rs @@ -20943,337 +20933,347 @@ -org.apache.kafka -connect-json -3.4.0 +org.apache.kafka +connect-json +3.4.0 + + +org.apache.kafka +connect-file +3.4.0 + + +org.apache.kafka +connect-transforms +3.4.0 -org.apache.kafka -connect-file -3.4.0 +org.apache.kafka +kafka_2.13 +3.4.0 +test -org.apache.kafka -connect-transforms -3.4.0 +io.confluent +kafka-connect-avro-converter +7.0.1 -org.apache.kafka -kafka_2.13 -3.4.0 -test +io.confluent +kafka-connect-protobuf-converter +7.0.1 -io.confluent -kafka-connect-avro-converter -7.0.1 +io.apicurio +apicurio-registry-utils-converter +2.4.1.Final -io.confluent -kafka-connect-protobuf-converter -7.0.1 +com.mysql +mysql-connector-j +8.0.33 -io.apicurio -apicurio-registry-utils-converter -2.4.1.Final +com.zendesk +mysql-binlog-connector-java +0.27.2 -com.mysql -mysql-connector-j -8.0.32 +mil.nga +wkb +1.0.2 -com.zendesk -mysql-binlog-connector-java -0.27.2 +com.oracle.instantclient +xstreams +21.6.0.0 -mil.nga -wkb -1.0.2 +ch.qos.logback +logback-classic +1.2.10 -com.oracle.instantclient -xstreams -21.6.0.0 +org.codehaus.groovy +groovy +3.0.7 -ch.qos.logback -logback-classic -1.2.10 +org.codehaus.groovy +groovy-json +3.0.7 -org.codehaus.groovy -groovy -3.0.7 +org.codehaus.groovy +groovy-jsr223 +3.0.7 -org.codehaus.groovy -groovy-json -3.0.7 +io.vitess +vitess-grpc-client +12.0.0 -org.codehaus.groovy -groovy-jsr223 -3.0.7 +org.apache.cassandra +cassandra-all +3.11.12 -io.vitess -vitess-grpc-client -12.0.0 +com.datastax.cassandra +cassandra-driver-core +4.14.0 -org.apache.cassandra -cassandra-all -3.11.12 +io.dropwizard.metrics +metrics-core +4.0.1 -com.datastax.cassandra -
[camel-quarkus] 19/21: Fixed web3j + generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 08c8091902c27ac6eeaee3ad9d554f08fb4d1749 Author: JiriOndrusek AuthorDate: Thu Jul 20 13:07:57 2023 +0200 Fixed web3j + generated poms --- pom.xml | 1 + poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml| 5 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 + poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 + 5 files changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index dd6a0b8fe6..b46161d917 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ ${jetty-version} ${jira-rest-client-api-version} 5.6.0 +0.9.11 2.2.13 0.2.9 ${json-path-version} diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index a1b8d23ab1..1bed98f8d0 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6091,6 +6091,11 @@ + +com.github.jnr +jnr-constants +${jnr-constants.version} + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 76a61f8661..1e5eabeb84 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 0a147eea3b..d97c9a7815 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index a99a8ea618..68c3d6ed5a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi
[camel-quarkus] 15/21: Fixed Atom
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a628accd9957e807cccb328ee9c29e43e1f147c0 Author: JiriOndrusek AuthorDate: Wed Jul 19 11:09:35 2023 +0200 Fixed Atom --- .../component/atom/deployment/AtomProcessor.java | 8 -- .../quarkus/component/atom/it/AtomResource.java| 33 +- .../src/main/resources/META-INF/resources/atom.xml | 6 ++-- .../camel/quarkus/component/atom/it/AtomTest.java | 10 ++- 4 files changed, 19 insertions(+), 38 deletions(-) diff --git a/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java b/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java index 2956932b33..681b68246a 100644 --- a/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java +++ b/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java @@ -18,9 +18,6 @@ package org.apache.camel.quarkus.component.atom.deployment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import org.apache.abdera.parser.stax.FOMFactory; -import org.apache.abdera.parser.stax.FOMParser; class AtomProcessor { @@ -30,9 +27,4 @@ class AtomProcessor { FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); } - -@BuildStep -ReflectiveClassBuildItem registerForReflection() { -return ReflectiveClassBuildItem.builder(FOMParser.class, FOMFactory.class).build(); -} } diff --git a/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java b/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java index 5a0e5a4995..46039e9de8 100644 --- a/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java +++ b/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java @@ -16,6 +16,9 @@ */ package org.apache.camel.quarkus.component.atom.it; +import java.util.List; + +import com.apptasticsoftware.rssreader.Item; import jakarta.inject.Inject; import jakarta.json.Json; import jakarta.json.JsonArrayBuilder; @@ -26,8 +29,6 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import org.apache.abdera.model.Entry; -import org.apache.abdera.model.Feed; import org.apache.camel.ConsumerTemplate; import org.apache.camel.Exchange; import org.apache.camel.component.atom.AtomConstants; @@ -43,27 +44,19 @@ public class AtomResource { @Produces(MediaType.APPLICATION_JSON) public JsonObject consumeAtomFeed(@QueryParam("test-port") int port) throws Exception { Exchange exchange = consumerTemplate.receive("atom://http://localhost:; + port + "/atom.xml?splitEntries=false"); -Feed feed = exchange.getMessage().getHeader(AtomConstants.ATOM_FEED, Feed.class); - -JsonObjectBuilder atom = Json.createObjectBuilder(); -atom.add("title", feed.getTitle()); -atom.add("subtitle", feed.getSubtitle()); -atom.add("link", feed.getLinks().get(0).getHref().toASCIIString()); +List feed = exchange.getIn().getHeader(AtomConstants.ATOM_FEED, List.class); +JsonArrayBuilder atom = Json.createArrayBuilder(); -JsonArrayBuilder entries = Json.createArrayBuilder(); - -for (Entry entry : feed.getEntries()) { +for (Item entry : feed) { JsonObjectBuilder atomEntry = Json.createObjectBuilder(); -atomEntry.add("title", entry.getTitle()); -atomEntry.add("link", entry.getLinks().get(0).getHref().toASCIIString()); -atomEntry.add("summary", entry.getSummary()); -atomEntry.add("content", entry.getContent()); -atomEntry.add("author", entry.getAuthor().getName()); -entries.add(atomEntry); +atomEntry.add("title", entry.getTitle().get()); +atomEntry.add("link", entry.getLink().get()); +atomEntry.add("comments", entry.getComments().get()); +atomEntry.add("description", entry.getDescription().get()); +atomEntry.add("author", entry.getAuthor().get()); +atom.add(atomEntry); } -atom.add("entries", entries.build()); - -return atom.build(); +return Json.createObjectBuilder().add("entries", atom.build()).build(); } } diff --git a/integration-tests/syndication/src/main/resources/META-INF/resources/atom.xml
[camel-quarkus] 10/21: Workaround for dataformat (because of iCal4j update - #5099
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 4c96358e0c728a4dc96d49964e8fc51b1fc664b1 Author: JiriOndrusek AuthorDate: Mon Jul 17 12:50:47 2023 +0200 Workaround for dataformat (because of iCal4j update - #5099 --- .../component/ical/deployment/IcalProcessor.java | 22 .../deployment/SchemaValidatorFactorySubst.java| 39 ++ 2 files changed, 61 insertions(+) diff --git a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java index 23c1623539..989dd7cd8c 100644 --- a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java +++ b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java @@ -20,9 +20,13 @@ import java.util.stream.Stream; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; class IcalProcessor { @@ -57,4 +61,22 @@ class IcalProcessor { .forEach(path -> nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem(path))); } +@BuildStep +void registerWsSecurityReflectionItems(CombinedIndexBuildItem combinedIndexBuildItem, +BuildProducer reflectiveClass) { +reflectiveClass + .produce(ReflectiveClassBuildItem.builder("net.fortuna.ical4j.util.MapTimeZoneCache").methods(true).build()); +} + +@BuildStep +IndexDependencyBuildItem registerDependencyForIndex() { +return new IndexDependencyBuildItem("org.mnode.ical4j", "ical4j"); +} + +@BuildStep +void runtimeInitializedClasses(BuildProducer runtimeInitializedClass) { +runtimeInitializedClass +.produce(new RuntimeInitializedClassBuildItem("net.fortuna.ical4j.validate.schema.JsonSchemaValidator")); +} + } diff --git a/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java b/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java new file mode 100644 index 00..e3f6e3447a --- /dev/null +++ b/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java @@ -0,0 +1,39 @@ +/* + * 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.quarkus.component.ical.deployment; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import net.fortuna.ical4j.model.parameter.Schema; +import net.fortuna.ical4j.model.property.StructuredData; +import net.fortuna.ical4j.validate.Validator; +import net.fortuna.ical4j.validate.schema.SchemaValidatorFactory; + +@TargetClass(value = SchemaValidatorFactory.class) +final class SchemaValidatorFactorySubstitutions { + +@Substitute +public static Validator newInstance(Schema schema) { +//see https://github.com/apache/camel-quarkus/issues/5099 for more details +//Method causes error (it is unclear to me, why it is happening): +//UnresolvedElementException: Discovered unresolved method during parsing: net.fortuna.ical4j.validate.schema.JsonSchemaValidator.(java.net.URL). +// This error is reported at image build time because class net.fortuna.ical4j.validate.schema.SchemaValidatorFactory +
[camel-quarkus] 04/21: Fixed version conflict + substitution in json-validator
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 4622a74b056bc65106936848f5b2a101f940befb Author: JiriOndrusek AuthorDate: Wed Jul 12 14:51:26 2023 +0200 Fixed version conflict + substitution in json-validator --- .../graal/JsonValidatorSubstitutions.java | 39 +++--- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java b/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java index 82518ba3fd..5237dc65a3 100644 --- a/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java +++ b/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java @@ -19,16 +19,10 @@ package org.apache.camel.quarkus.component.json.validator.graal; import java.lang.reflect.Constructor; import java.util.function.BooleanSupplier; -import com.fasterxml.jackson.databind.JsonNode; -import com.networknt.schema.JsonSchema; -import com.networknt.schema.JsonValidator; -import com.networknt.schema.PatternValidator; import com.networknt.schema.ValidationContext; -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.Delete; +import com.networknt.schema.regex.RegularExpression; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.TargetElement; /** * Removes references to PatternValidatorEcma262Deletion, which requires optional org.jruby.joni:joni @@ -36,36 +30,27 @@ import com.oracle.svm.core.annotate.TargetElement; public class JsonValidatorSubstitutions { } -@TargetClass(value = PatternValidator.class, onlyWith = IsJoniAbsent.class) -final class PatternValidatorSubstitutions { -@Alias -private JsonValidator delegate; -@Alias -private ValidationContext validationContext; +@TargetClass(value = RegularExpression.class, onlyWith = IsJoniAbsent.class) +@Substitute +interface RegularExpressionSubstitutions { +@Substitute +boolean matches(String value); @Substitute -@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) -public PatternValidatorSubstitutions(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, -ValidationContext validationContext) { +static RegularExpression compile(String regex, ValidationContext validationContext) { +if (null == regex) +return s -> true; try { -Class clazz = Class.forName("com.networknt.schema.PatternValidator$PatternValidatorJava"); -Constructor constructor = clazz.getDeclaredConstructor(String.class, JsonNode.class, JsonSchema.class, -ValidationContext.class); +Class clazz = Class.forName("com.networknt.schema.regex.JDKRegularExpression"); +Constructor constructor = clazz.getDeclaredConstructor(String.class); -this.validationContext = validationContext; -this.delegate = (JsonValidator) constructor.newInstance(schemaPath, schemaNode, parentSchema, -validationContext); +return (RegularExpression) constructor.newInstance(regex); } catch (Exception e) { throw new RuntimeException(e); } } } -@TargetClass(className = "com.networknt.schema.PatternValidator$PatternValidatorEcma262", onlyWith = IsJoniAbsent.class) -@Delete -final class PatternValidatorEcma262Deletion { -} - final class IsJoniAbsent implements BooleanSupplier { @Override public boolean getAsBoolean() {
[camel-quarkus] 09/21: generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 235a28ea0b322b71b5225de32816494f8578a043 Author: JiriOndrusek AuthorDate: Mon Jul 17 08:48:47 2023 +0200 generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 30 +++--- .../src/main/generated/flattened-reduced-pom.xml | 30 +++--- .../generated/flattened-reduced-verbose-pom.xml| 30 +++--- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b8a76a5adf..e4b0ff8584 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5917,7 +5917,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -6.6.1 +6.6.2 com.google.code.findbugs @@ -5936,32 +5936,32 @@ ca.uhn.hapi.fhir hapi-fhir-client -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -6.6.1 +6.6.2 ca.uhn.hapi.fhir @@ -6193,7 +6193,7 @@ io.projectreactor.netty reactor-netty -1.1.6 +1.1.9 io.quarkiverse.freemarker @@ -6564,7 +6564,7 @@ org.springframework spring-aop -6.0.10 +6.0.11 org.springframework @@ -6579,7 +6579,7 @@ org.springframework spring-expression -6.0.10 +6.0.11 org.springframework @@ -6590,7 +6590,7 @@ org.springframework spring-jdbc -6.0.10 +6.0.11 org.springframework @@ -6605,7 +6605,7 @@ org.springframework spring-jms -6.0.10 +6.0.11 org.springframework @@ -6620,7 +6620,7 @@ org.springframework spring-messaging -6.0.10 +6.0.11 org.springframework @@ -6635,7 +6635,7 @@ org.springframework spring-orm -6.0.10 +6.0.11 org.springframework @@ -6650,7 +6650,7 @@ org.springframework spring-tx -6.0.10 +6.0.11 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index ddb9bc42d7..e55b1dadcf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -5917,7 +5917,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -6.6.1 +6.6.2 com.google.code.findbugs @@ -5936,32 +5936,32 @@ ca.uhn.hapi.fhir hapi-fhir-client -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -6.6.1 +6.6.2 ca.uhn.hapi.fhir @@ -6193,7 +6193,7 @@ io.projectreactor.netty reactor-netty -1.1.6 +1.1.9 io.quarkiverse.freemarker @@ -6544,7 +6544,7 @@ org.springframework spring-aop -6.0.10 +6.0.11 org.springframework @@ -6559,7 +6559,7 @@ org.springframework spring-expression -6.0.10 +6.0.11 org.springframework @@ -6570,7 +6570,7 @@ org.springframework spring-jdbc -6.0.10 +6.0.11 org.springframework @@ -6585,7 +6585,7 @@ org.springframework spring-jms
[camel-quarkus] 12/21: Fixed tika version conflict + regen of poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1078609654d584d1aa4015d660149a728fa54e9b Author: JiriOndrusek AuthorDate: Tue Jul 18 09:12:56 2023 +0200 Fixed tika version conflict + regen of poms --- poms/bom/pom.xml | 4 poms/bom/src/main/generated/flattened-full-pom.xml| 10 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 10 +++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 63bff236a7..fdcae4dcae 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6386,6 +6386,10 @@ commons-logging commons-logging + +fontbox +org.apache.pdfbox + diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9210ee5ba6..ecdfd44de6 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6509,7 +6513,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6534,7 +6538,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e63e957e0b..58aa26a8b8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6494,7 +6498,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6514,7 +6518,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 1e403ecbae..5be4fdd539 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6494,7 +6498,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6514,7 +6518,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis
[camel-quarkus] 06/21: generated POMs
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 7f063c76d2cdac5133ef05ed516fed30b029ac44 Author: JiriOndrusek AuthorDate: Thu Jul 13 12:51:19 2023 +0200 generated POMs --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 35457be641..b8a76a5adf 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6514,7 +6514,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 2579bfed7e..ddb9bc42d7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6499,7 +6499,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 3023fad4f1..5447bf7fc3 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6499,7 +6499,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin