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

HHH-8474 accounted for Gradle 1.7's BND upgrade

This commit is contained in:
Brett Meyer 2013-09-06 15:47:47 -04:00
parent 9348c23e00
commit 8a0d301ba5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-entitymanager/hibernate-entitymanager.gradle
View File

@ -47,7 +47,7 @@ jar {
// <Import-Package>*</ImportPackage> will occur. This is simply a // <Import-Package>*</ImportPackage> will occur. This is simply a
// BND instruction -- the auto-discovery of imported packages still // BND instruction -- the auto-discovery of imported packages still
// occurs. // occurs.
instruction 'Import-Package', instructionFirst 'Import-Package',
'!javax.enterprise*', '!javax.enterprise*',
'javax.enterprise.context.spi;resolution:=optional', 'javax.enterprise.context.spi;resolution:=optional',
'javax.enterprise.inject.spi;resolution:=optional', 'javax.enterprise.inject.spi;resolution:=optional',

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

@ -76,7 +76,7 @@ jar {
instruction 'Bundle-Activator', 'org.hibernate.osgi.HibernateBundleActivator' instruction 'Bundle-Activator', 'org.hibernate.osgi.HibernateBundleActivator'
instruction 'Bundle-Description', 'Hibernate ORM OSGi' instruction 'Bundle-Description', 'Hibernate ORM OSGi'
instruction 'Import-Package', instructionFirst 'Import-Package',
// TODO: Shouldn't have to explicitly list this, but the plugin // TODO: Shouldn't have to explicitly list this, but the plugin
// generates it with a [1.0,2) version. // generates it with a [1.0,2) version.
'javax.persistence;version="2.1.0"', 'javax.persistence;version="2.1.0"',
@ -91,7 +91,7 @@ task copyBnd(type: Copy) {
task runBnd(type: JavaExec){ task runBnd(type: JavaExec){
main = "-jar" 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) { task copyToLib(type: Copy) {

BIN
hibernate-osgi/src/test/resources/bnd/bnd.jar → hibernate-osgi/src/test/resources/bnd/bnd-2.1.0.jar
View File

Binary file not shown.