Skip to content

Commit

Permalink
Merge pull request #1145 from ppalaga/240315-qcxf-3.8.1-3.8
Browse files Browse the repository at this point in the history
[3.8] Upgrade to Quarkus CXF 3.8.1
  • Loading branch information
gsmet authored Mar 17, 2024
2 parents 8c92ab5 + 3b17fc6 commit d605edd
Show file tree
Hide file tree
Showing 24 changed files with 632 additions and 251 deletions.
132 changes: 66 additions & 66 deletions generated-platform-project/quarkus-camel/bom/pom.xml

Large diffs are not rendered by default.

137 changes: 71 additions & 66 deletions generated-platform-project/quarkus-cxf/bom/pom.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
<module>quarkus-cxf-integration-test-fast-infoset</module>
<module>quarkus-cxf-integration-test-hc5</module>
<module>quarkus-cxf-integration-test-metrics</module>
<module>quarkus-cxf-integration-test-mtls</module>
<module>quarkus-cxf-integration-test-mtom-awt</module>
<module>quarkus-cxf-integration-test-mtom</module>
<module>quarkus-cxf-integration-test-opentelemetry</module>
<module>quarkus-cxf-integration-test-santuario-xmlsec</module>
<module>quarkus-cxf-integration-test-server</module>
<module>quarkus-cxf-integration-test-ws-rm-client</module>
<module>quarkus-cxf-integration-test-ws-security-policy-fips</module>
<module>quarkus-cxf-integration-test-ws-security-policy</module>
<module>quarkus-cxf-integration-test-ws-security</module>
<module>quarkus-cxf-integration-test-ws-trust</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-client-server</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-client-server</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-test-util</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -148,7 +148,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-client-server:${camel-quarkus.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-client-server:${quarkus-cxf.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-client</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-client</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-test-util</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -164,7 +164,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-client:${camel-quarkus.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-client:${quarkus-cxf.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-fast-infoset</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-fast-infoset</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-test-util</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -143,7 +143,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-fast-infoset:${camel-quarkus.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-fast-infoset:${quarkus-cxf.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-hc5</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-hc5</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -153,7 +153,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-hc5:${camel-quarkus.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-hc5:${quarkus-cxf.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-metrics</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-metrics</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -137,7 +137,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-metrics:${camel-quarkus.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-metrics:${quarkus-cxf.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
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-cxf-integration-tests-parent</artifactId>
<version>999-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>quarkus-cxf-integration-test-mtls</artifactId>
<name>Quarkus Platform - CXF - Integration Tests - quarkus-cxf-integration-test-mtls</name>
<dependencies>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-mtls</artifactId>
<version>${quarkus-cxf.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-mtls</artifactId>
<version>${quarkus-cxf.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<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.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.25.3</version>
<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>io.quarkiverse.cxf:quarkus-cxf-integration-test-mtls</dependency>
</dependenciesToScan>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-test-resources</id>
<phase>process-test-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-mtls</artifactId>
<version>${quarkus-cxf.version}</version>
<outputDirectory>${project.basedir}/target/classes</outputDirectory>
<includes>*.pkcs12</includes>
</artifactItem>
</artifactItems>
</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>
</systemProperties>
</configuration>
</execution>
</executions>
<configuration>
<dependenciesToScan>
<dependency>io.quarkiverse.cxf:quarkus-cxf-integration-test-mtls</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>io.quarkiverse.cxf:quarkus-cxf-integration-test-mtls:${quarkus-cxf.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 @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-mtom-awt</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-mtom-awt</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -137,7 +137,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-mtom-awt:${camel-quarkus.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-mtom-awt:${quarkus-cxf.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-mtom</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-test-mtom</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-test-util</artifactId>
<version>${camel-quarkus.version}</version>
<version>${quarkus-cxf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -143,7 +143,7 @@
<goal>build</goal>
</goals>
<configuration>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-mtom:${camel-quarkus.version}</appArtifact>
<appArtifact>io.quarkiverse.cxf:quarkus-cxf-integration-test-mtom:${quarkus-cxf.version}</appArtifact>
</configuration>
</execution>
</executions>
Expand Down
Loading

0 comments on commit d605edd

Please sign in to comment.