Skip to content

Commit

Permalink
Merge pull request #1398 from jamesnetherton/cq-qcxf-3.18.0
Browse files Browse the repository at this point in the history 
Upgrade to Quarkus CXF & Camel Quarkus 3.18.0
  • Loading branch information
@gsmet
gsmet authored Jan 28, 2025
2 parents 0c46251 + ca91626 commit d83dc27
Show file tree
Hide file tree
Showing 48 changed files with 1,827 additions and 1,860 deletions.
1,579 changes: 825 additions & 754 deletions generated-platform-project/quarkus-camel/bom/pom.xml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ject/quarkus-camel/integration-tests/camel-quarkus-integration-test-azure-grouped/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
24 changes: 0 additions & 24 deletions ...roject/quarkus-camel/integration-tests/camel-quarkus-integration-test-cassandraql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,30 +77,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>3.7.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit4-mock</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...us-camel/integration-tests/camel-quarkus-integration-test-core-discovery-disabled/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions ...t/quarkus-camel/integration-tests/camel-quarkus-integration-test-cxf-soap-grouped/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-test-util</artifactId>
<version>3.17.2</version>
<version>3.17.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...quarkus-camel/integration-tests/camel-quarkus-integration-test-foundation-grouped/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
30 changes: 7 additions & 23 deletions ...amel-quarkus-integration-test-ssh/pom.xml → ...mel-quarkus-integration-test-fury/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<version>999-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>camel-quarkus-integration-test-ssh</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-ssh</name>
<artifactId>camel-quarkus-integration-test-fury</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-fury</name>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-ssh</artifactId>
<artifactId>camel-quarkus-integration-test-fury</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-ssh</artifactId>
<artifactId>camel-quarkus-integration-test-fury</artifactId>
<version>${camel-quarkus.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
Expand Down Expand Up @@ -54,22 +54,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit4-mock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
Expand Down Expand Up @@ -99,7 +83,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-ssh</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-fury</dependency>
</dependenciesToScan>
</configuration>
</plugin>
Expand Down Expand Up @@ -132,7 +116,7 @@
</executions>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-ssh</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-fury</dependency>
</dependenciesToScan>
</configuration>
</plugin>
Expand All @@ -147,7 +131,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-ssh:${camel-quarkus.version}</appArtifact>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-fury:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
0 ...egration-test-ssh/src/main/resources/seed → ...gration-test-fury/src/main/resources/seed
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...atform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-git/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ject/quarkus-camel/integration-tests/camel-quarkus-integration-test-java-joor-dsl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...tform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-jaxb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
58 changes: 28 additions & 30 deletions ...tegration-test-async-vertx-client/pom.xml → ...tegration-test-jms-artemis-jms-ra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,31 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-cxf-integration-tests-parent</artifactId>
<artifactId>quarkus-camel-integration-tests-parent</artifactId>
<version>999-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>quarkus-cxf-integration-test-async-vertx-client</artifactId>
<name>Quarkus Platform - CXF - Integration Tests - quarkus-cxf-integration-test-async-vertx-client</name>
<artifactId>camel-quarkus-integration-test-jms-artemis-jms-ra</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-jms-artemis-jms-ra</name>
<dependencies>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-async-vertx-client</artifactId>
<version>${quarkus-cxf.version}</version>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-jms-artemis-jms-ra</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-async-vertx-client</artifactId>
<version>${quarkus-cxf.version}</version>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-jms-artemis-jms-ra</artifactId>
<version>${camel-quarkus.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
Expand Down Expand Up @@ -50,30 +55,23 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-activemq</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit4-mock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
<version>${camel-quarkus.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
<version>${camel-quarkus.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -105,7 +103,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>io.quarkiverse.cxf:quarkus-cxf-integration-test-async-vertx-client</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-jms-ra</dependency>
</dependenciesToScan>
</configuration>
</plugin>
Expand Down Expand Up @@ -138,7 +136,7 @@
</executions>
<configuration>
<dependenciesToScan>
<dependency>io.quarkiverse.cxf:quarkus-cxf-integration-test-async-vertx-client</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-jms-ra</dependency>
</dependenciesToScan>
</configuration>
</plugin>
Expand All @@ -153,7 +151,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-async-vertx-client:${quarkus-cxf.version}</appArtifact>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-jms-ra:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
0 ...sync-vertx-client/src/main/resources/seed → ...ms-artemis-jms-ra/src/main/resources/seed
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-ldap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
<version>7.0.1</version>
<version>7.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ect/quarkus-camel/integration-tests/camel-quarkus-integration-test-main-collector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...oject/quarkus-camel/integration-tests/camel-quarkus-integration-test-main-devmode/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...us-camel/integration-tests/camel-quarkus-integration-test-main-discovery-disabled/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...roject/quarkus-camel/integration-tests/camel-quarkus-integration-test-main-xml-io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ject/quarkus-camel/integration-tests/camel-quarkus-integration-test-main-xml-jaxb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-main-yaml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...tform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ject/quarkus-camel/integration-tests/camel-quarkus-integration-test-platform-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...t/quarkus-camel/integration-tests/camel-quarkus-integration-test-reactive-streams/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...atform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-smb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...tform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-soap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ct/quarkus-camel/integration-tests/camel-quarkus-integration-test-spring-rabbitmq/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit d83dc27

Please sign in to comment.