Skip to content

Commit 99c3ca1

Browse files
gsmetgsmet
authored
Merge pull request #1474 from jamesnetherton/camel-quarkus-qcxf-3.22.0
Upgrade Camel Quarkus to 3.22.0 & Quarkus CXF to 3.22.0
2 parents 496b694 + 7e5e7e6 commit 99c3ca1

File tree

18 files changed

+2902
-2527
lines changed
  • generated-platform-project
    • quarkus-camel
      • bom
      • integration-tests
        • camel-quarkus-integration-test-cxf-soap-grouped
        • camel-quarkus-integration-test-debezium
        • camel-quarkus-integration-test-foundation-grouped
        • camel-quarkus-integration-test-jms-artemis-ra
        • camel-quarkus-integration-test-ldap
        • camel-quarkus-integration-test-opentelemetry2
        • camel-quarkus-integration-test-pinecone
        • camel-quarkus-integration-test-telemetry-dev
        • pom.xml
    • quarkus-cxf
    • quarkus-universe/bom
  • pom.xml

18 files changed

+2902
-2527
lines changed

‎generated-platform-project/quarkus-camel/bom/pom.xml

Lines changed: 1393 additions & 1195 deletions
Large diffs are not rendered by default.

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-cxf-soap-grouped/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>io.quarkiverse.cxf</groupId>
2727
<artifactId>quarkus-cxf-test-util</artifactId>
28-
<version>3.20.0.CR1</version>
28+
<version>${quarkus-cxf.version}</version>
2929
<scope>test</scope>
3030
</dependency>
3131
<dependency>

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-debezium/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@
112112
<version>${camel-quarkus.version}</version>
113113
<scope>test</scope>
114114
</dependency>
115+
<dependency>
116+
<groupId>org.awaitility</groupId>
117+
<artifactId>awaitility</artifactId>
118+
<scope>test</scope>
119+
</dependency>
115120
<dependency>
116121
<groupId>org.apache.camel.quarkus</groupId>
117122
<artifactId>camel-quarkus-debezium-mysql</artifactId>

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-foundation-grouped/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
</dependenciesToScan>
110110
<excludes>
111111
<exclude>**/EipTest*</exclude>
112+
<exclude>**/CoreTest*</exclude>
112113
</excludes>
113114
</configuration>
114115
</plugin>
@@ -138,6 +139,7 @@
138139
</systemPropertyVariables>
139140
<excludes>
140141
<exclude>**/EipTest*</exclude>
142+
<exclude>**/CoreTest*</exclude>
141143
</excludes>
142144
</configuration>
143145
</execution>

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-jms-artemis-jms-ra/pom.xml renamed to ‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-jms-artemis-ra/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
<version>999-SNAPSHOT</version>
77
<relativePath>..</relativePath>
88
</parent>
9-
<artifactId>camel-quarkus-integration-test-jms-artemis-jms-ra</artifactId>
10-
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-jms-artemis-jms-ra</name>
9+
<artifactId>camel-quarkus-integration-test-jms-artemis-ra</artifactId>
10+
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-jms-artemis-ra</name>
1111
<dependencies>
1212
<dependency>
1313
<groupId>org.apache.camel.quarkus</groupId>
14-
<artifactId>camel-quarkus-integration-test-jms-artemis-jms-ra</artifactId>
14+
<artifactId>camel-quarkus-integration-test-jms-artemis-ra</artifactId>
1515
<version>${camel-quarkus.version}</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>org.apache.camel.quarkus</groupId>
19-
<artifactId>camel-quarkus-integration-test-jms-artemis-jms-ra</artifactId>
19+
<artifactId>camel-quarkus-integration-test-jms-artemis-ra</artifactId>
2020
<version>${camel-quarkus.version}</version>
2121
<type>test-jar</type>
2222
<classifier>tests</classifier>
@@ -103,7 +103,7 @@
103103
<artifactId>maven-surefire-plugin</artifactId>
104104
<configuration>
105105
<dependenciesToScan>
106-
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-jms-ra</dependency>
106+
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-ra</dependency>
107107
</dependenciesToScan>
108108
</configuration>
109109
</plugin>
@@ -136,7 +136,7 @@
136136
</executions>
137137
<configuration>
138138
<dependenciesToScan>
139-
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-jms-ra</dependency>
139+
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-ra</dependency>
140140
</dependenciesToScan>
141141
</configuration>
142142
</plugin>
@@ -151,7 +151,7 @@
151151
<goal>build</goal>
152152
</goals>
153153
<configuration>
154-
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-jms-ra:${camel-quarkus.version}</appArtifact>
154+
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-jms-artemis-ra:${camel-quarkus.version}</appArtifact>
155155
</configuration>
156156
</execution>
157157
</executions>

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-jms-artemis-jms-ra/src/main/resources/seed renamed to ‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-jms-artemis-ra/src/main/resources/seed

