-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #413 from zbendhiba/cq-2.6.0
Upgrade to Camel Quarkus 2.6.0
- Loading branch information
Showing
10 changed files
with
2,715 additions
and
2,035 deletions.
There are no files selected for viewing
2,099 changes: 1,082 additions & 1,017 deletions
2,099
generated-platform-project/quarkus-camel/bom/pom.xml
Large diffs are not rendered by default.
Oops, something went wrong.
175 changes: 175 additions & 0 deletions
175
...atform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-jfr/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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-jfr</artifactId> | ||
| <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-jfr</name> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.camel.quarkus</groupId> | ||
| <artifactId>camel-quarkus-integration-test-jfr</artifactId> | ||
| <version>${camel-quarkus.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.camel.quarkus</groupId> | ||
| <artifactId>camel-quarkus-integration-test-jfr</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-jfr</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-jfr</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-jfr:${camel-quarkus.version}</appArtifact> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <properties> | ||
| <quarkus.package.type>native</quarkus.package.type> | ||
| </properties> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
1 change: 1 addition & 0 deletions
1
...uarkus-camel/integration-tests/camel-quarkus-integration-test-jfr/src/main/resources/seed
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| seed |
205 changes: 205 additions & 0 deletions
205
...roject/quarkus-camel/integration-tests/camel-quarkus-integration-test-kafka-oauth/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,205 @@ | ||
| <?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-kafka-oauth</artifactId> | ||
| <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-kafka-oauth</name> | ||
| <properties> | ||
| <maven.test.skip>true</maven.test.skip> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.camel.quarkus</groupId> | ||
| <artifactId>camel-quarkus-integration-test-kafka-oauth</artifactId> | ||
| <version>${camel-quarkus.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.camel.quarkus</groupId> | ||
| <artifactId>camel-quarkus-integration-test-kafka-oauth</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>io.strimzi</groupId> | ||
| <artifactId>strimzi-test-container</artifactId> | ||
| <version>0.22.1</version> | ||
| <scope>test</scope> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j-core</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>com.github.docker-java</groupId> | ||
| <artifactId>docker-java-api</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.testcontainers</groupId> | ||
| <artifactId>testcontainers</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.awaitility</groupId> | ||
| <artifactId>awaitility</artifactId> | ||
| <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-kafka-oauth</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-kafka-oauth</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> | ||
| <skip>true</skip> | ||
| <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-kafka-oauth:${camel-quarkus.version}</appArtifact> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <properties> | ||
| <quarkus.package.type>native</quarkus.package.type> | ||
| </properties> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
1 change: 1 addition & 0 deletions
1
...amel/integration-tests/camel-quarkus-integration-test-kafka-oauth/src/main/resources/seed
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| seed |
Oops, something went wrong.