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/01/17 10:27:32 UTC
[camel-quarkus] branch quarkus-main updated (4152a88 -> c43a90b)
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 4152a88 Sync latest property versions
discard b798e00 Modify checks for TransactionManager class name in line with Quarkus CDI proxy class changes
discard fdc33bd java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests
discard 673f579 Exclude geronimo-jms from corda
discard 2889dc6 ⬆️ Upgrade Quarkus to 2.7.0.CR1
add 3fdf723 Updated CHANGELOG.md
new ba0431e ⬆️ Upgrade Quarkus to 2.7.0.CR1
new be004ff Exclude geronimo-jms from corda
new 8676ab3 java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests
new f1917c8 Modify checks for TransactionManager class name in line with Quarkus CDI proxy class changes
new b340d4a Sync latest property versions
new c43a90b Adapt to Quarkus CDI proxy class changes
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 (4152a88)
\
N -- N -- N refs/heads/quarkus-main (c43a90b)
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:
CHANGELOG.md | 34 ++++++++++++----------
...ver.java => CamelQuarkusBeanPostProcessor.java} | 24 +++++++--------
.../camel/quarkus/core/FastCamelContext.java | 4 +--
3 files changed, 31 insertions(+), 31 deletions(-)
copy extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/{core/FastComponentNameResolver.java => CamelQuarkusBeanPostProcessor.java} (56%)
[camel-quarkus] 01/06: ⬆️ Upgrade Quarkus to 2.7.0.CR1
Posted by ja...@apache.org.
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 ba0431eeea1050b4f71d0322cdad9c7856e8fb9d
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Dec 21 15:58:04 2021 -0500
⬆️ Upgrade Quarkus to 2.7.0.CR1
---
docs/antora.yml | 2 +-
pom.xml | 6 +++---
poms/bom/pom.xml | 4 ++++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 5d11b0b..7974faf 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.14.0 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
- quarkus-version: 2.6.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
cq-camel-components: 3.14.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/pom.xml b/pom.xml
index 605174b..6e3635c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<quarkiverse-jsch.version>1.0.0</quarkiverse-jsch.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch-parent/ -->
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-tika.version>1.0.2</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>2.6.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.30.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -68,7 +68,7 @@
<awssdk.version>2.17.100</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>1.0.5</azure-sdk-bom.version><!-- Keep in sync with camel-azure component versions -->
- <bouncycastle.version>1.69</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->
+ <bouncycastle.version>1.70</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
<commons-cli.version>1.4</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core -->
<commons-collections.version>3.2.2</commons-collections.version><!-- used by hbase, should be pretty stable as commons-collections are not developed actively anymore -->
@@ -87,7 +87,7 @@
<google-auth-library-credentials.version>0.22.2</google-auth-library-credentials.version><!-- @sync io.grpc:grpc-auth:${grpc.version} dep:com.google.auth:google-auth-library-credentials -->
<guava.version>29.0-jre</guava.version>
<graalvm.version>21.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
- <grpc.version>1.42.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.43.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<gson.version>2.8.6</gson.version><!-- @sync com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version} dep:com.google.code.gson:gson -->
<guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
<hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 930543b..5bd8d9b 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -662,6 +662,10 @@
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</exclusion>
[camel-quarkus] 02/06: Exclude geronimo-jms from corda
Posted by ja...@apache.org.
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 be004ff8d5c07fd60d117ebcf3cd9a3b681c551b
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Thu Dec 23 14:46:53 2021 +0100
Exclude geronimo-jms from corda
---
extensions-jvm/corda/runtime/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/extensions-jvm/corda/runtime/pom.xml b/extensions-jvm/corda/runtime/pom.xml
index aa8b110..beed32e 100644
--- a/extensions-jvm/corda/runtime/pom.xml
+++ b/extensions-jvm/corda/runtime/pom.xml
@@ -67,6 +67,10 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
[camel-quarkus] 06/06: Adapt to Quarkus CDI proxy class changes
Posted by ja...@apache.org.
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 c43a90bbc735919fcc0bd6050ca4fc3b67fd2534
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jan 17 10:26:38 2022 +0000
Adapt to Quarkus CDI proxy class changes
---
.../quarkus/CamelQuarkusBeanPostProcessor.java | 36 ++++++++++++++++++++++
.../camel/quarkus/core/FastCamelContext.java | 4 +--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/CamelQuarkusBeanPostProcessor.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/CamelQuarkusBeanPostProcessor.java
new file mode 100644
index 0000000..2da61bd
--- /dev/null
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/CamelQuarkusBeanPostProcessor.java
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+import io.quarkus.arc.runtime.ClientProxyUnwrapper;
+import org.apache.camel.CamelContext;
+import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
+
+public class CamelQuarkusBeanPostProcessor extends DefaultCamelBeanPostProcessor {
+
+ private final ClientProxyUnwrapper proxyUnwrapper = new ClientProxyUnwrapper();
+
+ public CamelQuarkusBeanPostProcessor(CamelContext camelContext) {
+ super(camelContext);
+ }
+
+ @Override
+ public Object postProcessBeforeInitialization(Object bean, String beanName) throws Exception {
+ // If the bean is a CDI proxy, unwrap it before processing
+ return super.postProcessBeforeInitialization(proxyUnwrapper.apply(bean), beanName);
+ }
+}
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 10b59a9..2a40f04 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
@@ -25,12 +25,12 @@ import org.apache.camel.Component;
import org.apache.camel.TypeConverter;
import org.apache.camel.component.microprofile.config.CamelMicroProfilePropertiesSource;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
import org.apache.camel.impl.engine.DefaultComponentResolver;
import org.apache.camel.impl.engine.DefaultDataFormatResolver;
import org.apache.camel.impl.engine.DefaultLanguageResolver;
import org.apache.camel.impl.engine.DefaultShutdownStrategy;
import org.apache.camel.model.ModelCamelContext;
+import org.apache.camel.quarkus.CamelQuarkusBeanPostProcessor;
import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.ComponentNameResolver;
@@ -123,7 +123,7 @@ public class FastCamelContext extends DefaultCamelContext implements CatalogCame
protected CamelBeanPostProcessor createBeanPostProcessor() {
// TODO: Investigate optimizing this
// https://github.com/apache/camel-quarkus/issues/2171
- return new DefaultCamelBeanPostProcessor(this);
+ return new CamelQuarkusBeanPostProcessor(this);
}
@Override
[camel-quarkus] 03/06: java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests
Posted by ja...@apache.org.
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 8676ab30aa6b64f1434b493aa2473dea81909016
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Dec 23 12:08:42 2021 -0500
java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests
---
.../test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java | 4 ++++
.../test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java b/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
index ac326a9..15b137b 100644
--- a/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
+++ b/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
@@ -17,8 +17,12 @@
package org.apache.camel.quarkus.component.pdf.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
@NativeImageTest
+//https://github.com/apache/camel-quarkus/issues/3417
+@DisabledOnOs(OS.MAC)
class PdfIT extends PdfTest {
}
diff --git a/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java b/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java
index 48ce48a..3cbf97e 100644
--- a/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java
+++ b/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java
@@ -17,8 +17,12 @@
package org.apache.camel.quarkus.component.tika.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
@NativeImageTest
+//https://github.com/apache/camel-quarkus/issues/3417
+@DisabledOnOs(OS.MAC)
class TikaIT extends TikaTest {
}
[camel-quarkus] 04/06: Modify checks for TransactionManager class name in line with Quarkus CDI proxy class changes
Posted by ja...@apache.org.
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 f1917c8c50aac543dfcdaca7f4303e67cad92c07
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Jan 14 11:57:56 2022 +0000
Modify checks for TransactionManager class name in line with Quarkus CDI proxy class changes
---
.../test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java | 2 +-
.../org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java | 2 +-
.../org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java | 2 +-
.../org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
index 891b8c3..b79155d 100644
--- a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
+++ b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
@@ -37,6 +37,6 @@ class AmqpTest extends AbstractJmsMessagingTest {
RestAssured.get("/amqp/connection/factory")
.then()
.statusCode(200)
- .body(startsWith("org.amqphub.quarkus.qpid.jms"));
+ .body(startsWith("javax.jms.QpidJms"));
}
}
diff --git a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
index bcdd445..3217a3b 100644
--- a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
+++ b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
@@ -37,7 +37,7 @@ class JmsQpidTest extends AbstractJmsMessagingTest {
RestAssured.get("/messaging/jms/qpid/connection/factory")
.then()
.statusCode(200)
- .body(startsWith("org.amqphub.quarkus.qpid"));
+ .body(startsWith("javax.jms.QpidJms"));
}
@Test
diff --git a/integration-tests/sjms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java b/integration-tests/sjms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java
index 441f7f1..c63feb4 100644
--- a/integration-tests/sjms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java
+++ b/integration-tests/sjms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java
@@ -36,6 +36,6 @@ class SjmsQpidTest extends AbstractSjmsMessagingTest {
RestAssured.get("/messaging/sjms/qpid/connection/factory")
.then()
.statusCode(200)
- .body(startsWith("org.amqphub.quarkus.qpid"));
+ .body(startsWith("javax.jms.QpidJms"));
}
}
diff --git a/integration-tests/sjms2-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java b/integration-tests/sjms2-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java
index 85d23f3..fa6f7ee 100644
--- a/integration-tests/sjms2-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java
+++ b/integration-tests/sjms2-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java
@@ -36,6 +36,6 @@ class Sjms2QpidTest extends AbstractSjmsMessagingTest {
RestAssured.get("/messaging/sjms2/qpid/connection/factory")
.then()
.statusCode(200)
- .body(startsWith("org.amqphub.quarkus.qpid"));
+ .body(startsWith("javax.jms.QpidJms"));
}
}
[camel-quarkus] 05/06: Sync latest property versions
Posted by ja...@apache.org.
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 b340d4aa8432f63393736cc5beeeee56768b281d
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Jan 14 15:24:17 2022 +0000
Sync latest property versions
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e3635c..e4c0ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<google-auth-library-credentials.version>0.22.2</google-auth-library-credentials.version><!-- @sync io.grpc:grpc-auth:${grpc.version} dep:com.google.auth:google-auth-library-credentials -->
<guava.version>29.0-jre</guava.version>
<graalvm.version>21.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
- <grpc.version>1.43.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.43.2</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<gson.version>2.8.6</gson.version><!-- @sync com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version} dep:com.google.code.gson:gson -->
<guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
<hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
@@ -120,7 +120,7 @@
<mvel2.version>${mvel-version}</mvel2.version>
<okhttp.version>${squareup-okhttp-version}</okhttp.version>
<okio.version>${squareup-okio-version}</okio.version>
- <protobuf.version>3.19.1</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
+ <protobuf.version>3.19.2</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
<scala-2.12.version>2.12.15</scala-2.12.version><!-- Spark -->