File renamed without changes.

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-ldap/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@
6060
<version>7.0.2</version>
6161
<scope>test</scope>
6262
</dependency>
63+
<dependency>
64+
<groupId>org.apache.camel.quarkus</groupId>
65+
<artifactId>camel-quarkus-integration-tests-support-certificate-generator</artifactId>
66+
<version>${camel-quarkus.version}</version>
67+
<scope>test</scope>
68+
</dependency>
6369
</dependencies>
6470
<build>
6571
<pluginManagement>

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-sql/pom.xml renamed to ‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-opentelemetry2/pom.xml

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
<version>999-SNAPSHOT</version>
77
<relativePath>..</relativePath>
88
</parent>
9-
<artifactId>camel-quarkus-integration-test-sql</artifactId>
10-
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-sql</name>
9+
<artifactId>camel-quarkus-integration-test-opentelemetry2</artifactId>
10+
<name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-opentelemetry2</name>
1111
<dependencies>
1212
<dependency>
1313
<groupId>org.apache.camel.quarkus</groupId>
14-
<artifactId>camel-quarkus-integration-test-sql</artifactId>
14+
<artifactId>camel-quarkus-integration-test-opentelemetry2</artifactId>
1515
<version>${camel-quarkus.version}</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>org.apache.camel.quarkus</groupId>
19-
<artifactId>camel-quarkus-integration-test-sql</artifactId>
19+
<artifactId>camel-quarkus-integration-test-opentelemetry2</artifactId>
2020
<version>${camel-quarkus.version}</version>
2121
<type>test-jar</type>
2222
<classifier>tests</classifier>
@@ -59,28 +59,6 @@
5959
<artifactId>awaitility</artifactId>
6060
<scope>test</scope>
6161
</dependency>
62-
<dependency>
63-
<groupId>org.testcontainers</groupId>
64-
<artifactId>testcontainers</artifactId>
65-
<scope>test</scope>
66-
<exclusions>
67-
<exclusion>
68-
<groupId>junit</groupId>
69-
<artifactId>junit</artifactId>
70-
</exclusion>
71-
</exclusions>
72-
</dependency>
73-
<dependency>
74-
<groupId>io.quarkus</groupId>
75-
<artifactId>quarkus-junit4-mock</artifactId>
76-
<scope>test</scope>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.apache.camel.quarkus</groupId>
80-
<artifactId>camel-quarkus-integration-test-support</artifactId>
81-
<version>${camel-quarkus.version}</version>
82-
<scope>test</scope>
83-
</dependency>
8462
</dependencies>
8563
<build>
8664
<pluginManagement>
@@ -110,7 +88,7 @@
11088
<artifactId>maven-surefire-plugin</artifactId>
11189
<configuration>
11290
<dependenciesToScan>
113-
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-sql</dependency>
91+
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-opentelemetry2</dependency>
11492
</dependenciesToScan>
11593
</configuration>
11694
</plugin>
@@ -143,7 +121,7 @@
143121
</executions>
144122
<configuration>
145123
<dependenciesToScan>
146-
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-sql</dependency>
124+
<dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-opentelemetry2</dependency>
147125
</dependenciesToScan>
148126
</configuration>
149127
</plugin>
@@ -158,7 +136,7 @@
158136
<goal>build</goal>
159137
</goals>
160138
<configuration>
161-
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-sql:${camel-quarkus.version}</appArtifact>
139+
<appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-opentelemetry2:${camel-quarkus.version}</appArtifact>
162140
</configuration>
163141
</execution>
164142
</executions>

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-sql/src/main/resources/seed renamed to ‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-opentelemetry2/src/main/resources/seed

File renamed without changes.

‎generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-pinecone/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,22 @@
2222
<classifier>tests</classifier>
2323
<scope>test</scope>
2424
</dependency>
25+
<dependency>
26+
<groupId>org.testcontainers</groupId>
27+
<artifactId>pinecone</artifactId>
28+
<scope>test</scope>
29+
<exclusions>
30+
<exclusion>
31+
<groupId>junit</groupId>
32+
<artifactId>junit</artifactId>
33+
</exclusion>
34+
</exclusions>
35+
</dependency>
36+
<dependency>
37+
<groupId>io.quarkus</groupId>
38+
<artifactId>quarkus-junit4-mock</artifactId>
39+
<scope>test</scope>
40+
</dependency>
2541
<dependency>
2642
<groupId>io.quarkus</groupId>
2743
<artifactId>quarkus-junit5</artifactId>

0 commit comments

Comments
 (0)