Skip to content

Commit

Permalink
[Blazebit#612] Relocation artifact for Hibernate 5.4 integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwgmeligmeyling
jwgmeligmeyling committed Aug 6, 2018
1 parent 90292fc commit 3b5f9b4
Show file tree
Hide file tree
Showing 12 changed files with 652 additions and 0 deletions.
33 changes: 33 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,39 @@ matrix:
# - env: JPAPROVIDER=hibernate-5.3 RDBMS=firebird
# jdk: oraclejdk8
# sudo: true
################################################
# hibernate-5.4
################################################
- env: JPAPROVIDER=hibernate-5.4 RDBMS=h2
jdk: oraclejdk8
- env: JPAPROVIDER=hibernate-5.4 RDBMS=mysql
jdk: oraclejdk8
dist: trusty
sudo: required
- env: JPAPROVIDER=hibernate-5.4 RDBMS=postgresql
jdk: oraclejdk8
addons:
postgresql: "9.3"
- env: JPAPROVIDER=hibernate-5.4 RDBMS=mssql
jdk: oraclejdk8
sudo: true
services:
- docker
- env: JPAPROVIDER=hibernate-5.4 RDBMS=db2
jdk: oraclejdk8
sudo: true
services:
- docker
- env: JPAPROVIDER=hibernate-5.4 RDBMS=oracle
jdk: oraclejdk8
sudo: true
services:
- docker
# - env: JPAPROVIDER=hibernate-5.3 RDBMS=sqlite
# jdk: oraclejdk8
# - env: JPAPROVIDER=hibernate-5.3 RDBMS=firebird
# jdk: oraclejdk8
# sudo: true

################################################
# datanucleus-5.1
Expand Down
134 changes: 134 additions & 0 deletions core/testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1392,6 +1392,140 @@
</plugins>
</build>
</profile>
<profile>
<id>hibernate-5.4</id>
<properties>
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
<additional.source.directory>src/main/hibernate</additional.source.directory>
</properties>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${version.hibernate-5.4}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${version.hibernate-5.4}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version.hibernate-5.4}</version>
</dependency>
<dependency>
<groupId>com.vladmihalcea</groupId>
<artifactId>hibernate-types-52</artifactId>
<version>${version.hibernate-types}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
<scope>compile</scope>
</dependency>
<!-- IntelliJ apparently needs the annotation processor here -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.hibernate-5.4}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${additional.source.directory}</source>
<source>${project.build.directory}/generated-sources/metamodel</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-source-hibernate</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test/hibernate</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<executions>
<execution>
<id>process</id>
<goals>
<goal>process</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<!-- source output directory -->
<outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
<processors>
<processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
</processors>
</configuration>
</execution>
</executions>
<dependencies>
<!-- Metamodel -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.hibernate-5.4}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${version.jaxb}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${version.jaxb}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.jaxb}</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>${version.jta}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${version.activation}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>hibernate-6.0</id>
<properties>
Expand Down
6 changes: 6 additions & 0 deletions dist/bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,12 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions dist/full/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-5.3</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-6.0</artifactId>
Expand Down
105 changes: 105 additions & 0 deletions entity-view/testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,111 @@
</plugins>
</build>
</profile>
<profile>
<id>hibernate-5.4</id>
<properties>
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52</jpa.excludedGroups>
</properties>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${version.hibernate-5.4}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>blaze-persistence-testsuite-base-hibernate</artifactId>
<scope>test</scope>
</dependency>
<!-- IntelliJ apparently needs the annotation processor here -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.hibernate-5.4}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<executions>
<execution>
<id>process-test</id>
<goals>
<goal>process</goal>
</goals>
<phase>generate-test-sources</phase>
<configuration>
<!-- source output directory -->
<outputDirectory>${project.build.directory}/test-metamodel</outputDirectory>
<processors>
<processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
</processors>
</configuration>
</execution>
</executions>
<dependencies>
<!-- Metamodel -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.hibernate-5.4}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${version.jaxb}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${version.jaxb}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.jaxb}</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>${version.jta}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${version.activation}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-test-source-metamodel</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/test-metamodel</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>hibernate-6.0</id>
<properties>
Expand Down
Loading

0 comments on commit 3b5f9b4

Please sign in to comment.