Skip to content

Commit

Permalink
Upgrade to Camel Quarkus 1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ppalaga committed Mar 30, 2021
1 parent d1033a7 commit 76f3d1b
Show file tree
Hide file tree
Showing 16 changed files with 685 additions and 108 deletions.
5 changes: 0 additions & 5 deletions integration-tests/camel/invoked/root/camel-debezium/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-debezium-sqlserver</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-datasource</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-debezium-rpkgtests</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-universe-integration-tests-camel-websocket-jsr356</artifactId>

<!-- See: https://github.com/apache/camel-quarkus/issues/2262 -->
<properties>
<skipTests>true</skipTests>
</properties>
<artifactId>quarkus-universe-integration-tests-camel-freemarker</artifactId>

<dependencies>
<dependency>
Expand All @@ -30,12 +25,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-websocket-jsr356</artifactId>
<artifactId>camel-quarkus-integration-test-freemarker</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-websocket-jsr356-rpkgtests</artifactId>
<artifactId>camel-quarkus-integration-test-freemarker-rpkgtests</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -70,7 +65,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-websocket-jsr356-rpkgtests</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-freemarker-rpkgtests</dependency>
</dependenciesToScan>
<systemPropertyVariables>
<quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
Expand All @@ -96,7 +91,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-websocket-jsr356-rpkgtests</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-freemarker-rpkgtests</dependency>
</dependenciesToScan>
</configuration>
<executions>
Expand Down Expand Up @@ -126,7 +121,7 @@
<goal>native-image</goal>
</goals>
<configuration>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-websocket-jsr356:${camel-quarkus.version}</appArtifact>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-freemarker:${camel-quarkus.version}</appArtifact>
<reportErrorsAtRuntime>false</reportErrorsAtRuntime>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
Expand Down
15 changes: 0 additions & 15 deletions integration-tests/camel/invoked/root/camel-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,6 @@
</build>

<profiles>
<profile>
<!--
This can be removed when camel-quarkus supports quarkus >= 1.14.x.
-->
<id>quarkus-snapshots-disable-tests</id>
<activation>
<property>
<name>env.GITHUB_WORKFLOW</name>
<value>Quarkus ecosystem CI</value>
</property>
</activation>
<properties>
<skipTests>true</skipTests>
</properties>
</profile>
<profile>
<id>native-image</id>
<activation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-universe-integration-tests-camel-aws</artifactId>
<artifactId>quarkus-universe-integration-tests-camel-hl7</artifactId>

<dependencies>
<dependency>
Expand All @@ -25,12 +25,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-aws</artifactId>
<artifactId>camel-quarkus-integration-test-hl7</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-aws-rpkgtests</artifactId>
<artifactId>camel-quarkus-integration-test-hl7-rpkgtests</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -65,7 +65,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-aws-rpkgtests</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-hl7-rpkgtests</dependency>
</dependenciesToScan>
<systemPropertyVariables>
<quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
Expand All @@ -91,7 +91,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-aws-rpkgtests</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-hl7-rpkgtests</dependency>
</dependenciesToScan>
</configuration>
<executions>
Expand Down Expand Up @@ -121,7 +121,7 @@
<goal>native-image</goal>
</goals>
<configuration>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-aws:${camel-quarkus.version}</appArtifact>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-hl7:${camel-quarkus.version}</appArtifact>
<reportErrorsAtRuntime>false</reportErrorsAtRuntime>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
Expand Down
143 changes: 143 additions & 0 deletions integration-tests/camel/invoked/root/camel-js-dsl/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-universe-integration-tests-camel</artifactId>
<version>999-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-universe-integration-tests-camel-js-dsl</artifactId>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-universe-integration-tests-camel-rpkgtests</artifactId>
<version>${project.version}</version>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-js-dsl</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-js-dsl-rpkgtests</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<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-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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-js-dsl-rpkgtests</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>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>native-image</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-js-dsl-rpkgtests</dependency>
</dependenciesToScan>
</configuration>
<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>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version>
<executions>
<execution>
<id>native-image</id>
<goals>
<goal>native-image</goal>
</goals>
<configuration>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-js-dsl:${camel-quarkus.version}</appArtifact>
<reportErrorsAtRuntime>false</reportErrorsAtRuntime>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<graalvmHome>${graalvmHome}</graalvmHome>
<enableJni>false</enableJni>
<disableReports>true</disableReports>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-universe-integration-tests-camel-azure</artifactId>
<artifactId>quarkus-universe-integration-tests-camel-lra</artifactId>

<dependencies>
<dependency>
Expand All @@ -25,12 +25,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-azure</artifactId>
<artifactId>camel-quarkus-integration-test-lra</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-azure-rpkgtests</artifactId>
<artifactId>camel-quarkus-integration-test-lra-rpkgtests</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -65,7 +65,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-azure-rpkgtests</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-lra-rpkgtests</dependency>
</dependenciesToScan>
<systemPropertyVariables>
<quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
Expand All @@ -91,7 +91,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-azure-rpkgtests</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-lra-rpkgtests</dependency>
</dependenciesToScan>
</configuration>
<executions>
Expand Down Expand Up @@ -121,7 +121,7 @@
<goal>native-image</goal>
</goals>
<configuration>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-azure:${camel-quarkus.version}</appArtifact>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-lra:${camel-quarkus.version}</appArtifact>
<reportErrorsAtRuntime>false</reportErrorsAtRuntime>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-universe-integration-tests-camel-send-dynamic-http</artifactId>
<artifactId>quarkus-universe-integration-tests-camel-main-yaml</artifactId>

<dependencies>
<dependency>
Expand All @@ -25,12 +25,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-send-dynamic-http</artifactId>
<artifactId>camel-quarkus-integration-test-main-yaml</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-send-dynamic-http-rpkgtests</artifactId>
<artifactId>camel-quarkus-integration-test-main-yaml-rpkgtests</artifactId>
<version>${camel-quarkus.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -65,7 +65,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-send-dynamic-http-rpkgtests</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-main-yaml-rpkgtests</dependency>
</dependenciesToScan>
<systemPropertyVariables>
<quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
Expand All @@ -91,7 +91,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-send-dynamic-http-rpkgtests</dependency>
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-main-yaml-rpkgtests</dependency>
</dependenciesToScan>
</configuration>
<executions>
Expand Down Expand Up @@ -121,7 +121,7 @@
<goal>native-image</goal>
</goals>
<configuration>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-send-dynamic-http:${camel-quarkus.version}</appArtifact>
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-main-yaml:${camel-quarkus.version}</appArtifact>
<reportErrorsAtRuntime>false</reportErrorsAtRuntime>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
Expand Down
Loading

0 comments on commit 76f3d1b

Please sign in to comment.