Skip to content

Commit

Permalink
[DROOLS-7513] Upgrade Infinispan to 14.0.13.Final (apache#5402)
Browse files Browse the repository at this point in the history 
- Solves ISPN-15071
  • Loading branch information
@tkobayas
tkobayas authored Jul 25, 2023
1 parent ae52ca7 commit aff1ba3
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 250 deletions.
1 change: 1 addition & 0 deletions build-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<version.org.hamcrest>1.3</version.org.hamcrest>
<version.org.hibernate>5.6.12.Final</version.org.hibernate>
<version.org.hsqldb>2.3.0</version.org.hsqldb>
<version.org.infinispan>14.0.13.Final</version.org.infinispan>
<version.org.javassist>3.26.0-GA</version.org.javassist>
<version.org.jboss.narayana.tomcat>5.13.1.Final</version.org.jboss.narayana.tomcat>
<version.org.jboss.transaction.spi>7.6.1.Final</version.org.jboss.transaction.spi>
Expand Down
53 changes: 0 additions & 53 deletions ...s-reliability/drools-reliability-infinispan/infinispan-remote-config/infinispan-local.xml
View file

This file was deleted.

196 changes: 1 addition & 195 deletions drools-reliability/drools-reliability-infinispan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,17 @@

<properties>
<java.module.name>org.drools.reliability.infinispan</java.module.name>
<version.infinispan>14.0.6.Final</version.infinispan>
<version.testcontainers>1.17.2</version.testcontainers>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-bom</artifactId>
<version>${version.infinispan}</version>
<version>${version.org.infinispan}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${version.testcontainers}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -55,88 +47,6 @@
<groupId>org.drools</groupId>
<artifactId>drools-reliability-core</artifactId>
</dependency>

<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-engine</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-testdriver-core</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-jboss-marshalling</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-component-annotations</artifactId>
<scope>test</scope>
</dependency>

<dependency><!-- For unit test logging: configure in src/test/resources/logback-test.xml -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-model-codegen</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -173,108 +83,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<!-- override default-test for embedded -->
<id>default-test</id>
<configuration>
<excludes>
<exclude>**/*SmokeTest.java</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>smoke-tests-remote</id>
<configuration>
<systemPropertyVariables>
<drools.reliability.storage.infinispan.mode>REMOTE</drools.reliability.storage.infinispan.mode>
</systemPropertyVariables>
<includes>
<include>**/smoke/remote/*SmokeTest.java</include>
</includes>
</configuration>
<goals>
<goal>test</goal>
</goals>
</execution>
<execution>
<id>smoke-tests-remote-proto</id>
<configuration>
<systemPropertyVariables>
<drools.reliability.storage.infinispan.mode>REMOTE</drools.reliability.storage.infinispan.mode>
<drools.reliability.storage.infinispan.marshaller>PROTOSTREAM</drools.reliability.storage.infinispan.marshaller>
<drools.reliability.storage.infinispan.serialization.context.initializer>org.drools.reliability.infinispan.proto.TestProtoStreamSchemaImpl</drools.reliability.storage.infinispan.serialization.context.initializer>
</systemPropertyVariables>
<includes>
<include>**/smoke/proto/*SmokeTest.java</include>
</includes>
</configuration>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>remote</id>
<activation>
<property>
<name>remote</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<!-- override default-test from embedded to remote -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<drools.reliability.storage.infinispan.mode>REMOTE</drools.reliability.storage.infinispan.mode>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>remote-proto</id>
<activation>
<property>
<name>remote-proto</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<!-- override default-test with Remote+ProtoStream -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<drools.reliability.storage.infinispan.mode>REMOTE</drools.reliability.storage.infinispan.mode>
<drools.reliability.storage.infinispan.marshaller>PROTOSTREAM</drools.reliability.storage.infinispan.marshaller>
<drools.reliability.storage.infinispan.serialization.context.initializer>org.drools.reliability.infinispan.proto.TestProtoStreamSchemaImpl</drools.reliability.storage.infinispan.serialization.context.initializer>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
3 changes: 1 addition & 2 deletions drools-reliability/drools-reliability-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

<properties>
<java.module.name>org.drools.reliability.infinispan</java.module.name>
<version.infinispan>14.0.6.Final</version.infinispan>
<version.testcontainers>1.17.2</version.testcontainers>
</properties>

Expand All @@ -24,7 +23,7 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-bom</artifactId>
<version>${version.infinispan}</version>
<version>${version.org.infinispan}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down

0 comments on commit aff1ba3

Please sign in to comment.