Skip to content

Commit

Permalink
Merge pull request #915 from jamesnetherton/CQ-3.0.0-RC2
Browse files Browse the repository at this point in the history
[main] Upgrade Camel Quarkus to 3.0.0-RC2
  • Loading branch information
aloubyansky authored Aug 17, 2023
2 parents 5166219 + eb41fb0 commit bcc54c4
Show file tree
Hide file tree
Showing 33 changed files with 3,016 additions and 2,221 deletions.
2,142 changes: 1,080 additions & 1,062 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,176 @@
<?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-activemq</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-activemq</name>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-activemq</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-activemq</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.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>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
<version>${camel-quarkus.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
<version>${camel-quarkus.version}</version>
<classifier>tests</classifier>
<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-activemq</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-activemq</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-activemq:${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
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
<version>4.9.1</version>
<version>4.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
<version>4.9.1</version>
<version>4.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.29</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
<version>1.1.2</version>
<version>${quarkus-cassandra-client.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftplet-api</artifactId>
<version>1.1.2</version>
<version>${quarkus-cassandra-client.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
<version>2.9.2</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-scp</artifactId>
<version>2.9.2</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
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-http</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-http</name>
<artifactId>camel-quarkus-integration-test-http-grouped</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-http-grouped</name>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-http</artifactId>
<artifactId>camel-quarkus-integration-test-http-grouped</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-http</artifactId>
<artifactId>camel-quarkus-integration-test-http-grouped</artifactId>
<version>${camel-quarkus.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
Expand Down Expand Up @@ -105,7 +105,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-http</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-http-grouped</dependency>
</dependenciesToScan>
</configuration>
</plugin>
Expand Down Expand Up @@ -138,7 +138,7 @@
</executions>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-http</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-http-grouped</dependency>
</dependenciesToScan>
</configuration>
</plugin>
Expand All @@ -153,7 +153,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-http:${camel-quarkus.version}</appArtifact>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-http-grouped:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
seed
Loading

0 comments on commit bcc54c4

Please sign in to comment.