Skip to content

Commit

Permalink
ISPN-8570 Create Hibernate 5.2 cache module and test it
Browse files Browse the repository at this point in the history
  • Loading branch information
@galderz
galderz committed Jan 8, 2018
1 parent 231291d commit 0d78972
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 78 deletions.
5 changes: 5 additions & 0 deletions bom/pom.xml
View file
Expand Up @@ -380,6 +380,11 @@
<artifactId>infinispan-hibernate-cache-v51</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-hibernate-cache</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}.server</groupId>
<artifactId>infinispan-server-commons</artifactId>
Expand Down
27 changes: 27 additions & 0 deletions hibernate/cache-commons/pom.xml
View file
Expand Up @@ -18,6 +18,33 @@
<version.hibernate.core>5.1.10.Final</version.hibernate.core>
</properties>

<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.hibernate.core}</version>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version.hibernate.core}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${version.hibernate.core}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
84 changes: 7 additions & 77 deletions hibernate-cache/pom.xml → hibernate/cache/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
<artifactId>infinispan-hibernate-parent</artifactId>
<version>9.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand All @@ -15,84 +15,27 @@

<properties>
<module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
<version.hibernate.core>5.1.10.Final</version.hibernate.core>
<version.hibernate.core>5.2.11.Final</version.hibernate.core>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-commons-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-core</artifactId>
<artifactId>infinispan-hibernate-cache-commons</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.hibernate.core}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-core</artifactId>
<artifactId>infinispan-hibernate-cache-commons</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version.hibernate.core}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${version.hibernate.core}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>checkstyle-hibernate-cache.xml</configLocation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -101,6 +44,9 @@
<groups combine.self="override">${defaultJUnitGroups}</groups>
<excludedGroups combine.self="override">${defaultExcludedJUnitGroups}</excludedGroups>
<trimStackTrace>false</trimStackTrace>
<dependenciesToScan>
<dependency>${project.groupId}:infinispan-hibernate-cache-commons</dependency>
</dependenciesToScan>
<systemPropertyVariables>
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
<jgroups.ping.timeout>500</jgroups.ping.timeout>
Expand All @@ -121,20 +67,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>smoke</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<groups>org.infinispan.commons.test.categories.Smoke</groups>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
1 change: 1 addition & 0 deletions hibernate/pom.xml
View file
Expand Up @@ -15,6 +15,7 @@
<modules>
<module>cache-commons</module>
<module>cache-v51</module>
<module>cache</module>
</modules>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -154,7 +154,7 @@
<module>integrationtests/all-remote-it</module>
<module>integrationtests/spring-boot-it</module>
<module>client/marshaller</module>
<module>hibernate-cache</module>
<module>hibernate</module>
</modules>
<properties>

Expand Down

0 comments on commit 0d78972

Please sign in to comment.