You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/01/25 07:54:24 UTC
[camel-quarkus] branch camel-master updated (6148e4d -> 4343bd5)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
omit 6148e4d Upgrade to Camel 3.8.0
add 3770917 Avoid usage of deprecated capabilities string constants
add 7d8d55f Google BigQuery native is since 1.6.0 not 1.5.0
add 9553e86 Upgrade Camel to 3.7.1
add 6023d9f IPFS native support
add a0d82d7 Increased maven-plugin-version to 1.11.0.Final. Adjusted description of rest-json example
new 4343bd5 Upgrade to Camel 3.8.0
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 (6148e4d)
\
N -- N -- N refs/heads/camel-master (4343bd5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../reference/extensions/google-bigquery.adoc | 4 +-
.../ROOT/pages/reference/extensions/ipfs.adoc | 8 +--
.../modules/ROOT/pages/user-guide/first-steps.adoc | 4 +-
.../reference/components/google-bigquery-sql.adoc | 2 +-
.../reference/components/google-bigquery.adoc | 2 +-
.../ROOT/partials/reference/components/ipfs.adoc | 6 +-
.../component/ipfs/deployment/IpfsProcessor.java | 46 ------------
extensions-jvm/ipfs/integration-test/pom.xml | 83 ----------------------
.../quarkus/component/ipfs/it/IpfsResource.java | 51 -------------
.../camel/quarkus/component/ipfs/it/IpfsTest.java | 34 ---------
extensions-jvm/pom.xml | 1 -
extensions/google-bigquery/runtime/pom.xml | 2 +-
.../ipfs/deployment/pom.xml | 0
.../component/ipfs/deployment/IpfsProcessor.java} | 6 +-
{extensions-jvm => extensions}/ipfs/pom.xml | 1 -
.../ipfs/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
.../component/jta/deployment/JtaProcessor.java | 3 +-
extensions/pom.xml | 1 +
integration-tests/{twilio => ipfs}/pom.xml | 23 +++---
.../quarkus/component/ipfs/it/IpfsResource.java} | 33 +++++----
.../camel/quarkus/component/ipfs/it/IpfsIT.java} | 4 +-
.../camel/quarkus/component/ipfs/it/IpfsTest.java | 79 ++++++++++++++++++++
.../component/ipfs/it/IpfsTestResource.java | 39 +++++-----
integration-tests/pom.xml | 1 +
tooling/scripts/test-categories.yaml | 1 +
26 files changed, 154 insertions(+), 284 deletions(-)
delete mode 100644 extensions-jvm/ipfs/deployment/src/main/java/org/apache/camel/quarkus/component/ipfs/deployment/IpfsProcessor.java
delete mode 100644 extensions-jvm/ipfs/integration-test/pom.xml
delete mode 100644 extensions-jvm/ipfs/integration-test/src/main/java/org/apache/camel/quarkus/component/ipfs/it/IpfsResource.java
delete mode 100644 extensions-jvm/ipfs/integration-test/src/test/java/org/apache/camel/quarkus/component/ipfs/it/IpfsTest.java
rename {extensions-jvm => extensions}/ipfs/deployment/pom.xml (100%)
copy extensions/{file/deployment/src/main/java/org/apache/camel/quarkus/component/file/deployment/FileProcessor.java => ipfs/deployment/src/main/java/org/apache/camel/quarkus/component/ipfs/deployment/IpfsProcessor.java} (88%)
rename {extensions-jvm => extensions}/ipfs/pom.xml (97%)
rename {extensions-jvm => extensions}/ipfs/runtime/pom.xml (98%)
rename {extensions-jvm => extensions}/ipfs/runtime/src/main/resources/META-INF/quarkus-extension.yaml (97%)
copy integration-tests/{twilio => ipfs}/pom.xml (91%)
copy integration-tests/{csimple/src/main/java/org/apache/camel/quarkus/component/csimple/it/CSimpleResource.java => ipfs/src/main/java/org/apache/camel/quarkus/component/ipfs/it/IpfsResource.java} (63%)
copy integration-tests/{amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpIT.java => ipfs/src/test/java/org/apache/camel/quarkus/component/ipfs/it/IpfsIT.java} (91%)
create mode 100644 integration-tests/ipfs/src/test/java/org/apache/camel/quarkus/component/ipfs/it/IpfsTest.java
copy extensions-jvm/nitrite/integration-test/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTestResource.java => integration-tests/ipfs/src/test/java/org/apache/camel/quarkus/component/ipfs/it/IpfsTestResource.java (55%)
[camel-quarkus] 01/01: Upgrade to Camel 3.8.0
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4343bd5854561f51d7d391b3e518341a90d5f1f2
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Jan 6 08:53:07 2021 +0000
Upgrade to Camel 3.8.0
---
docs/modules/ROOT/pages/reference/extensions/jsonata.adoc | 2 +-
docs/modules/ROOT/pages/reference/extensions/sjms.adoc | 3 +--
.../modules/ROOT/partials/reference/components/jsonata.adoc | 4 ++--
.../ROOT/partials/reference/components/paho-mqtt5.adoc | 1 +
.../ROOT/partials/reference/components/sjms-batch.adoc | 13 -------------
.../ROOT/partials/reference/components/spring-rabbitmq.adoc | 1 +
.../ROOT/partials/reference/others/flight-recorder.adoc | 1 +
docs/modules/ROOT/partials/reference/others/jfr.adoc | 1 +
.../apache/camel/component/qute/QuteEndpointConfigurer.java | 3 ---
.../apache/camel/component/qute/QuteEndpointUriFactory.java | 3 +--
.../resources/org/apache/camel/component/qute/qute.json | 3 +--
pom.xml | 6 +++---
12 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/jsonata.adoc b/docs/modules/ROOT/pages/reference/extensions/jsonata.adoc
index d22514b..3b53fd3 100644
--- a/docs/modules/ROOT/pages/reference/extensions/jsonata.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/jsonata.adoc
@@ -16,7 +16,7 @@ JSON to JSON transformation using JSONATA.
== What's inside
-* xref:{cq-camel-components}::jsonata-component.adoc[JSONATA component], URI syntax: `jsonata:resourceUri`
+* xref:{cq-camel-components}::jsonata-component.adoc[JSONata component], URI syntax: `jsonata:resourceUri`
Please refer to the above link for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/sjms.adoc b/docs/modules/ROOT/pages/reference/extensions/sjms.adoc
index a9c8263..ccbfe90 100644
--- a/docs/modules/ROOT/pages/reference/extensions/sjms.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/sjms.adoc
@@ -18,9 +18,8 @@ Send and receive messages to/from a JMS Queue or Topic using plain JMS 1.x API.
== What's inside
* xref:{cq-camel-components}::sjms-component.adoc[Simple JMS component], URI syntax: `sjms:destinationType:destinationName`
-* xref:{cq-camel-components}::sjms-batch-component.adoc[Simple JMS Batch component], URI syntax: `sjms-batch:destinationName`
-Please refer to the above links for usage and configuration details.
+Please refer to the above link for usage and configuration details.
== Maven coordinates
diff --git a/docs/modules/ROOT/partials/reference/components/jsonata.adoc b/docs/modules/ROOT/partials/reference/components/jsonata.adoc
index 0e6518d..2b9f794 100644
--- a/docs/modules/ROOT/partials/reference/components/jsonata.adoc
+++ b/docs/modules/ROOT/partials/reference/components/jsonata.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 1.6.0
:cq-native-since: 1.6.0
:cq-camel-part-name: jsonata
-:cq-camel-part-title: JSONATA
-:cq-camel-part-description: JSON to JSON transformation using JSONATA.
+:cq-camel-part-title: JSONata
+:cq-camel-part-description: Transforms JSON payload using JSONata transformation.
:cq-extension-page-title: JSONATA
diff --git a/docs/modules/ROOT/partials/reference/components/paho-mqtt5.adoc b/docs/modules/ROOT/partials/reference/components/paho-mqtt5.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/paho-mqtt5.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/components/sjms-batch.adoc b/docs/modules/ROOT/partials/reference/components/sjms-batch.adoc
deleted file mode 100644
index eff2868..0000000
--- a/docs/modules/ROOT/partials/reference/components/sjms-batch.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Do not edit directly!
-// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
-:cq-artifact-id: camel-quarkus-sjms
-:cq-artifact-id-base: sjms
-:cq-native-supported: true
-:cq-status: Stable
-:cq-deprecated: false
-:cq-jvm-since: 1.0.0
-:cq-native-since: 1.0.0
-:cq-camel-part-name: sjms-batch
-:cq-camel-part-title: Simple JMS Batch
-:cq-camel-part-description: Highly performant and transactional batch consumption of messages from a JMS queue.
-:cq-extension-page-title: Simple JMS
diff --git a/docs/modules/ROOT/partials/reference/components/spring-rabbitmq.adoc b/docs/modules/ROOT/partials/reference/components/spring-rabbitmq.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/spring-rabbitmq.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/others/flight-recorder.adoc b/docs/modules/ROOT/partials/reference/others/flight-recorder.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/others/flight-recorder.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/others/jfr.adoc b/docs/modules/ROOT/partials/reference/others/jfr.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/others/jfr.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page
diff --git a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java
index ff14a7c..015d6e0 100644
--- a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java
+++ b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java
@@ -30,7 +30,6 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements
case "encoding": target.setEncoding(property(camelContext, java.lang.String.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
- case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
default: return false;
}
}
@@ -47,7 +46,6 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements
case "encoding": return java.lang.String.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
- case "synchronous": return boolean.class;
default: return null;
}
}
@@ -65,7 +63,6 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements
case "encoding": return target.getEncoding();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
- case "synchronous": return target.isSynchronous();
default: return null;
}
}
diff --git a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointUriFactory.java b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointUriFactory.java
index 3ab0ef8..46cc173 100644
--- a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointUriFactory.java
+++ b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointUriFactory.java
@@ -20,10 +20,9 @@ public class QuteEndpointUriFactory extends org.apache.camel.support.component.E
private static final Set<String> PROPERTY_NAMES;
private static final Set<String> SECRET_PROPERTY_NAMES;
static {
- Set<String> props = new HashSet<>(7);
+ Set<String> props = new HashSet<>(6);
props.add("allowTemplateFromHeader");
props.add("lazyStartProducer");
- props.add("synchronous");
props.add("contentCache");
props.add("allowContextMapAll");
props.add("resourceUri");
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 843e553..8ba71f3 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
@@ -33,7 +33,6 @@
"allowTemplateFromHeader": { "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 security vuln [...]
"contentCache": { "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" },
"encoding": { "kind": "parameter", "displayName": "Encoding", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Character encoding of the resource content." },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
- "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
}
}
diff --git a/pom.xml b/pom.xml
index 3a84c0f..10ae6db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -46,7 +46,7 @@
<bouncycastle.version>${bouncycastle-version}</bouncycastle.version><!-- keep in sync with Camel -->
<camel.major.minor>3.7</camel.major.minor> <!-- run after each change: cd docs && mvndev validate -->
- <camel.version>${camel.major.minor}.1</camel.version>
+ <camel.version>3.8.0-SNAPSHOT</camel.version>
<camel.docs.components.xref>${camel.major.minor}.x@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable branch on which our Antora docs depends -->
@@ -79,7 +79,7 @@
<jaxen.version>1.2.0</jaxen.version>
<javassist.version>3.22.0-CR2</javassist.version><!-- debezium -->
<jersey-sun.version>1.19.4</jersey-sun.version><!-- Spark -->
- <jetty.version>9.4.18.v20190429</jetty.version>
+ <jetty.version>${jetty9-version}</jetty.version>
<jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive deps -->
<kafka.version>2.5.0</kafka.version>
<kudu.version>${kudu-version}</kudu.version><!-- keep in sync with Camel -->