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 2022/01/08 06:34:26 UTC

[camel-quarkus] branch quarkus-main updated (ce94fe3 -> 53832b7)

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.


 discard ce94fe3  java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests
 discard ea9d0db  Exclude geronimo-jms from corda
 discard 5bc3948  ⬆️ Upgrade Quarkus to 2.7.0.CR1
     add 40ea0df  Add test coverage for OpenTelemetry WithSpan annotation
     new 9163470  ⬆️ Upgrade Quarkus to 2.7.0.CR1
     new bdf6a84  Exclude geronimo-jms from corda
     new 53832b7  java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests

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   (ce94fe3)
            \
             N -- N -- N   refs/heads/quarkus-main (53832b7)

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 3 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:
 integration-tests/opentelemetry/pom.xml                 | 17 +++++++++++++++++
 .../component/opentelemetry/it/GreetingsBean.java}      | 16 ++++++++--------
 .../opentelemetry/it/OpenTelemetryResource.java         |  8 ++++++++
 .../opentelemetry/it/OpenTelemetryRouteBuilder.java     |  3 +++
 .../component/opentelemetry/it/OpenTelemetryTest.java   | 15 +++++++++++++++
 5 files changed, 51 insertions(+), 8 deletions(-)
 copy integration-tests/{core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutesCDI.java => opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/GreetingsBean.java} (75%)

[camel-quarkus] 03/03: java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 53832b75405de1c2bb194a8e1f6d1c38751f0f51
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] 01/03: ⬆️ Upgrade Quarkus to 2.7.0.CR1

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 9163470e3246f91c98a0ef73f7aeca5f7ae18a1d
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 f0cc01f..90837ac 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 ecd81a6..057860a 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/03: Exclude geronimo-jms from corda

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit bdf6a8439a3dee3d8efecc50574b1b2ce3b7404c
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>