Skip to content

Commit

Permalink
Merge pull request #15841 from famod/fix-it-infinispan-client
Browse files Browse the repository at this point in the history 
Fix entirely skipped enforcer in infinispan-client IT and resolve violations
  • Loading branch information
@gsmet
gsmet authored Mar 18, 2021
2 parents 0f83aca + f77556c commit 534ae37
Showing 1 changed file with 53 additions and 21 deletions.
74 changes: 53 additions & 21 deletions integration-tests/infinispan-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
<scope>test</scope>
<exclusions>
<!-- fix dependency convergence with quarkus-junit5 -->
<exclusion>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</exclusion>
<!-- jboss-transaction-api is banned and not required for the test -->
<exclusion>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- needed so server exposes query based caches -->
<dependency>
Expand Down Expand Up @@ -77,6 +89,13 @@
<artifactId>infinispan-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
<!-- jboss-transaction-api is banned and not required for the test -->
<exclusion>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
Expand All @@ -90,21 +109,45 @@
<scope>test</scope>
</dependency>

<!-- We override these to satisfy Infinispan server -->
<!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.11.0</version>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.11.0</version>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-infinispan-client-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.11.0</version>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
Expand All @@ -128,17 +171,6 @@
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<!-- Skip enforcer plugin as we want to use jboss marshalling for test class -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
Expand Down

0 comments on commit 534ae37

Please sign in to comment.