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 2023/03/16 07:40:18 UTC
[camel-quarkus] branch main updated (cdc74c2db9 -> 18159898d1)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from cdc74c2db9 Updated CHANGELOG.md
new 1d6c6bba77 Upgrade Quarkus to 3.0.0.Alpha6
new e3d6ab18fd Temporarily disable tests using kubernetes-client due to #4651
new 18159898d1 Temporarily disable dataformat integration tests due to #4662
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:
docs/antora.yml | 2 +-
integration-tests/dataformat/pom.xml | 2 +
.../component/dataformat/it/DataformatIT.java | 2 +
.../component/dataformat/it/DataformatTest.java | 2 +
integration-tests/kubernetes/pom.xml | 2 +
integration-tests/master-openshift/pom.xml | 94 +++++++++++-----------
pom.xml | 4 +-
7 files changed, 59 insertions(+), 49 deletions(-)
[camel-quarkus] 03/03: Temporarily disable dataformat integration tests due to #4662
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 18159898d10df121db50bf35296b5043c76dbf8e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Mar 15 19:36:19 2023 +0000
Temporarily disable dataformat integration tests due to #4662
---
integration-tests/dataformat/pom.xml | 2 ++
.../org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java | 2 ++
.../apache/camel/quarkus/component/dataformat/it/DataformatTest.java | 2 ++
3 files changed, 6 insertions(+)
diff --git a/integration-tests/dataformat/pom.xml b/integration-tests/dataformat/pom.xml
index 4929793f54..db9224d215 100644
--- a/integration-tests/dataformat/pom.xml
+++ b/integration-tests/dataformat/pom.xml
@@ -67,6 +67,7 @@
<profiles>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/4662
<profile>
<id>native</id>
<activation>
@@ -94,6 +95,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java
index 8676954dce..59b391c096 100644
--- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java
+++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.dataformat.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4662")
@QuarkusIntegrationTest
class DataformatIT extends DataformatTest {
diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java
index 5556571bfa..6b57eb634b 100644
--- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java
+++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java
@@ -29,12 +29,14 @@ import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import static org.hamcrest.CoreMatchers.equalTo;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4662")
@QuarkusTest
class DataformatTest {
[camel-quarkus] 01/03: Upgrade Quarkus to 3.0.0.Alpha6
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1d6c6bba775ea6b4b6d55d0cabd5d66bc1abcf52
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Mar 13 07:22:06 2023 +0000
Upgrade Quarkus to 3.0.0.Alpha6
---
docs/antora.yml | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 88e4cacb17..c7e8ddb74e 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M2 # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.0.0.Alpha5 # replace ${quarkus.version}
+ quarkus-version: 3.0.0.Alpha6 # replace ${quarkus.version}
graalvm-version: 22.3.0 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/pom.xml b/pom.xml
index afe53248fd..c54c0b09e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-mybatis.version>2.0.0.CR1</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.0.0.CR2</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.0.0.Alpha5</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>3.0.0.Alpha6</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.0.0.Alpha3</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -146,7 +146,7 @@
<retrofit.version>2.5.0</retrofit.version>
<smallrye.reactive.messaging.camel.version>4.4.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring-version}</spring.version>
- <snakeyaml.version>1.33</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
+ <snakeyaml.version>2.0</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<tablesaw.version>0.43.1</tablesaw.version>
<threetenbp.version>1.6.0</threetenbp.version>
<xalan.version>2.7.2</xalan.version><!-- Xalan should be removed as is in Camel, but it is not possible. https://github.com/apache/camel-quarkus/issues/4065-->
[camel-quarkus] 02/03: Temporarily disable tests using kubernetes-client due to #4651
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e3d6ab18fd47c36859a8a065e2f4f17d4cd88374
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Mar 14 09:08:45 2023 +0000
Temporarily disable tests using kubernetes-client due to #4651
---
integration-tests/kubernetes/pom.xml | 2 +
integration-tests/master-openshift/pom.xml | 94 +++++++++++++++---------------
2 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml
index 7b6d9c68c7..2f1e60e190 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -75,6 +75,7 @@
<profiles>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/4651
<profile>
<id>native</id>
<activation>
@@ -102,6 +103,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/master-openshift/pom.xml b/integration-tests/master-openshift/pom.xml
index a69b488e7a..572663bb57 100644
--- a/integration-tests/master-openshift/pom.xml
+++ b/integration-tests/master-openshift/pom.xml
@@ -149,52 +149,54 @@
</plugins>
</build>
</profile>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.package.type>native</quarkus.package.type>
- <quarkus.runner>${project.build.directory}/${project.artifactId}-${project.version}-runner</quarkus.runner>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <systemProperties>
- <quarkus.runner>${quarkus.runner}</quarkus.runner>
- </systemProperties>
- <environmentVariables>
- Fake KubernetesClusterService so it assumes being run from a pod named leader >
- <HOSTNAME>leader</HOSTNAME>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/4651
+ <profile>
+ <id>native</id>
+ <activation>
+ <property>
+ <name>native</name>
+ </property>
+ </activation>
+ <properties>
+ <quarkus.package.type>native</quarkus.package.type>
+ <quarkus.runner>${project.build.directory}/${project.artifactId}-${project.version}-runner</quarkus.runner>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemProperties>
+ <quarkus.runner>${quarkus.runner}</quarkus.runner>
+ </systemProperties>
+ <environmentVariables>
+ Fake KubernetesClusterService so it assumes being run from a pod named leader >
+ <HOSTNAME>leader</HOSTNAME>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ -->
+ <profile>
+ <id>virtualDependencies</id>
+ <activation>
+ <property>
+ <name>!noVirtualDependencies</name>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-file-deployment</artifactId>