HHH-8474 accounted for Gradle 1.7's BND upgrade
This commit is contained in:
parent
9348c23e00
commit
8a0d301ba5
|
@ -47,7 +47,7 @@ jar {
|
|||
// <Import-Package>*</ImportPackage> will occur. This is simply a
|
||||
// BND instruction -- the auto-discovery of imported packages still
|
||||
// occurs.
|
||||
instruction 'Import-Package',
|
||||
instructionFirst 'Import-Package',
|
||||
'!javax.enterprise*',
|
||||
'javax.enterprise.context.spi;resolution:=optional',
|
||||
'javax.enterprise.inject.spi;resolution:=optional',
|
||||
|
|
|
@ -76,7 +76,7 @@ jar {
|
|||
instruction 'Bundle-Activator', 'org.hibernate.osgi.HibernateBundleActivator'
|
||||
instruction 'Bundle-Description', 'Hibernate ORM OSGi'
|
||||
|
||||
instruction 'Import-Package',
|
||||
instructionFirst 'Import-Package',
|
||||
// TODO: Shouldn't have to explicitly list this, but the plugin
|
||||
// generates it with a [1.0,2) version.
|
||||
'javax.persistence;version="2.1.0"',
|
||||
|
@ -91,7 +91,7 @@ task copyBnd(type: Copy) {
|
|||
|
||||
task runBnd(type: JavaExec){
|
||||
main = "-jar"
|
||||
args "$buildDir/osgi-lib/bnd/bnd.jar", "$buildDir/osgi-lib/bnd/cdi-api.bnd", "$buildDir/osgi-lib/bnd/el-api.bnd", "$buildDir/osgi-lib/bnd/jandex.bnd", "$buildDir/osgi-lib/bnd/serp.bnd"
|
||||
args "$buildDir/osgi-lib/bnd/bnd-2.1.0.jar", "$buildDir/osgi-lib/bnd/cdi-api.bnd", "$buildDir/osgi-lib/bnd/el-api.bnd", "$buildDir/osgi-lib/bnd/jandex.bnd", "$buildDir/osgi-lib/bnd/serp.bnd"
|
||||
}
|
||||
|
||||
task copyToLib(type: Copy) {
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue