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

HHH-12177 - Disable generation of hibernate-infinispan jar

This commit is contained in:
Andrea Boriero 2017-12-18 19:23:25 +00:00 committed by Steve Ebersole
parent 25854433ac
commit 1e4d483e73
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -455,7 +455,7 @@ subprojects { subProject ->
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Publishing // Publishing
if ( !subProject.name.equals( 'documentation' ) || !subProject.name.equals( 'hibernate-infinispan' ) ) { if ( !subProject.name.equals( 'documentation' ) && !subProject.name.equals( 'hibernate-infinispan' ) ) {
// do not configure publishing for the documentation module // do not configure publishing for the documentation module
publishing { publishing {
publications { publications {

30
hibernate-infinispan/hibernate-infinispan.gradle
View File

@ -10,21 +10,23 @@ mavenPom {
description = '(deprecated - use org.infinispan:infinispan-hibernate-cache instead) Integration for Infinispan into Hibernate as a second-level caching service' description = '(deprecated - use org.infinispan:infinispan-hibernate-cache instead) Integration for Infinispan into Hibernate as a second-level caching service'
} }
def osgiDescription() { jar.enabled = false
return mavenPom.description
}
jar { //def osgiDescription() {
// The OSGi JAR manifest support does not like a non-existent classes dir, // return mavenPom.description
// so make sure we dont use the OSGi one :) //}
manifest = null //
} //jar {
// // The OSGi JAR manifest support does not like a non-existent classes dir,
sourcesJar { // // so make sure we dont use the OSGi one :)
// The OSGi JAR manifest support does not like a non-existent classes dir, // manifest = null
// so make sure we dont use the OSGi one :) //}
manifest = null //
} //sourcesJar {
// // The OSGi JAR manifest support does not like a non-existent classes dir,
// // so make sure we dont use the OSGi one :)
// manifest = null
//}
def relocatedGroupId = 'org.infinispan' def relocatedGroupId = 'org.infinispan'
def relocatedArtifactId = 'infinispan-hibernate-cache' def relocatedArtifactId = 'infinispan-hibernate-cache'

5
hibernate-osgi/hibernate-osgi.gradle
View File

@ -238,7 +238,10 @@ karafFeatures {
name = 'hibernate-infinispan' name = 'hibernate-infinispan'
description = 'Feature for easily adding Infinispan-based caching support to hibernate-orm' description = 'Feature for easily adding Infinispan-based caching support to hibernate-orm'
dependencyFeatureNames = ['hibernate-orm'] dependencyFeatureNames = ['hibernate-orm']
projects = [rootProject.childProjects.'hibernate-infinispan'] bundle {
match group: 'org.infinispan', module: 'infinispan-hibernate-cache'
include = true
}
bundle { bundle {
match group: 'org.hibernate', module: 'hibernate-core' match group: 'org.hibernate', module: 'hibernate-core'
include = false include = false