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 576f3271bb1cd895c4eece3b34c25c50c4018962
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Wed Jan 6 08:53:07 2021 +0000
Upgrade to Camel 3.8.0
---
.../reference/extensions/caffeine-lrucache.adoc | 8 +-
.../ROOT/pages/reference/extensions/jsonata.adoc | 2 +-
.../ROOT/pages/reference/extensions/sjms.adoc | 3 +-
.../components/azure-storage-datalake.adoc | 1 +
.../partials/reference/components/hwcloud-smn.adoc | 1 +
.../reference/components/infinispan-embedded.adoc | 1 +
.../partials/reference/components/jsonata.adoc | 4 +-
.../partials/reference/components/kamelet.adoc | 1 +
.../partials/reference/components/paho-mqtt5.adoc | 1 +
.../partials/reference/components/sjms-batch.adoc | 13 ---
.../reference/components/spring-rabbitmq.adoc | 1 +
.../ROOT/partials/reference/components/stitch.adoc | 1 +
.../reference/others/caffeine-lrucache.adoc | 13 +++
.../ROOT/partials/reference/others/jfr.adoc | 1 +
.../core/DisabledXMLRoutesDefinitionLoader.java | 6 --
.../camel/quarkus/core/NoShutdownStrategy.java | 10 +++
.../org/apache/camel/quarkus/main/CamelMain.java | 3 +-
extensions/infinispan/deployment/pom.xml | 4 -
.../infinispan/deployment/InfinispanProcessor.java | 12 +++
extensions/infinispan/runtime/pom.xml | 15 ----
.../graal/SubstituteDefaultCacheManager.java | 100 ---------------------
.../runtime/graal/SubstituteInfinispanManager.java | 36 --------
.../component/qute/QuteEndpointConfigurer.java | 3 -
.../component/qute/QuteEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/qute/qute.json | 3 +-
.../component/hazelcast/it/HazelcastQueueTest.java | 2 -
pom.xml | 6 +-
27 files changed, 61 insertions(+), 193 deletions(-)
diff --git
a/docs/modules/ROOT/pages/reference/extensions/caffeine-lrucache.adoc
b/docs/modules/ROOT/pages/reference/extensions/caffeine-lrucache.adoc
index 421db19..b13c69b 100644
--- a/docs/modules/ROOT/pages/reference/extensions/caffeine-lrucache.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/caffeine-lrucache.adoc
@@ -6,7 +6,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-description: An LRUCacheFactory implementation based on Caffeine
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,6 +15,12 @@
An LRUCacheFactory implementation based on Caffeine
+== What's inside
+
+* xref:{cq-camel-components}:others:caffeine-lrucache.adoc[Caffeine Lrucache]
+
+Please refer to the above link for usage and configuration details.
+
== Maven coordinates
[source,xml]
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/azure-storage-datalake.adoc
b/docs/modules/ROOT/partials/reference/components/azure-storage-datalake.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++
b/docs/modules/ROOT/partials/reference/components/azure-storage-datalake.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/hwcloud-smn.adoc
b/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-smn.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/infinispan-embedded.adoc
b/docs/modules/ROOT/partials/reference/components/infinispan-embedded.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/infinispan-embedded.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/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/kamelet.adoc
b/docs/modules/ROOT/partials/reference/components/kamelet.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/kamelet.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/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/components/stitch.adoc
b/docs/modules/ROOT/partials/reference/components/stitch.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/stitch.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/caffeine-lrucache.adoc
b/docs/modules/ROOT/partials/reference/others/caffeine-lrucache.adoc
new file mode 100644
index 0000000..648f4e7
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/others/caffeine-lrucache.adoc
@@ -0,0 +1,13 @@
+// Do not edit directly!
+// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+:cq-artifact-id: camel-quarkus-caffeine-lrucache
+:cq-artifact-id-base: caffeine-lrucache
+:cq-native-supported: true
+:cq-status: Stable
+:cq-deprecated: true
+:cq-jvm-since: 1.0.0
+:cq-native-since: 1.0.0
+:cq-camel-part-name: caffeine-lrucache
+:cq-camel-part-title: Caffeine Lrucache
+:cq-camel-part-description: Camel Caffeine LRUCache support
+:cq-extension-page-title: Caffeine LRUCache
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-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
index a50befb..ed92c66 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
@@ -19,7 +19,6 @@ package org.apache.camel.quarkus.core;
import java.io.InputStream;
import org.apache.camel.CamelContext;
-import org.apache.camel.NamedNode;
import org.apache.camel.spi.XMLRoutesDefinitionLoader;
public class DisabledXMLRoutesDefinitionLoader implements
XMLRoutesDefinitionLoader {
@@ -37,9 +36,4 @@ public class DisabledXMLRoutesDefinitionLoader implements
XMLRoutesDefinitionLoa
public Object loadRestsDefinition(CamelContext context, InputStream
inputStream) throws Exception {
throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-xml-io");
}
-
- @Override
- public <T extends NamedNode> T createModelFromXml(CamelContext context,
String xml, Class<T> type) throws Exception {
- throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-xml-io");
- }
}
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java
index 4110fba..477bcc3 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.core;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.CamelContext;
import org.apache.camel.Service;
import org.apache.camel.spi.RouteStartupOrder;
@@ -130,6 +131,15 @@ public class NoShutdownStrategy implements
ShutdownStrategy {
}
@Override
+ public LoggingLevel getLoggingLevel() {
+ return LoggingLevel.OFF;
+ }
+
+ public void setLoggingLevel(LoggingLevel LoggingLevel) {
+ // noop
+ }
+
+ @Override
public void start() {
}
diff --git
a/extensions-core/main/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
b/extensions-core/main/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
index ab75ad5..135b309 100644
---
a/extensions-core/main/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
+++
b/extensions-core/main/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
@@ -146,8 +146,9 @@ public final class CamelMain extends MainCommandLineSupport
implements HasCamelC
}
@Override
- public void run(String[] args) throws Exception {
+ public int run(String[] args) throws Exception {
parseArguments(args);
runEngine();
+ return getExitCode();
}
}
diff --git a/extensions/infinispan/deployment/pom.xml
b/extensions/infinispan/deployment/pom.xml
index 9326010..1beb5a8 100644
--- a/extensions/infinispan/deployment/pom.xml
+++ b/extensions/infinispan/deployment/pom.xml
@@ -38,10 +38,6 @@
<artifactId>quarkus-jaxb-deployment</artifactId>
</dependency>
<dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-caffeine-deployment</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
</dependency>
diff --git
a/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
b/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
index f305db1..3a2316b 100644
---
a/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
+++
b/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
@@ -18,6 +18,9 @@ package
org.apache.camel.quarkus.component.infinispan.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import org.apache.camel.component.infinispan.InfinispanProducer;
+import org.apache.camel.component.infinispan.remote.InfinispanRemoteProducer;
class InfinispanProcessor {
@@ -27,4 +30,13 @@ class InfinispanProcessor {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+ // TOOD: This can be removed after this is implemented:
+ // https://github.com/apache/camel-quarkus/issues/2176
+ @BuildStep
+ ReflectiveClassBuildItem registerForReflection() {
+ return new ReflectiveClassBuildItem(true, false,
+ InfinispanProducer.class.getName(),
+ InfinispanRemoteProducer.class.getName());
+ }
}
diff --git a/extensions/infinispan/runtime/pom.xml
b/extensions/infinispan/runtime/pom.xml
index aa9aea2..1df845e 100644
--- a/extensions/infinispan/runtime/pom.xml
+++ b/extensions/infinispan/runtime/pom.xml
@@ -58,10 +58,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxb</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-caffeine</artifactId>
- </dependency>
<dependency>
<groupId>org.infinispan</groupId>
@@ -87,17 +83,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-caffeine-lrucache</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.graalvm.nativeimage</groupId>
- <artifactId>svm</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
diff --git
a/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/infinispan/runtime/graal/SubstituteDefaultCacheManager.java
b/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/infinispan/runtime/graal/SubstituteDefaultCacheManager.java
deleted file mode 100644
index 7ed2456..0000000
---
a/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/infinispan/runtime/graal/SubstituteDefaultCacheManager.java
+++ /dev/null
@@ -1,100 +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.
- */
-package org.apache.camel.quarkus.infinispan.runtime.graal;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-import org.infinispan.configuration.cache.Configuration;
-import org.infinispan.configuration.global.GlobalConfiguration;
-import org.infinispan.configuration.parsing.ConfigurationBuilderHolder;
-import org.infinispan.manager.DefaultCacheManager;
-
-@TargetClass(DefaultCacheManager.class)
-final class SubstituteDefaultCacheManager {
-
- @Substitute
- public SubstituteDefaultCacheManager() {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(boolean start) {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(Configuration defaultConfiguration) {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(Configuration defaultConfiguration,
boolean start) {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(GlobalConfiguration
globalConfiguration) {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(GlobalConfiguration
globalConfiguration, boolean start) {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(GlobalConfiguration
globalConfiguration,
- Configuration defaultConfiguration) {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(GlobalConfiguration
globalConfiguration,
- Configuration defaultConfiguration,
- boolean start) {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(String configurationFile) throws
IOException {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(String configurationFile, boolean
start) throws IOException {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(InputStream configurationStream)
throws IOException {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(InputStream configurationStream,
boolean start)
- throws IOException {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-
- @Substitute
- public SubstituteDefaultCacheManager(ConfigurationBuilderHolder holder,
boolean start) {
- throw new RuntimeException("DefaultCacheManager not supported in
native image mode");
- }
-}
diff --git
a/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/infinispan/runtime/graal/SubstituteInfinispanManager.java
b/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/infinispan/runtime/graal/SubstituteInfinispanManager.java
deleted file mode 100644
index 196dce7..0000000
---
a/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/infinispan/runtime/graal/SubstituteInfinispanManager.java
+++ /dev/null
@@ -1,36 +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.
- */
-package org.apache.camel.quarkus.infinispan.runtime.graal;
-
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-import org.apache.camel.component.infinispan.InfinispanManager;
-import org.apache.camel.util.ObjectHelper;
-import org.infinispan.commons.api.BasicCache;
-import org.infinispan.commons.api.BasicCacheContainer;
-
-@TargetClass(InfinispanManager.class)
-final class SubstituteInfinispanManager {
- @Alias
- private BasicCacheContainer cacheContainer;
-
- @Substitute
- public <K, V> BasicCache<K, V> getCache(String cacheName) {
- return ObjectHelper.isEmpty(cacheName) ? cacheContainer.getCache() :
cacheContainer.getCache(cacheName);
- }
-}
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/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastQueueTest.java
b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastQueueTest.java
index b8ad960..3410a99 100644
---
a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastQueueTest.java
+++
b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastQueueTest.java
@@ -25,7 +25,6 @@ import io.quarkus.test.common.http.TestHTTPEndpoint;
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 io.restassured.RestAssured.given;
@@ -144,7 +143,6 @@ public class HazelcastQueueTest {
@SuppressWarnings("unchecked")
@Test
- @Disabled
public void testPollConsumer() {
// add all values
given()
diff --git a/pom.xml b/pom.xml
index 59c3e29..9f7cb23 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>
@@ -54,7 +54,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 -->
@@ -87,7 +87,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 -->
