Skip to content

Commit

Permalink
Merge pull request #589 from jamesnetherton/cq-2.11.0
Browse files Browse the repository at this point in the history
Upgrade Camel Quarkus to 2.11.0
  • Loading branch information
gsmet authored Jul 25, 2022
2 parents 56372af + ab1454a commit 5d82fa0
Show file tree
Hide file tree
Showing 13 changed files with 2,406 additions and 2,117 deletions.
2,148 changes: 1,116 additions & 1,032 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
Expand Up @@ -54,12 +54,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-activemq</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
<?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-jq</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-jq</name>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-jq</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-jq</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>
</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-jq</dependency>
</dependenciesToScan>
<systemPropertyVariables>
<quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
<quarkus.http.test-ssl-port>${test.https.port.jvm}</quarkus.http.test-ssl-port>
<quarkus.https.test-port>${test.https.port.jvm}</quarkus.https.test-port>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>reserve-network-port</id>
<goals>
<goal>reserve-network-port</goal>
</goals>
<phase>process-test-resources</phase>
<configuration>
<portNames>
<portName>test.http.port.jvm</portName>
<portName>test.https.port.jvm</portName>
<portName>test.http.port.native</portName>
<portName>test.https.port.native</portName>
</portNames>
</configuration>
</execution>
</executions>
</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>
<quarkus.http.test-port>${test.http.port.native}</quarkus.http.test-port>
<quarkus.http.test-ssl-port>${test.https.port.native}</quarkus.http.test-ssl-port>
<quarkus.https.test-port>${test.https.port.native}</quarkus.https.test-port>
</systemProperties>
</configuration>
</execution>
</executions>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jq</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-jq:${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 @@ -59,12 +59,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-activemq</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-platform-http</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-platform-http</name>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -168,7 +165,6 @@
<goal>build</goal>
</goals>
<configuration>
<skip>true</skip>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-platform-http:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</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-rest</artifactId>
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-rest</name>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -163,7 +160,6 @@
<goal>build</goal>
</goals>
<configuration>
<skip>true</skip>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-rest:${camel-quarkus.version}</appArtifact>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-activemq</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-activemq</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
<module>camel-quarkus-integration-test-kafka-oauth</module>
<module>camel-quarkus-integration-test-file</module>
<module>camel-quarkus-integration-test-debezium</module>
<module>camel-quarkus-integration-test-platform-http</module>
<module>camel-quarkus-integration-test-rest</module>
<module>camel-quarkus-integration-test-activemq</module>
<module>camel-quarkus-integration-test-amqp</module>
<module>camel-quarkus-integration-test-arangodb</module>
Expand Down Expand Up @@ -84,6 +82,7 @@
<module>camel-quarkus-integration-test-jms-qpid-amqp-client</module>
<module>camel-quarkus-integration-test-jolt</module>
<module>camel-quarkus-integration-test-jpa</module>
<module>camel-quarkus-integration-test-jq</module>
<module>camel-quarkus-integration-test-js-dsl</module>
<module>camel-quarkus-integration-test-jsch</module>
<module>camel-quarkus-integration-test-jslt</module>
Expand Down Expand Up @@ -133,13 +132,15 @@
<module>camel-quarkus-integration-test-pdf</module>
<module>camel-quarkus-integration-test-pg-replication-slot</module>
<module>camel-quarkus-integration-test-pgevent</module>
<module>camel-quarkus-integration-test-platform-http</module>
<module>camel-quarkus-integration-test-protobuf</module>
<module>camel-quarkus-integration-test-pubnub</module>
<module>camel-quarkus-integration-test-quartz</module>
<module>camel-quarkus-integration-test-qute</module>
<module>camel-quarkus-integration-test-rabbitmq</module>
<module>camel-quarkus-integration-test-reactive-streams</module>
<module>camel-quarkus-integration-test-rest-openapi</module>
<module>camel-quarkus-integration-test-rest</module>
<module>camel-quarkus-integration-test-saga</module>
<module>camel-quarkus-integration-test-salesforce</module>
<module>camel-quarkus-integration-test-sap-netweaver</module>
Expand Down
Loading

0 comments on commit 5d82fa0

Please sign in to comment.