Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re-enable `hibernate-spatial`

This commit is contained in:
Steve Ebersole 2021-08-26 09:43:33 -05:00
parent 39ee0236be
commit 476ea9230e
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Jenkinsfile vendored
View File

@ -85,11 +85,12 @@ stage('Build') {
containerName = "mariadb" containerName = "mariadb"
break; break;
case "postgresql": case "postgresql":
// use the postgis image to enable the PGSQL GIS (spatial) extension
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
docker.image('postgres:9.5').pull() docker.image('postgis/postgis:11-2.5').pull()
} }
sh "./docker_db.sh postgresql_9_5" sh "./docker_db.sh postgresql_11"
containerName = "postgres" containerName = "postgis"
break; break;
case "oracle": case "oracle":
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {

3
docker_db.sh
View File

@ -81,7 +81,8 @@ postgresql_13() {
docker run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 -d postgres:13.0 docker run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 -d postgres:13.0
} }
postgis(){ postgresql_11() {
# use the postgis image to enable the PGSQL GIS (spatial) extension
docker rm -f postgis || true docker rm -f postgis || true
docker run --name postgis -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 -d postgis/postgis:11-2.5 docker run --name postgis -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 -d postgis/postgis:11-2.5
} }

4
hibernate-spatial/hibernate-spatial.gradle
View File

@ -43,3 +43,7 @@ dependencies {
sourceSets.test.resources { sourceSets.test.resources {
setSrcDirs(['src/test/java', 'src/test/resources']) setSrcDirs(['src/test/java', 'src/test/resources'])
} }
tasks.test {
enabled = project.db == 'pgsql'
}

3
settings.gradle
View File

@ -119,8 +119,7 @@ include 'hibernate-envers'
include 'hibernate-envers-jakarta' include 'hibernate-envers-jakarta'
include 'hibernate-community-dialects' include 'hibernate-community-dialects'
// todo (6.0): re-enable hibernate-spatial include 'hibernate-spatial'
//include 'hibernate-spatial'
include 'hibernate-c3p0' include 'hibernate-c3p0'
include 'hibernate-proxool' include 'hibernate-proxool'