Skip to content

Commit

Permalink
Stop depending on the deprecated logging extension in tests, fix the …
Browse files Browse the repository at this point in the history 
…virtualDependencies profile
  • Loading branch information
@ppalaga
ppalaga committed Jan 19, 2024
1 parent 71dad4b commit 8c6f604
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 87 deletions.
2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/calculator-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-tests</artifactId>
<version>2.6.2-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
26 changes: 26 additions & 0 deletions integration-tests/hc5/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,32 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-metrics-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-transports-http-hc5</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
</profiles>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/metrics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
directory -->
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-deployment</artifactId>
<artifactId>quarkus-cxf-rt-features-metrics-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
17 changes: 0 additions & 17 deletions integration-tests/mtom-awt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging</artifactId>
</dependency>
<dependency><!-- for java.awt.Image -->
<groupId>io.quarkus</groupId>
<artifactId>quarkus-awt</artifactId>
Expand Down Expand Up @@ -106,19 +102,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
</profiles>
Expand Down
17 changes: 0 additions & 17 deletions integration-tests/mtom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging</artifactId>
</dependency>

<dependency>
<groupId>io.rest-assured</groupId>
Expand Down Expand Up @@ -103,19 +99,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
</profiles>
Expand Down
13 changes: 13 additions & 0 deletions integration-tests/opentelemetry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-integration-tracing-opentelemetry-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
</profiles>
Expand Down
17 changes: 0 additions & 17 deletions integration-tests/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging</artifactId>
</dependency>

<dependency>
<groupId>io.quarkiverse.cxf</groupId>
Expand Down Expand Up @@ -143,19 +139,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
</profiles>
Expand Down
13 changes: 0 additions & 13 deletions integration-tests/ws-rm-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,19 +121,6 @@
</activation>
<dependencies>
<!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-ws-rm-deployment</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/ws-security-policy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-ws-security</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy</artifactId>
Expand Down
17 changes: 0 additions & 17 deletions integration-tests/ws-trust/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-services-sts</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging</artifactId>
</dependency>

<dependency><!-- Make the native compiler happy -->
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -138,19 +134,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-rt-features-logging-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.cxf</groupId>
<artifactId>quarkus-cxf-services-sts-deployment</artifactId>
Expand Down

0 comments on commit 8c6f604

Please sign in to comment.