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 2022/03/09 10:34:43 UTC
[camel-quarkus] 11/11: Upgrade Camel to 3.14.2
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f5366b882572556e7814730801d969cbe9ea081e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Mar 8 12:45:21 2022 +0000
Upgrade Camel to 3.14.2
---
docs/antora.yml | 2 +-
.../quarkus/component/netty/deployment/NettyProcessor.java | 7 +++++++
.../component/rabbitmq/deployment/RabbitmqProcessor.java | 6 ++++++
integration-tests/google-storage/pom.xml | 5 +++++
.../google/storage/it/GoogleStorageTestResource.java | 13 +++++++------
pom.xml | 4 ++--
6 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index de3b53f..159321e 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -27,7 +27,7 @@ asciidoc:
min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
- camel-version: 3.14.1 # replace ${camel.version}
+ camel-version: 3.14.2 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
quarkus-version: 2.7.3.Final # replace ${quarkus.version}
graalvm-version: 21.3.1 # replace ${graalvm.version}
diff --git a/extensions/netty/deployment/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java
index 0c6afba..2247b9a 100644
--- a/extensions/netty/deployment/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java
+++ b/extensions/netty/deployment/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java
@@ -18,7 +18,9 @@ package org.apache.camel.quarkus.component.netty.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelSerializationBuildItem;
+import org.apache.commons.pool2.impl.DefaultEvictionPolicy;
class NettyProcessor {
@@ -33,4 +35,9 @@ class NettyProcessor {
CamelSerializationBuildItem serialization() {
return new CamelSerializationBuildItem();
}
+
+ @BuildStep
+ ReflectiveClassBuildItem registerForReflection() {
+ return new ReflectiveClassBuildItem(true, false, false, DefaultEvictionPolicy.class.getName());
+ }
}
diff --git a/extensions/rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/rabbitmq/deployment/RabbitmqProcessor.java b/extensions/rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/rabbitmq/deployment/RabbitmqProcessor.java
index aaab1dc..edf9f9e 100644
--- a/extensions/rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/rabbitmq/deployment/RabbitmqProcessor.java
+++ b/extensions/rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/rabbitmq/deployment/RabbitmqProcessor.java
@@ -18,6 +18,8 @@ package org.apache.camel.quarkus.component.rabbitmq.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import org.apache.commons.pool2.impl.DefaultEvictionPolicy;
import org.jboss.logging.Logger;
class RabbitmqProcessor {
@@ -30,4 +32,8 @@ class RabbitmqProcessor {
return new FeatureBuildItem(FEATURE);
}
+ @BuildStep
+ ReflectiveClassBuildItem registerForReflection() {
+ return new ReflectiveClassBuildItem(true, false, false, DefaultEvictionPolicy.class.getName());
+ }
}
diff --git a/integration-tests/google-storage/pom.xml b/integration-tests/google-storage/pom.xml
index f91f922..fad54af 100644
--- a/integration-tests/google-storage/pom.xml
+++ b/integration-tests/google-storage/pom.xml
@@ -68,6 +68,11 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-integration-test-support</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/integration-tests/google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java b/integration-tests/google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java
index 92c6cf5..234da5c 100644
--- a/integration-tests/google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java
+++ b/integration-tests/google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java
@@ -20,11 +20,13 @@ import java.util.HashMap;
import java.util.Map;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.apache.camel.quarkus.test.AvailablePortFinder;
+import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
public class GoogleStorageTestResource implements QuarkusTestResourceLifecycleManager {
- public static final int PORT = 4443;
+ public static final int PORT = AvailablePortFinder.getNextAvailable();
public static final String CONTAINER_NAME = "fsouza/fake-gcs-server";
private GenericContainer<?> container;
@@ -35,14 +37,13 @@ public class GoogleStorageTestResource implements QuarkusTestResourceLifecycleMa
Map<String, String> properties = new HashMap<>();
if (GoogleStorageHelper.usingMockBackend()) {
-
- container = new GenericContainer<>(CONTAINER_NAME)
- .withExposedPorts(PORT)
+ container = new FixedHostPortGenericContainer<>(CONTAINER_NAME)
+ .withFixedExposedPort(PORT, PORT)
.withCreateContainerCmdModifier(
- it -> it.withEntrypoint("/bin/fake-gcs-server", "-scheme", "http"));
+ it -> it.withEntrypoint("/bin/fake-gcs-server", "-scheme", "http", "-port", String.valueOf(PORT)));
container.start();
- properties.put(GoogleStorageResource.PARAM_PORT, container.getMappedPort(PORT).toString());
+ properties.put(GoogleStorageResource.PARAM_PORT, String.valueOf(PORT));
}
return properties;
diff --git a/pom.xml b/pom.xml
index c0f9b39..ed8341b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.14.1</version>
+ <version>3.14.2</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -40,7 +40,7 @@
<!-- Primary dependencies - maintained manually -->
<camel.major.minor>3.14</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.1</camel.version>
+ <camel.version>${camel.major.minor}.2</camel.version>
<camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.components.xref>${camel.docs.components.version}@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 camel branch on which our Antora docs depends -->