You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2021/01/29 03:40:37 UTC
[camel-quarkus] branch camel-master updated (8231127 -> 7a1db48)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 8231127 Fix infinispan extension and clean up redundant substitutions
discard 12d9358 Regen docs
discard 771155f add HazelcastReplicatedmapConsumer test fixes #2095
discard 085c044 Allow to reset build taken for native builds that are super fast.
discard e157228 Adjust to camel 3.8 change
discard 8faaada Upgrade to Camel 3.8.0
add 5dadd1b Upgrade Quarkus to 1.11.1.Final
add ee8e5bb Make install-jdk step the first task in each job for nightly builds. Else running reporting fails JDK version enforcer checks
add 52c21b0 polished
new 10322c8 Upgrade to Camel 3.8.0
new 11b4390 Adjust to camel 3.8 change
new a314471 Allow to reset build taken for native builds that are super fast.
new 3943c99 add HazelcastReplicatedmapConsumer test fixes #2095
new 9526e97 Regen docs
new 7a1db48 Fix infinispan extension and clean up redundant substitutions
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 (8231127)
\
N -- N -- N refs/heads/camel-master (7a1db48)
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 6 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/workflows/camel-master-cron.yaml | 24 ++++++++++++------------
.github/workflows/quarkus-master-cron.yaml | 24 ++++++++++++------------
integration-tests/saga/pom.xml | 2 +-
pom.xml | 2 +-
4 files changed, 26 insertions(+), 26 deletions(-)
[camel-quarkus] 06/06: Fix infinispan extension and clean up
redundant substitutions
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7a1db484d4b4960dade0923ec5978ce9c8d10201
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jan 28 10:46:10 2021 +0000
Fix infinispan extension and clean up redundant substitutions
---
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 --------
5 files changed, 12 insertions(+), 155 deletions(-)
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);
- }
-}
[camel-quarkus] 04/06: add HazelcastReplicatedmapConsumer test
fixes #2095
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3943c9990521c0eecba8bb7911089c39de1dd4a5
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Mon Jan 25 10:31:56 2021 +0100
add HazelcastReplicatedmapConsumer test fixes #2095
---
.../hazelcast/it/HazelcastReplicatedmapTest.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastReplicatedmapTest.java b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastReplicatedmapTest.java
index 222e545..b134a2a 100644
--- a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastReplicatedmapTest.java
+++ b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastReplicatedmapTest.java
@@ -16,16 +16,20 @@
*/
package org.apache.camel.quarkus.component.hazelcast.it;
+import java.util.Arrays;
+import java.util.List;
import java.util.concurrent.TimeUnit;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.common.http.TestHTTPEndpoint;
import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import org.apache.camel.quarkus.component.hazelcast.it.model.HazelcastMapRequest;
import org.junit.jupiter.api.Test;
import static io.restassured.RestAssured.given;
+import static org.awaitility.Awaitility.await;
import static org.hamcrest.Matchers.equalTo;
@QuarkusTest
@@ -89,7 +93,7 @@ public class HazelcastReplicatedmapTest {
.then()
.body(equalTo("true"));
- // verify that map doesn't contain value "val2"
+ // verify that map doesn't contain value "val3"
given()
.contentType(ContentType.JSON)
.when()
@@ -119,5 +123,17 @@ public class HazelcastReplicatedmapTest {
.then()
.statusCode(202);
+ // verify that the consumer has received all added keys
+ await().atMost(10L, TimeUnit.SECONDS).until(() -> {
+ List<String> body = RestAssured.get("/added").then().extract().body().as(List.class);
+ return body.size() == 2 && body.containsAll(Arrays.asList("1", "2"));
+ });
+
+ // verify that the consumer has received all removed keys
+ await().atMost(10L, TimeUnit.SECONDS).until(() -> {
+ List<String> body = RestAssured.get("/deleted").then().extract().body().as(List.class);
+ return body.size() == 1 && body.contains("1");
+ });
+
}
}
[camel-quarkus] 05/06: Regen docs
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9526e971fef329746ccfd86a71887218110de1b0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 28 10:36:45 2021 +0100
Regen docs
---
.../ROOT/pages/reference/extensions/caffeine-lrucache.adoc | 8 +++++++-
.../azure-storage-datalake.adoc} | 0
.../flight-recorder.adoc => components/hwcloud-smn.adoc} | 0
.../infinispan-embedded.adoc} | 0
.../flight-recorder.adoc => components/kamelet.adoc} | 0
.../{others/flight-recorder.adoc => components/stitch.adoc} | 0
.../ROOT/partials/reference/others/caffeine-lrucache.adoc | 13 +++++++++++++
7 files changed, 20 insertions(+), 1 deletion(-)
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/partials/reference/others/flight-recorder.adoc b/docs/modules/ROOT/partials/reference/components/azure-storage-datalake.adoc
similarity index 100%
copy from docs/modules/ROOT/partials/reference/others/flight-recorder.adoc
copy to docs/modules/ROOT/partials/reference/components/azure-storage-datalake.adoc
diff --git a/docs/modules/ROOT/partials/reference/others/flight-recorder.adoc b/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
similarity index 100%
copy from docs/modules/ROOT/partials/reference/others/flight-recorder.adoc
copy to docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
diff --git a/docs/modules/ROOT/partials/reference/others/flight-recorder.adoc b/docs/modules/ROOT/partials/reference/components/infinispan-embedded.adoc
similarity index 100%
copy from docs/modules/ROOT/partials/reference/others/flight-recorder.adoc
copy to docs/modules/ROOT/partials/reference/components/infinispan-embedded.adoc
diff --git a/docs/modules/ROOT/partials/reference/others/flight-recorder.adoc b/docs/modules/ROOT/partials/reference/components/kamelet.adoc
similarity index 100%
copy from docs/modules/ROOT/partials/reference/others/flight-recorder.adoc
copy to docs/modules/ROOT/partials/reference/components/kamelet.adoc
diff --git a/docs/modules/ROOT/partials/reference/others/flight-recorder.adoc b/docs/modules/ROOT/partials/reference/components/stitch.adoc
similarity index 100%
rename from docs/modules/ROOT/partials/reference/others/flight-recorder.adoc
rename to docs/modules/ROOT/partials/reference/components/stitch.adoc
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
[camel-quarkus] 03/06: Allow to reset build taken for native builds
that are super fast.
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a314471ae44ee87d6cfa3597a07f170bb2242e26
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 25 09:55:36 2021 +0100
Allow to reset build taken for native builds that are super fast.
---
.../main/java/org/apache/camel/quarkus/core/FastCamelContext.java | 6 ++++++
.../main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index fd96350..2a30802 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -177,7 +177,13 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
setTracing(Boolean.FALSE);
setDebugging(Boolean.FALSE);
setMessageHistory(Boolean.FALSE);
+ }
+ @Override
+ public void build() {
+ super.build();
+ // we are fast build so the time should be reset to 0
+ resetBuildTime();
}
@Override
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 477bcc3..d48fe02 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,8 +19,8 @@ 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.LoggingLevel;
import org.apache.camel.Service;
import org.apache.camel.spi.RouteStartupOrder;
import org.apache.camel.spi.ShutdownStrategy;
[camel-quarkus] 02/06: Adjust to camel 3.8 change
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 11b43904348df7babc014d723614befccfa94d07
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 25 09:28:14 2021 +0100
Adjust to camel 3.8 change
---
.../java/org/apache/camel/quarkus/core/NoShutdownStrategy.java | 10 ++++++++++
1 file changed, 10 insertions(+)
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() {
}
[camel-quarkus] 01/06: Upgrade to Camel 3.8.0
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 10322c876a5f275b22864719ab7021e52b192aa6
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 +--
.../quarkus/component/hazelcast/it/HazelcastQueueTest.java | 2 --
pom.xml | 6 +++---
13 files changed, 13 insertions(+), 30 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/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 4602446..de5624b 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 -->