Skip to content

Commit

Permalink
Merge pull request #1158 from jamesnetherton/3.8
Browse files Browse the repository at this point in the history
[3.8] Upgrade Camel Quarkus to 3.8.1
  • Loading branch information
gsmet authored Mar 19, 2024
2 parents d605edd + e32f1fc commit dc166fc
Show file tree
Hide file tree
Showing 26 changed files with 2,264 additions and 2,093 deletions.
2,025 changes: 1,023 additions & 1,002 deletions generated-platform-project/quarkus-camel/bom/pom.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-camel-integration-tests-parent</artifactId>
<version>999-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>camel-quarkus-integration-test-camel-k-runtime-model-reifier</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-camel-k-runtime-model-reifier</name>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-camel-k-runtime-model-reifier</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-camel-k-runtime-model-reifier</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>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.25.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>default-jar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-camel-k-runtime-model-reifier</dependency>
</dependenciesToScan>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native-image</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<systemProperties>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
</systemProperties>
</configuration>
</execution>
</executions>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-camel-k-runtime-model-reifier</dependency>
</dependenciesToScan>
</configuration>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version>
<executions>
<execution>
<id>native-image</id>
<goals>
<goal>build</goal>
</goals>
<configuration>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-camel-k-runtime-model-reifier:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<quarkus.package.type>native</quarkus.package.type>
</properties>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
seed
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
</parent>
<artifactId>camel-quarkus-integration-test-consul</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-consul</name>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -150,7 +147,6 @@
<goal>build</goal>
</goals>
<configuration>
<skip>true</skip>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-consul:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
<artifactId>quarkus-test-h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-support</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
</parent>
<artifactId>camel-quarkus-integration-test-minio</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-minio</name>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -150,7 +147,6 @@
<goal>build</goal>
</goals>
<configuration>
<skip>true</skip>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-minio:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
</parent>
<artifactId>camel-quarkus-integration-test-smb</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-smb</name>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -150,7 +147,6 @@
<goal>build</goal>
</goals>
<configuration>
<skip>true</skip>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-smb:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
<module>camel-quarkus-integration-test-debezium</module>
<module>camel-quarkus-integration-test-kudu</module>
<module>camel-quarkus-integration-test-camel-k-runtime</module>
<module>camel-quarkus-integration-test-consul</module>
<module>camel-quarkus-integration-test-foundation-grouped</module>
<module>camel-quarkus-integration-test-minio</module>
<module>camel-quarkus-integration-test-smb</module>
<module>camel-quarkus-integration-test-google-bigquery</module>
<module>camel-quarkus-integration-test-activemq</module>
<module>camel-quarkus-integration-test-amqp</module>
Expand All @@ -36,9 +33,11 @@
<module>camel-quarkus-integration-test-box</module>
<module>camel-quarkus-integration-test-braintree</module>
<module>camel-quarkus-integration-test-caffeine</module>
<module>camel-quarkus-integration-test-camel-k-runtime-model-reifier</module>
<module>camel-quarkus-integration-test-cassandraql</module>
<module>camel-quarkus-integration-test-cbor</module>
<module>camel-quarkus-integration-test-compression-grouped</module>
<module>camel-quarkus-integration-test-consul</module>
<module>camel-quarkus-integration-test-core-discovery-disabled</module>
<module>camel-quarkus-integration-test-couchdb</module>
<module>camel-quarkus-integration-test-crypto</module>
Expand Down Expand Up @@ -132,6 +131,7 @@
<module>camel-quarkus-integration-test-mapstruct</module>
<module>camel-quarkus-integration-test-micrometer</module>
<module>camel-quarkus-integration-test-microprofile</module>
<module>camel-quarkus-integration-test-minio</module>
<module>camel-quarkus-integration-test-mllp</module>
<module>camel-quarkus-integration-test-mongodb-grouped</module>
<module>camel-quarkus-integration-test-mustache</module>
Expand Down Expand Up @@ -174,6 +174,7 @@
<module>camel-quarkus-integration-test-sjms2-qpid-amqp-client</module>
<module>camel-quarkus-integration-test-slack</module>
<module>camel-quarkus-integration-test-smallrye-reactive-messaging</module>
<module>camel-quarkus-integration-test-smb</module>
<module>camel-quarkus-integration-test-soap</module>
<module>camel-quarkus-integration-test-splunk-hec</module>
<module>camel-quarkus-integration-test-splunk</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-client-server</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-client-server</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-test-util</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -148,7 +148,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-client-server:${quarkus-cxf.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-client-server:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-client</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-client</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-test-util</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -164,7 +164,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-client:${quarkus-cxf.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-client:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-fast-infoset</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-fast-infoset</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-test-util</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -143,7 +143,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-fast-infoset:${quarkus-cxf.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-fast-infoset:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-hc5</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-hc5</artifactId>
<version>${quarkus-cxf.version}</version>
<version>${camel-quarkus.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -153,7 +153,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-hc5:${quarkus-cxf.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-hc5:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Loading

0 comments on commit dc166fc

Please sign in to comment.